+ <{if $action.reserve_block.display_timeframe == $smarty.const._ON}>
+
+ <{/if}>
+
+ <{if $action.reserve_block.display_timeframe == $smarty.const._ON}>
+
+
+
+ <{assign var=start_pos value=0}>
+ <{foreach from=$action.timeframe_list item=timeframe}>
+ <{assign var=spacer_width value=`$timeframe.left-$start_pos`}>
+
+
transparent<{else}><{$timeframe.timeframe_color}><{/if}>" title="<{$timeframe.start_time|timezone_date:false:$lang._short_time_format}><{$lang.reservation_time_pause}><{$timeframe.end_time|timezone_date:false:$lang._short_time_format}>">
+ <{$timeframe.timeframe_name}>
+
+ <{assign var=start_pos value=$timeframe.left+$timeframe.width}>
+ <{/foreach}>
+
+
+ <{/if}>
+
<{section name=hour loop=24 start=0 step=1}>
<{assign var=hour value=$smarty.section.hour.index}>
@@ -31,7 +53,7 @@
<{foreach name="location_list" key="location_id" item="location" from=$action.location_list}>
-
+
<{if ($action.reserve_data.$location_id.$view_date) }>
<{include file="reservation_view_main_list_location.html"}>
<{else}>
diff --git a/html/webapp/modules/reservation/templates/default/reservation_view_main_init_weekly.html b/html/webapp/modules/reservation/templates/default/reservation_view_main_init_weekly.html
index 68e7b92..371669b 100644
--- a/html/webapp/modules/reservation/templates/default/reservation_view_main_init_weekly.html
+++ b/html/webapp/modules/reservation/templates/default/reservation_view_main_init_weekly.html
@@ -1,7 +1,7 @@
<{strip}>
<{assign var="lang_year" value=$lang.reservation_monthly_year_format|smarty:nodefaults|date:"`$action.current_timestamp`"}>
-<{assign var="lang_month" value=$lang.reservation_monthly_month_format|smarty:nodefaults|date:"`$action.current_timestamp`"}>
+<{assign var="lang_month" value=$lang.reservation_monthly_month_format|smarty:nodefaults|date:"`$action.current_timestamp`"}>
<{include file="reservation_main_header_weekly.html"}>
@@ -12,6 +12,11 @@
+ <{if $action.reserve_block.display_timeframe == $smarty.const._ON}>
+
+
+ <{/if}>
@@ -24,7 +29,7 @@
<{/if}>
<{assign var="index" value=$smarty.section.timestamp.iteration-1}>
<{assign var="wday" value="w"|date:"`$timestamp`"}>
-
+
<{assign var="wday_data" value=$action.week_list.$wday}>
<{assign var="lang_wday" value=$lang.reservation_wday_format|smarty:nodefaults|sprintf:"`$wday_data.name`"}>
<{assign var="lang_day" value=$lang.reservation_weekly_format|smarty:nodefaults|date:"`$timestamp`"}>
@@ -32,7 +37,7 @@
<{include file="reservation_main_set_day_class.html" assign="day_class" view_date=$action.view_date set_date=$date wday=$wday}>
<{assign var="lang_year" value=$lang.reservation_monthly_year_format|smarty:nodefaults|date:"`$timestamp`"}>
- <{assign var="lang_month" value=$lang.reservation_monthly_month_format|smarty:nodefaults|date:"`$timestamp`"}>
+ <{assign var="lang_month" value=$lang.reservation_monthly_month_format|smarty:nodefaults|date:"`$timestamp`"}>
@@ -60,7 +65,24 @@
<{assign var=hour value=$smarty.section.hour.index}>
-
+ <{if $action.reserve_block.display_timeframe == $smarty.const._ON && ($smarty.section.hour.first)}>
+
+
+ <{assign var=start_pos value=0}>
+ <{foreach from=$action.timeframe_list item=timeframe}>
+ <{assign var=spacer_height value=`$timeframe.top-$start_pos`}>
+
+
transparent<{else}><{$timeframe.timeframe_color}><{/if}>" title="<{$timeframe.start_time|timezone_date:false:$lang._short_time_format}><{$lang.reservation_time_pause}><{$timeframe.end_time|timezone_date:false:$lang._short_time_format}>">
+
<{include file="reservation_main_addreserve.html" view_date=$first_date timeframe_id=`$timeframe.timeframe_id`}>
+ <{$timeframe.timeframe_name}>
+
+ <{assign var=start_pos value=$timeframe.top+$timeframe.height}>
+ <{/foreach}>
+
+ <{/if}>
+
+
<{$lang.reservation_time_format|smarty:nodefaults|sprintf:$hour}>
<{include file="reservation_main_addreserve.html" view_date=$first_date hour=$hour}>
@@ -71,8 +93,8 @@
<{section name=timestamp loop=$action.end_timestamp start=$action.start_timestamp step=86400}>
<{assign var="timestamp" value=$smarty.section.timestamp.index}>
<{assign var="date" value="Ymd"|date:$smarty.section.timestamp.index}>
-
-
+
+
<{if ($action.reserve_data.$date) }>
<{include file="./reservation_view_main_list_weekly.html"}>
@@ -81,13 +103,18 @@
<{/if}>
-
+
<{/section}>
<{/if}>
<{/section}>
+ <{if $action.reserve_block.display_timeframe == $smarty.const._ON}>
+
+
+ <{/if}>
+
diff --git a/html/webapp/modules/reservation/templates/default/reservation_view_main_list_location.html b/html/webapp/modules/reservation/templates/default/reservation_view_main_list_location.html
index 73d62ea..c3332ba 100644
--- a/html/webapp/modules/reservation/templates/default/reservation_view_main_list_location.html
+++ b/html/webapp/modules/reservation/templates/default/reservation_view_main_list_location.html
@@ -17,7 +17,7 @@
<{$reserve.short_title}>
<{else}>
-
+
<{$reserve.insert_user_name}>
<{/if}>
diff --git a/html/webapp/modules/reservation/templates/default/reservation_view_main_list_monthly.html b/html/webapp/modules/reservation/templates/default/reservation_view_main_list_monthly.html
index 426c962..fa5e12b 100644
--- a/html/webapp/modules/reservation/templates/default/reservation_view_main_list_monthly.html
+++ b/html/webapp/modules/reservation/templates/default/reservation_view_main_list_monthly.html
@@ -20,7 +20,7 @@
<{$reserve.short_title}>
<{else}>
-
+
diff --git a/html/webapp/modules/reservation/templates/default/reservation_view_main_list_weekly.html b/html/webapp/modules/reservation/templates/default/reservation_view_main_list_weekly.html
index b57d0b9..2a32298 100644
--- a/html/webapp/modules/reservation/templates/default/reservation_view_main_list_weekly.html
+++ b/html/webapp/modules/reservation/templates/default/reservation_view_main_list_weekly.html
@@ -17,7 +17,7 @@
<{$reserve.short_title}>
<{else}>
-
+
<{$reserve.insert_user_name}>
<{/if}>
diff --git a/html/webapp/modules/reservation/templates/default/reservation_view_main_reserve_regist.html b/html/webapp/modules/reservation/templates/default/reservation_view_main_reserve_regist.html
index 342f203..dcf37ea 100644
--- a/html/webapp/modules/reservation/templates/default/reservation_view_main_reserve_regist.html
+++ b/html/webapp/modules/reservation/templates/default/reservation_view_main_reserve_regist.html
@@ -19,7 +19,7 @@
<{include file="reservation_reserve_regist_location.html" reserve=$action.reserve|smarty:nodefaults}>
-
+
<{if ($action.details_flag == _ON) }>
<{include file="reservation_reserve_regist_contact.html" reserve=$action.reserve|smarty:nodefaults}>
@@ -36,7 +36,7 @@
<{/if}>
<{/if}>
-
+
<{if ($action.mail_send == _ON) }>
<{include file="reservation_reserve_regist_mail.html" reserve=$action.reserve|smarty:nodefaults}>
@@ -82,6 +82,10 @@
reservationCls["<{$id}>"].initRepeat();
<{/if}>
reservationCls["<{$id}>"].switchTime24Reserve($("reservation_form<{$id}>"));
+ if($("reservation_start_timeframe<{$id}>")) {
+ reservationCls["<{$id}>"].switchTimeframe($("reservation_start_timeframe<{$id}>"), $("reservation_form<{$id}>"), "start" );
+ reservationCls["<{$id}>"].switchTimeframe($("reservation_end_timeframe<{$id}>"), $("reservation_form<{$id}>"), "end" );
+ }
commonCls.focus("<{$id}>");
diff --git a/html/webapp/modules/reservation/templates/default/reservation_view_recursive_room.html b/html/webapp/modules/reservation/templates/default/reservation_view_recursive_room.html
index 3c9d551..01b6a7f 100644
--- a/html/webapp/modules/reservation/templates/default/reservation_view_recursive_room.html
+++ b/html/webapp/modules/reservation/templates/default/reservation_view_recursive_room.html
@@ -22,7 +22,7 @@
<{assign var="reserve_name" value=$room.page_name}>
<{/if}>
- <{if (($reserve_flag != RESERVATION_PRIVATE || $action.private_space && $reserve_flag == RESERVATION_PRIVATE) && ($reserve_flag != RESERVATION_GROUP || $reserve_flag == RESERVATION_GROUP && $room.thread_num != 0)) }>
+ <{if (($reserve_flag != RESERVATION_PRIVATE || $action.location.hasPrivateReserveAuthority && $reserve_flag == RESERVATION_PRIVATE) && ($reserve_flag != RESERVATION_GROUP || $reserve_flag == RESERVATION_GROUP && $room.thread_num != 0)) }>
<{assign var="room_id" value=$room.page_id}>
<{if ($reserve_flag == RESERVATION_GROUP) }>
<{assign var="indent" value=$room.thread_num-1}>
@@ -30,7 +30,7 @@
<{assign var="indent" value=$room.thread_num}>
<{/if}>
- <{if ($reserve_flag != RESERVATION_PUBLIC && ($action_name == "reservation_view_edit_location_add" || $action_name == "reservation_view_edit_location_modify")) }>
+ <{if ($action_name == "reservation_view_edit_location_add" || $action_name == "reservation_view_edit_location_modify") }>
<{assign var="select_rooms" value=$action.select_rooms.$reserve_flag}>
@@ -41,7 +41,7 @@
- <{elseif ($reserve_flag != RESERVATION_PUBLIC && ($action_name == "reservation_view_main_location_details"))}>
+ <{elseif ($action_name == "reservation_view_main_location_details") }>
<{assign var="select_rooms" value=$action.select_rooms.$reserve_flag}>
<{if ($select_rooms.$room_id) }><{else}> class="disable_lbl"<{/if}>>
<{" "|str_repeat:$indent}>
diff --git a/html/webapp/modules/reservation/update/Update.class.php b/html/webapp/modules/reservation/update/Update.class.php
index 4cb9b39..4cf030a 100644
--- a/html/webapp/modules/reservation/update/Update.class.php
+++ b/html/webapp/modules/reservation/update/Update.class.php
@@ -16,6 +16,15 @@ class Reservation_Update extends Action
function execute()
{
+ $adodb = $this->db->getAdoDbObject();
+ $metaColumns = $adodb->MetaColumns($this->db->getPrefix()."reservation_location");
+ if (!isset($metaColumns["use_auth_flag"]) && !isset($metaColumns["USE_AUTH_FLAG"])) {
+ $sql = "ALTER TABLE `".$this->db->getPrefix()."reservation_location"."` ADD `use_auth_flag` TINYINT unsigned NOT NULL default '0' AFTER `use_private_flag` ;";
+ $result = $this->db->execute($sql);
+ if ($result === false) {
+ return false;
+ }
+ }
// reservation_blockにindexを追加
$sql = "SHOW INDEX FROM `".$this->db->getPrefix()."reservation_block` ;";
$results = $this->db->execute($sql);
@@ -181,6 +190,66 @@ function execute()
$result = $this->db->execute($sql);
if($result === false) return false;
}
+
+ $sql = "SELECT RD.reserve_details_id, "
+ . "R.room_id "
+ . "FROM {reservation_reserve_details} RD "
+ . "LEFT JOIN {reservation_reserve} R "
+ . "ON RD.reserve_details_id = R.reserve_details_id "
+ . "WHERE R.room_id != RD.room_id "
+ . "OR R.room_id IS NULL "
+ . "GROUP BY RD.reserve_details_id";
+ $reserves = $this->db->execute($sql);
+ foreach ($reserves as $reserve) {
+ $whereArray = array(
+ 'reserve_details_id' => $reserve['reserve_details_id']
+ );
+ if (isset($reserve['room_id'])) {
+ $updateColumns = array(
+ 'room_id' => $reserve['room_id']
+ );
+ $result = $this->db->updateExecute('reservation_reserve_details', $updateColumns, $whereArray, false);
+ } else {
+ $result = $this->db->deleteExecute('reservation_reserve_details', $whereArray);
+ }
+ if ($result === false) {
+ return false;
+ }
+ }
+
+ // reservation_blockにカラムを追加
+ $adodb = $this->db->getAdoDbObject();
+ $metaColumns = $adodb->MetaColumns($this->db->getPrefix().'reservation_block');
+ if(!isset($metaColumns['DISPLAY_TIMEFRAME'])) {
+ $sql = "ALTER TABLE `".$this->db->getPrefix()."reservation_block` ".
+ " ADD `display_timeframe` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `display_type` ;";
+ $result = $this->db->execute($sql);
+ if($result === false) return false;
+ }
+ // reservation_timeframeテーブルを追加
+ $metaTables = $adodb->MetaTables();
+ if (!in_array($this->db->getPrefix()."reservation_timeframe", $metaTables)) {
+ $sql = "CREATE TABLE `".$this->db->getPrefix()."reservation_timeframe` (" .
+ " `timeframe_id` int(11) NOT NULL default '0'," .
+ " `timeframe_name` varchar(255) default NULL," .
+ " `start_time` varchar(14) NOT NULL default ''," .
+ " `end_time` varchar(14) NOT NULL default ''," .
+ " `timezone_offset` float(3,1) NOT NULL default '0.0'," .
+ " `timeframe_color` varchar(16) NOT NULL default ''," .
+ " `insert_time` varchar(14) NOT NULL default ''," .
+ " `insert_site_id` varchar(40) NOT NULL default ''," .
+ " `insert_user_id` varchar(40) NOT NULL default ''," .
+ " `insert_user_name` varchar(255) NOT NULL default ''," .
+ " `update_time` varchar(14) NOT NULL default ''," .
+ " `update_site_id` varchar(40) NOT NULL default ''," .
+ " `update_user_id` varchar(40) NOT NULL default ''," .
+ " `update_user_name` varchar(255) NOT NULL default ''," .
+ " PRIMARY KEY (`timeframe_id`)" .
+ ") ENGINE=MyISAM;";
+ $result = $this->db->execute($sql);
+ if($result === false) return false;
+ }
+
return true;
}
}
diff --git a/html/webapp/modules/reservation/validator/Validator_LocationView.class.php b/html/webapp/modules/reservation/validator/Validator_LocationView.class.php
index c7effb7..a253258 100644
--- a/html/webapp/modules/reservation/validator/Validator_LocationView.class.php
+++ b/html/webapp/modules/reservation/validator/Validator_LocationView.class.php
@@ -71,36 +71,25 @@ function validate($attributes, $errStr, $params)
$request->setParameter("location_list", $location_list);
$request->setParameter("location_count", count($location_list));
- } elseif ($actionName == "reservation_action_main_reserve_add" || $actionName == "reservation_action_main_reserve_modify" ||
- $actionName == "reservation_action_edit_import") {
+ } elseif ($actionName == "reservation_view_main_reserve_add" || $actionName == "reservation_view_main_reserve_modify"
+ || $actionName == "reservation_view_main_reserve_switch_category" || $actionName == "reservation_view_main_reserve_switch_location"
+ || $actionName == "reservation_action_main_reserve_add" || $actionName == "reservation_action_main_reserve_modify"
+ || $actionName == "reservation_action_edit_import"
+ ) {
$location = $reservationView->getLocation($attributes["location_id"]);
if (empty($location)) {
return $errStr;
}
- $request->setParameter("location", $location);
-
- $select_rooms = $reservationView->getAddLocationRoom();
- if (empty($select_rooms)) {
- $select_rooms = array();
- }
- $request->setParameter("allow_add_rooms", $select_rooms);
-
- } elseif ($actionName == "reservation_view_main_reserve_add" || $actionName == "reservation_view_main_reserve_modify" ||
- $actionName == "reservation_view_main_reserve_switch_category" || $actionName == "reservation_view_main_reserve_switch_location") {
-
- $location = $reservationView->getLocation($attributes["location_id"]);
- if (empty($location)) {
- return $errStr;
+ $allow_add_rooms = $reservationView->getAddLocationRoom($location);
+ if (empty($allow_add_rooms)) {
+ $allow_add_rooms = array();
}
$request->setParameter("location", $location);
+ $request->setParameter("allow_add_rooms", $allow_add_rooms);
- $select_rooms = $reservationView->getAddLocationRoom();
- if (empty($select_rooms)) {
- $select_rooms = array();
- }
- $request->setParameter("allow_add_rooms", $select_rooms);
-
- if ($actionName != "reservation_view_main_reserve_switch_location") {
+ if ($actionName == "reservation_view_main_reserve_add" || $actionName == "reservation_view_main_reserve_modify"
+ || $actionName == "reservation_view_main_reserve_switch_category"
+ ) {
if ($attributes["category_id"] > 0) {
$location_list = $reservationView->getLocations($attributes["category_id"]);
} else {
diff --git a/html/webapp/modules/reservation/validator/Validator_TimeframeAdjustment.class.php b/html/webapp/modules/reservation/validator/Validator_TimeframeAdjustment.class.php
new file mode 100644
index 0000000..0ced79b
--- /dev/null
+++ b/html/webapp/modules/reservation/validator/Validator_TimeframeAdjustment.class.php
@@ -0,0 +1,76 @@
+getComponent("Request");
+ $reservationView =& $container->getComponent("reservationView");
+
+ $actionChain =& $container->getComponent("ActionChain");
+ $actionName = $actionChain->getCurActionName();
+
+ $block = $request->getParameter('reserve_block');
+ if($block['display_timeframe'] == _OFF) {
+ return;
+ }
+
+ if ($actionName == "reservation_view_main_reserve_add") {
+ if(!isset($attributes['timeframe_id'])) {
+ return;
+ }
+ $timeframe_id = $attributes['timeframe_id'];
+ $timeframe = $reservationView->getTimeframe($timeframe_id);
+ if($timeframe && is_array($timeframe)) {
+ $request->setParameter('start_hour', $timeframe['start_time_view_hour']);
+ $request->setParameter('start_minute', $timeframe['start_time_view_min']);
+ $request->setParameter('end_hour', $timeframe['end_time_view_hour']);
+ $request->setParameter('end_minute', $timeframe['end_time_view_min']);
+ $request->setParameter('start_timeframe_id', $timeframe['timeframe_id']);
+ $request->setParameter('end_timeframe_id', $timeframe['timeframe_id']);
+ $request->setParameter('start_timeframe', $timeframe);
+ $request->setParameter('end_timeframe', $timeframe);
+ }
+ }
+ elseif($actionName == "reservation_view_main_reserve_modify" ||
+ $actionName == "reservation_view_main_reserve_details") {
+ $reserve = $request->getParameter("reserve");
+ if($reserve) {
+ $start_timeframe = $reservationView->getTimeframeByStartTime($reserve['start_time']);
+ if($start_timeframe) {
+ $request->setParameter('start_timeframe_id', $start_timeframe['timeframe_id']);
+ $request->setParameter('start_timeframe', $start_timeframe);
+ }
+ $end_timeframe = $reservationView->getTimeframeByEndTime($reserve['end_time']);
+ if($end_timeframe) {
+ $request->setParameter('end_timeframe_id', $end_timeframe['timeframe_id']);
+ $request->setParameter('end_timeframe', $end_timeframe);
+ }
+ }
+ }
+ return;
+ }
+}
+?>
\ No newline at end of file
diff --git a/html/webapp/modules/reservation/validator/Validator_TimeframeListView.class.php b/html/webapp/modules/reservation/validator/Validator_TimeframeListView.class.php
new file mode 100644
index 0000000..df6e532
--- /dev/null
+++ b/html/webapp/modules/reservation/validator/Validator_TimeframeListView.class.php
@@ -0,0 +1,51 @@
+getComponent("reservationView");
+
+ $request =& $container->getComponent("Request");
+
+ $actionChain =& $container->getComponent("ActionChain");
+ $actionName = $actionChain->getCurActionName();
+
+
+ if($actionName == 'reservation_view_main_init') {
+ $divided_flag = true;
+ }
+ else {
+ $divided_flag = false;
+ }
+ $timeframe_list = $reservationView->getTimeframes($divided_flag);
+ $request->setParameter('timeframe_list', $timeframe_list);
+
+ $request->setParameter('timeframe_list_count', count($timeframe_list));
+
+ return;
+ }
+}
+?>
diff --git a/html/webapp/modules/reservation/validator/Validator_TimeframeTimetable.class.php b/html/webapp/modules/reservation/validator/Validator_TimeframeTimetable.class.php
new file mode 100644
index 0000000..13b4057
--- /dev/null
+++ b/html/webapp/modules/reservation/validator/Validator_TimeframeTimetable.class.php
@@ -0,0 +1,57 @@
+getComponent("Request");
+ $reservationView =& $container->getComponent("reservationView");
+
+ // このValidatorの前にlocationTimetable Validatorが実行されていることが前提
+
+ // 指定された時刻をGMTに修正したうえでチェック
+ $start_time = timezone_date($request->getParameter('start_time'), true, 'His');
+ $end_time = timezone_date($request->getParameter('end_time'), true, 'His');
+
+ // 0:00-24:00 の場合だけあり得る
+ if($start_time == $end_time) {
+ $end_time = strval(intval($end_time)+240000);
+ }
+
+ $ret = $reservationView->getTimeframeDuplicate($attributes['timeframe_id'], $start_time, $end_time);
+ if($ret == false) {
+ return $errStr;
+ }
+
+ // 差分チェックは入力データで行う
+ $diff = $reservationView->TimeDiff($request->getParameter('start_time'), $request->getParameter('end_time'));
+ if ($diff < RESERVATION_SELECT_MIN_TIME) {
+ return RESERVATION_ERR_TIMEFRAME_MIN_TIME;
+ }
+
+ return;
+ }
+}
+?>
\ No newline at end of file
diff --git a/html/webapp/modules/reservation/validator/Validator_TimeframeView.class.php b/html/webapp/modules/reservation/validator/Validator_TimeframeView.class.php
new file mode 100644
index 0000000..bc313f1
--- /dev/null
+++ b/html/webapp/modules/reservation/validator/Validator_TimeframeView.class.php
@@ -0,0 +1,55 @@
+getComponent("reservationView");
+
+ $request =& $container->getComponent("Request");
+
+ $actionChain =& $container->getComponent("ActionChain");
+ $actionName = $actionChain->getCurActionName();
+
+ if(!isset($attributes['timeframe_id']) || empty($attributes['timeframe_id'])) {
+ if($actionName == 'reservation_action_edit_timeframe_delete') {
+ return $errStr;
+ }
+ else {
+ // 新規追加
+ return;
+ }
+ }
+ $timeframe = $reservationView->getTimeframe($attributes['timeframe_id']);
+ if(!$timeframe) {
+ return $errStr;
+ }
+
+ $request->setParameter('timeframe', $timeframe);
+
+ return;
+ }
+}
+?>
diff --git a/html/webapp/modules/reservation/view/edit/import/init/Init.class.php b/html/webapp/modules/reservation/view/edit/import/init/Init.class.php
index 2f3d86e..c2bb222 100644
--- a/html/webapp/modules/reservation/view/edit/import/init/Init.class.php
+++ b/html/webapp/modules/reservation/view/edit/import/init/Init.class.php
@@ -36,32 +36,32 @@ class Reservation_View_Edit_Import_Init extends Action
var $help_end_time = "";
var $location_id = 0;
- /**
- * execute処理
- *
- * @access public
- */
- function execute()
- {
- $this->help_start_time = "090000";
- $this->help_end_time = "180000";
- $this->help_reserve_time = timezone_date_format(null, "Ymd");
+ /**
+ * execute処理
+ *
+ * @access public
+ */
+ function execute()
+ {
+ $this->help_start_time = "090000";
+ $this->help_end_time = "180000";
+ $this->help_reserve_time = timezone_date_format(null, "Ymd");
$this->category_list = $this->reservationView->getCategories();
$this->location_count_list = $this->reservationView->getCountLocationByCategory();
- $this->location_list = $this->reservationView->getLocations();
- $this->location_count = count($this->location_list);
- foreach ($this->location_list as $location) {
- $this->location = $location;
- $this->location_id = $this->location["location_id"];
+ $this->location_list = $this->reservationView->getLocations();
+ $this->location_count = count($this->location_list);
+ foreach ($this->location_list as $location) {
+ $this->location = $location;
+ $this->location_id = $this->location["location_id"];
$this->request->setParameter("location", $location);
- break;
- }
+ break;
+ }
- $this->allow_add_rooms = $this->reservationView->getAddLocationRoom();
+ $this->allow_add_rooms = $this->reservationView->getAddLocationRoom($location);
return 'success';
- }
+ }
}
?>
\ No newline at end of file
diff --git a/html/webapp/modules/reservation/view/edit/maple.ini b/html/webapp/modules/reservation/view/edit/maple.ini
index da59ff0..7087e7a 100644
--- a/html/webapp/modules/reservation/view/edit/maple.ini
+++ b/html/webapp/modules/reservation/view/edit/maple.ini
@@ -5,6 +5,7 @@ css_tab = "comp:{$theme_name}/comp_tabset.css"
_change_display = "define:reservation_view_edit_style_init"
reservation_location_manage = "_user_auth_id==_AUTH_ADMIN->commonCls.sendView('<{$id}>','reservation_view_edit_location_init');"
reservation_location_add = "_user_auth_id==_AUTH_ADMIN->commonCls.sendView('<{$id}>','reservation_view_edit_location_add');"
+reservation_timeframe = "_user_auth_id==_AUTH_ADMIN->commonCls.sendView('<{$id}>','reservation_view_edit_timeframe');"
reservation_mail = "_user_auth_id==_AUTH_ADMIN->commonCls.sendView('<{$id}>','reservation_view_edit_mail');"
reservation_csv_import = "_user_auth_id==_AUTH_ADMIN->commonCls.sendView('<{$id}>','reservation_view_edit_import_init');"
_edit_design = "define:_EDIT_DESIGN_METHOD"
diff --git a/html/webapp/modules/reservation/view/edit/style/init/Init.class.php b/html/webapp/modules/reservation/view/edit/style/init/Init.class.php
index 53b0cea..c734ce5 100644
--- a/html/webapp/modules/reservation/view/edit/style/init/Init.class.php
+++ b/html/webapp/modules/reservation/view/edit/style/init/Init.class.php
@@ -20,6 +20,7 @@ class Reservation_View_Edit_Style_Init extends Action
var $location_count = null;
var $reserve_block = null;
var $location_count_list = null;
+ var $timeframe_list_count = null;
/**
* execute処理
diff --git a/html/webapp/modules/reservation/view/edit/style/init/maple.ini b/html/webapp/modules/reservation/view/edit/style/init/maple.ini
index 548a74a..88730d1 100644
--- a/html/webapp/modules/reservation/view/edit/style/init/maple.ini
+++ b/html/webapp/modules/reservation/view/edit/style/init/maple.ini
@@ -1,6 +1,9 @@
[HeaderMenu]
1,_change_display = "define:auto"
+[SmartyAssign::reservationStyleAssign]
+global = timezone.ini
+
[AllowIdList]
room_id_arr = "ALLOW_ROOM_ID"
@@ -10,6 +13,7 @@ key:block_id.reservation.block:g = "1:lang._invalid_input"
key:reserve_block,location_count.reservation.locationExists:g = "1:lang.reservation_nolocation"
key:reserve_block,category_list.reservation.categoryView:g = "1:lang._invalid_input"
key:reserve_block.reservation.locationView:g = "1:lang._invalid_input"
+.reservation.TimeframeListView = "1:lang._invalid_input"
[View]
define:theme = 1
diff --git a/html/webapp/modules/reservation/view/edit/timeframe/Timeframe.class.php b/html/webapp/modules/reservation/view/edit/timeframe/Timeframe.class.php
new file mode 100644
index 0000000..5c1cc5f
--- /dev/null
+++ b/html/webapp/modules/reservation/view/edit/timeframe/Timeframe.class.php
@@ -0,0 +1,36 @@
+configView->getConfigByConfname($this->module_id, 'timeframe_color');
+ if($config) {
+ $this->timeframe_colors = explode('|', $config['conf_value']);
+ }
+
+ $this->timezone_list = explode("|", RESERVATION_DEF_TIMEZONE);
+
+ $this->week_list = $this->reservationView->getLocationWeekArray();
+
+ return 'success';
+ }
+}
\ No newline at end of file
diff --git a/html/webapp/modules/reservation/view/edit/timeframe/entry/maple.ini b/html/webapp/modules/reservation/view/edit/timeframe/entry/maple.ini
new file mode 100644
index 0000000..a0a305e
--- /dev/null
+++ b/html/webapp/modules/reservation/view/edit/timeframe/entry/maple.ini
@@ -0,0 +1,10 @@
+[HeaderMenu]
+mode = "nobuild"
+
+[ValidateDef]
+key:timeframe_id.reservation.TimeframeView = "1:lang._invalid_input"
+
+
+[View]
+define:theme_name = "system"
+success = "reservation_view_edit_timeframe_entry.html"
\ No newline at end of file
diff --git a/html/webapp/modules/reservation/view/edit/timeframe/maple.ini b/html/webapp/modules/reservation/view/edit/timeframe/maple.ini
new file mode 100644
index 0000000..739bcba
--- /dev/null
+++ b/html/webapp/modules/reservation/view/edit/timeframe/maple.ini
@@ -0,0 +1,17 @@
+[SmartyAssign::reservationTimeframeAssign]
+global = timezone.ini
+
+[ValidateDef]
+authcheck = "1,_user_auth_id==_AUTH_ADMIN:lang._invalid_auth"
+.reservation.TimeframeListView = "1:lang._invalid_input"
+
+[HeaderMenu]
+1,reservation_timeframe = "define:auto"
+
+[Action]
+configView = "ref:configView"
+reservationView = "ref:reservationView"
+
+[View]
+define:theme = 1
+success = "reservation_view_edit_timeframe.html"
diff --git a/html/webapp/modules/reservation/view/main/init/Init.class.php b/html/webapp/modules/reservation/view/main/init/Init.class.php
index ea49c6c..f93584f 100644
--- a/html/webapp/modules/reservation/view/main/init/Init.class.php
+++ b/html/webapp/modules/reservation/view/main/init/Init.class.php
@@ -50,6 +50,9 @@ class Reservation_View_Main_Init extends Action
var $prev_day = null;
var $input_date = null;
+ var $timeframe_list = null;
+ var $timeframe_list_count = null;
+
/**
* execute実行
*
@@ -64,7 +67,7 @@ function execute()
if ($this->location_count == 0) {
return 'noLocation';
}
-
+
switch ($this->reserve_block["display_type"]) {
case RESERVATION_DEF_MONTHLY:
return 'successMonthly';
diff --git a/html/webapp/modules/reservation/view/main/init/maple.ini b/html/webapp/modules/reservation/view/main/init/maple.ini
index 12b010f..0d14393 100644
--- a/html/webapp/modules/reservation/view/main/init/maple.ini
+++ b/html/webapp/modules/reservation/view/main/init/maple.ini
@@ -1,3 +1,6 @@
+[SmartyAssign::reservationInitAssign]
+global = timezone.ini
+
[AllowIdList]
room_id_arr = "ALLOW_ROOM_ID"
@@ -13,6 +16,7 @@ key:category_list.reservation.categoryView:g = "1:lang.reservation_no_category"
key:category_id.reservation.locationView:g = "1:lang.reservation_select_nolocation"
key:start_date,end_date.reservation.holidayView:g = "1:lang.reservation_error_holiday"
key:start_date,end_date.reservation.reserveView:g = "1:lang.reservation_error_reserve"
+.reservation.TimeframeListView:g = "1:lang._invalid_input"
[Action]
session = "ref:Session"
diff --git a/html/webapp/modules/reservation/view/main/reserve/add/Add.class.php b/html/webapp/modules/reservation/view/main/reserve/add/Add.class.php
index f5fde1f..ea82db5 100644
--- a/html/webapp/modules/reservation/view/main/reserve/add/Add.class.php
+++ b/html/webapp/modules/reservation/view/main/reserve/add/Add.class.php
@@ -20,6 +20,7 @@ class Reservation_View_Main_Reserve_Add extends Action
var $module_id = null;
var $entry_calendar = null;
var $notification_mail = null;
+ var $category_id = null;
// validatorから受け取るため
var $location = null;
@@ -28,6 +29,11 @@ class Reservation_View_Main_Reserve_Add extends Action
var $location_list = null;
var $location_count = null;
var $location_count_list = null;
+ var $reserve_block = null;
+ var $timeframe_list = null;
+ var $timeframe_list_count = null;
+ var $start_timeframe_id = null;
+ var $end_timeframe_id = null;
// Filterから受け取るため
var $room_arr = null;
@@ -39,7 +45,6 @@ class Reservation_View_Main_Reserve_Add extends Action
// 値をセットするため
var $reserve = null;
var $edit_rrule = null;
- var $private_space = null;
var $reserve_room_id = null;
var $week_list = null;
var $timezone_list = null;
@@ -60,9 +65,6 @@ function execute()
if ($this->details_flag == _ON) {
$this->edit_rrule = RESERVATION_RESERVE_EDIT_ALL;
}
- if ($this->location["hasPrivateAddReserve"] == _ON) {
- $this->private_space = _ON;
- }
$this->reserve_room_id = $this->reserve["room_id"];
$this->timezone_list = explode("|", RESERVATION_DEF_TIMEZONE);
diff --git a/html/webapp/modules/reservation/view/main/reserve/add/maple.ini b/html/webapp/modules/reservation/view/main/reserve/add/maple.ini
index b59c882..08b162f 100644
--- a/html/webapp/modules/reservation/view/main/reserve/add/maple.ini
+++ b/html/webapp/modules/reservation/view/main/reserve/add/maple.ini
@@ -8,8 +8,11 @@ room_arr = "ALLOW_ROOM_ARR"
room_id_arr = "ALLOW_ROOM_ID"
[ValidateDef]
+.reservation.TimeframeListView = "1:lang._invalid_input"
reserve_date.date:g = "1:lang._invalid_date,lang.reservation_reserve_time"
key:date.reservation.date:g = "1:lang._invalid_input"
+key:block_id.reservation.block:g = "1:lang._invalid_input"
+key:timeframe_id.reservation.timeframeAdjustment:g = "1:lang._invalid_input"
key:time,start_hour,start_minute.reservation.time:g = "1:lang.reservation_reserve_time"
key:time,end_hour,end_minute.reservation.time:g = "1:lang.reservation_reserve_time"
key:location_id.reservation.locationExists = "1:lang._invalid_input"
diff --git a/html/webapp/modules/reservation/view/main/reserve/details/Details.class.php b/html/webapp/modules/reservation/view/main/reserve/details/Details.class.php
index 4ddb6a5..26adf50 100644
--- a/html/webapp/modules/reservation/view/main/reserve/details/Details.class.php
+++ b/html/webapp/modules/reservation/view/main/reserve/details/Details.class.php
@@ -17,6 +17,9 @@ class Reservation_View_Main_Reserve_Details extends Action
// validatorから受け取るため
var $reserve = null;
var $rrule_reserve_id = null;
+ var $reserve_block = null;
+ var $start_timeframe = null;
+ var $end_timeframe = null;
/**
* execute実行
diff --git a/html/webapp/modules/reservation/view/main/reserve/details/maple.ini b/html/webapp/modules/reservation/view/main/reserve/details/maple.ini
index 0ff8a8e..042a766 100644
--- a/html/webapp/modules/reservation/view/main/reserve/details/maple.ini
+++ b/html/webapp/modules/reservation/view/main/reserve/details/maple.ini
@@ -8,6 +8,8 @@ room_id_arr = "ALLOW_ROOM_ID"
key:reserve_id.reservation.reserveExists:g = "1:lang._invalid_auth"
key:reserve_id.reservation.reserveView:g = "1:lang._invalid_auth"
key:location_id.reservation.locationExists:g = "1:lang._invalid_auth"
+key:block_id.reservation.block:g = "1:lang._invalid_input"
+.reservation.timeframeAdjustment:g = "1:lang._invalid_input"
[Action]
reservationView = "ref:reservationView"
diff --git a/html/webapp/modules/reservation/view/main/reserve/modify/Modify.class.php b/html/webapp/modules/reservation/view/main/reserve/modify/Modify.class.php
index a3f3520..1dd042c 100644
--- a/html/webapp/modules/reservation/view/main/reserve/modify/Modify.class.php
+++ b/html/webapp/modules/reservation/view/main/reserve/modify/Modify.class.php
@@ -22,10 +22,15 @@ class Reservation_View_Main_Reserve_Modify extends Action
var $location = null;
var $allow_add_rooms = null;
var $category_list = null;
+ var $reserve_block = null;
var $location_id = null;
var $location_list = null;
var $location_count = null;
var $location_count_list = null;
+ var $timeframe_list = null;
+ var $timeframe_list_count = null;
+ var $start_timeframe_id = null;
+ var $end_timeframe_id = null;
// Filterから受け取るため
var $room_arr = null;
@@ -36,7 +41,6 @@ class Reservation_View_Main_Reserve_Modify extends Action
// 値をセットするため
var $edit_rrule = null;
- var $private_space = null;
var $reserve_room_id = null;
var $week_list = null;
var $timezone_list = null;
@@ -51,9 +55,6 @@ class Reservation_View_Main_Reserve_Modify extends Action
*/
function execute()
{
- if ($this->location["hasPrivateAddReserve"] == _ON) {
- $this->private_space = _ON;
- }
$this->reserve_room_id = $this->reserve["room_id"];
$this->week_list = $this->reservationView->getLocationWeekArray();
diff --git a/html/webapp/modules/reservation/view/main/reserve/modify/maple.ini b/html/webapp/modules/reservation/view/main/reserve/modify/maple.ini
index f569159..793693e 100644
--- a/html/webapp/modules/reservation/view/main/reserve/modify/maple.ini
+++ b/html/webapp/modules/reservation/view/main/reserve/modify/maple.ini
@@ -13,6 +13,9 @@ key:reserve_id.reservation.reserveView:g = "1:lang._invalid_auth"
key:location_id.reservation.locationExists:g = "1:lang._invalid_auth"
key:category_list.reservation.categoryView:g = "1:lang.reservation_no_category"
key:category_id,location_id.reservation.locationView:g = "1:lang.reservation_select_nolocation"
+key:block_id.reservation.block:g = "1:lang._invalid_input"
+.reservation.TimeframeListView = "1:lang._invalid_input"
+.reservation.timeframeAdjustment:g = "1:lang._invalid_input"
[HeaderInc]
textarea_css = "comp:{$theme_name}/comp_textarea.css"
diff --git a/html/webapp/modules/room/action/admin/delete/Delete.class.php b/html/webapp/modules/room/action/admin/delete/Delete.class.php
index eb6783e..98539a2 100644
--- a/html/webapp/modules/room/action/admin/delete/Delete.class.php
+++ b/html/webapp/modules/room/action/admin/delete/Delete.class.php
@@ -15,207 +15,23 @@
class Room_Action_Admin_Delete extends Action
{
// パラメータを受け取るため
- var $parent_page_id = null;
var $edit_current_page_id = null;
-
- // バリデートによりセット
- var $parent_page = null;
- var $page = null;
-
- // 使用コンポーネントを受け取るため
- var $pagesView = null;
- var $pagesAction = null;
- var $blocksView = null;
- var $modulesView = null;
- var $preexecuteMain = null;
- var $blocksAction = null;
- var $db = null;
- var $uploadsAction = null;
-
- /**
- * ルーム削除処理
- *
- * @access public
- */
- function execute()
- {
- $result = $this->_delRoom(intval($this->edit_current_page_id));
- if($result === false) return 'error';
- return 'success';
- }
-
- /**
- * 削除処理
- * @param int current_page_id
- * @return boolean
- * @access private
- */
- function _delRoom($current_page_id) {
- $log =& LogFactory::getLog();
-
- // ----------------------------------------------------------------------
- // --- サブグループ ---
- // ----------------------------------------------------------------------
- $sub_pages =& $this->db->selectExecute("pages", array("parent_id" => $current_page_id, "room_id = page_id" => null));
- if($sub_pages === false) {
- return false;
- }
- if(count($sub_pages) > 0) {
- //サブグループあり
- //それぞれ、ルーム削除を再帰的に行う
- foreach($sub_pages as $sub_page) {
- $result = $this->_delRoom(intval($sub_page['page_id']));
- if(!$result) return false;
- }
- }
-
- // ルームに所属しているページ一覧取得
- $result = $this->db->selectExecute("pages", array("room_id" => $current_page_id) ,null, null, null, array($this, "_fetchcallback"));
- if($result === false) {
- return false;
- }
- list($page_list, $pages) = $result;
-
- // ----------------------------------------------------------------------
- // --- ブロック削除アクション-削除アクション実行 ---
- // ----------------------------------------------------------------------
- $blocks =& $this->blocksView->getBlockByPageId($page_list);
- $modules =& $this->modulesView->getModulesByUsed($current_page_id,0,0,true);
- if(is_array($blocks) && count($blocks) > 0) {
- foreach($blocks as $block) {
- $block_delete_action = $modules[$block['module_id']]['block_delete_action'];
- if($block_delete_action != "" && $block_delete_action != null) {
- //ブロック削除アクション
- $result = $this->blocksAction->delFuncExec($block['block_id'], $block, $block_delete_action);
- //if($result === false) {
- // 削除アクションの返り値をエラーとしない
- // モジュールの作り方によってルームの削除ができなくなると問題なので。
- //$log->warn(sprintf("%sのブロック削除アクション(%s)が失敗しました。",$modules[$block['module_id_id']]['module_name'], $block_delete_action), "Room_Action_Admin_Delete_Init#execute");
- //return false;
- //}
- }
- }
- }
- if(is_array($modules) && count($modules) > 0) {
- foreach($modules as $module) {
- $delete_action = $module['delete_action'];
- // delete_action処理
- if($delete_action != "" && $delete_action != null) {
- $result = $this->pagesAction->delFuncExec($current_page_id, $module, $delete_action);
- }
- }
- }
- // ----------------------------------------------------------------------
- // --- 添付ファイル更新処理 ---
- // ----------------------------------------------------------------------
- $result = $this->uploadsAction->delUploadsByRoomid($current_page_id);
- if($result === false) return false;
-
- // ----------------------------------------------------------------------
- // --- ページモジュールリンクテーブル削除 ---
- // ----------------------------------------------------------------------
- $result = $this->pagesAction->delPagesModulesLink(array("room_id" => $current_page_id));
- if($result === false) return false;
-
- // ----------------------------------------------------------------------
- // --- ページユーザリンクテーブル削除 ---
- // ----------------------------------------------------------------------
- $result = $this->pagesAction->delPageUsersLink(array("room_id" => $current_page_id));
- if($result === false) return false;
-
- foreach($page_list as $page_id) {
- // ----------------------------------------------------------------------
- // --- ブロックテーブル削除 ---
- // ----------------------------------------------------------------------
- $result = $this->pagesAction->delPageById($page_id, "blocks");
- if(!$result) {
- return false;
- }
- // ----------------------------------------------------------------------
- // --- 非表示メニューテーブル削除 ---
- // ----------------------------------------------------------------------
- if(!$this->pagesAction->delPageById($page_id, 'menu_detail')) {
- return false;
- }
- if(!$this->pagesAction->delPageById($page_id, 'mobile_menu_detail')) {
- return false;
- }
+ // 使用コンポーネントを受け取るため
+ var $pagesAction = null;
- // ----------------------------------------------------------------------
- // --- ページテーブル削除 ---
- // ----------------------------------------------------------------------
- $result = $this->pagesAction->delPageById($page_id);
- if(!$result) {
- return false;
- }
- // ----------------------------------------------------------------------
- // --- ページスタイル削除 ---
- // ----------------------------------------------------------------------
- if(!$this->pagesAction->delPageStyleById($page_id)) {
- return false;
- }
-
- // ----------------------------------------------------------------------
- // --- pages_meta_infテーブル削除 ---
- // ----------------------------------------------------------------------
- if(!$this->pagesAction->delPageMetaInfById($page_id)) {
- return false;
- }
-
- // ----------------------------------------------------------------------
- // --- 表示順decrement ---
- // ----------------------------------------------------------------------
- if($current_page_id == $page_id) {
- if(!$this->pagesAction->decrementDisplaySeq($pages[$page_id]['parent_id'], $pages[$page_id]['display_sequence'], $pages[$page_id]['lang_dirname'])) {
- return false;
- }
- }
- }
- // ----------------------------------------------------------------------
- // --- ショートカット先削除 ---
- // ----------------------------------------------------------------------
- $shortcuts =& $this->db->selectExecute("shortcut", array("room_id" => $current_page_id));
- if(isset($shortcuts[0])) {
- $preexecute_params = array(
- "mode" => "delete",
- "shortcut_flag" => _ON
- );
- foreach($shortcuts as $shortcut) {
- //TODO shortcut_site_idにより、他サイトを考慮した場合は、他サイトの削除処理を行うこと 現状、未実装
- $preexecute_params["block_id"] = $shortcut["shortcut_block_id"];
- $preexecute_params["page_id"] = $shortcut["shortcut_page_id"];
- $preexecute_params["room_id"] = $shortcut["shortcut_room_id"];
- //delete_blockアクションを呼ぶ
- $result = $this->preexecuteMain->preExecute("pages_actionblock_deleteblock", $preexecute_params);
- if($result === false || $result === "false") {
- //$errorList->add($this->_classname, sprintf(_INVALID_ACTION,"pages_actionblock_deleteblock"));
- return false;
- }
- }
- $result = $this->db->deleteExecute("shortcut", array("room_id" => $current_page_id));
- if($result === false){
- //$errorList->add($this->_classname, sprintf(_INVALID_ACTION,"pages_actionblock_deleteblock"));
- return false;
- }
- }
- return true;
- }
-
- /**
- * fetch時コールバックメソッド
- * @param result adodb object
- * @return array
- * @access private
+ /**
+ * ルーム削除処理
+ *
+ * @access public
*/
- function _fetchcallback($result) {
- $ret = array();
- $parent_ret = array();
- while ($row = $result->fetchRow()) {
- $ret[] = $row['page_id'];
- $page_ret[$row['page_id']] = $row;
+ function execute()
+ {
+ if (!$this->pagesAction->deleteRoom($this->edit_current_page_id)) {
+ return 'error';
}
- return array($ret, $page_ret);
+
+ return 'success';
}
}
?>
\ No newline at end of file
diff --git a/html/webapp/modules/room/action/admin/delete/dicon.ini b/html/webapp/modules/room/action/admin/delete/dicon.ini
index 6cf756c..d38ced3 100644
--- a/html/webapp/modules/room/action/admin/delete/dicon.ini
+++ b/html/webapp/modules/room/action/admin/delete/dicon.ini
@@ -1,15 +1,13 @@
[DIContainer]
databaseSqlutility = "database.sqlutility"
-blocksAction = "blocks.action"
pagesAction = "pages.action"
uploadsAction = "uploads.action"
+blocksAction = "blocks.action"
[blocksAction]
databaseSqlutility = "dicon://databaseSqlutility"
preexecuteMain = "dicon://preexecuteMain"
-modulesView = "dicon://modulesView"
[pagesAction]
databaseSqlutility = "dicon://databaseSqlutility"
-preexecuteMain = "dicon://preexecuteMain"
-modulesView = "dicon://modulesView"
\ No newline at end of file
+preexecuteMain = "dicon://preexecuteMain"
\ No newline at end of file
diff --git a/html/webapp/modules/room/action/admin/delete/maple.ini b/html/webapp/modules/room/action/admin/delete/maple.ini
index 076e1d4..36cf219 100644
--- a/html/webapp/modules/room/action/admin/delete/maple.ini
+++ b/html/webapp/modules/room/action/admin/delete/maple.ini
@@ -8,18 +8,11 @@ edit_current_page_id.required ="1:lang._invalid_input"
parent_page_id,edit_current_page_id.room.RoomRegist = "1,delete:lang._invalid_input"
[DIContainer]
-filename_delete = dicon.ini
-
-[Action]
-pagesAction = "ref:pagesAction"
-blocksView = "ref:blocksView"
-modulesView = "ref:modulesView"
-preexecuteMain = "ref:preexecuteMain"
-blocksAction = "ref:blocksAction"
-pagesView = "ref:pagesView"
-db = "ref:DbObject"
-uploadsAction = "ref:uploadsAction"
+filename = dicon.ini
[View]
-success = "main:error.html"
-error = "main:error.html"
\ No newline at end of file
+success = "main:true.html"
+error = "main:error.html"
+
+[Action]
+pagesAction = "ref:pagesAction"
\ No newline at end of file
diff --git a/html/webapp/modules/room/action/admin/export/Export.class.php b/html/webapp/modules/room/action/admin/export/Export.class.php
new file mode 100644
index 0000000..37a03ab
--- /dev/null
+++ b/html/webapp/modules/room/action/admin/export/Export.class.php
@@ -0,0 +1,79 @@
+>ルーム一覧>>参加者修正>>エクスポート>>準備
+ *
+ * @package NetCommons
+ * @author Noriko Arai,Ryuji Masukawa
+ * @copyright 2006-2007 NetCommons Project
+ * @license http://www.netcommons.org/license.txt NetCommons License
+ * @project NetCommons Project, supported by National Institute of Informatics
+ * @access public
+ */
+
+class Room_Action_Admin_Export extends Action
+{
+ // リクエストパラメータをセットするため
+ var $parent_page_id = null;
+ var $edit_current_page_id = null;
+
+ // VAlidatorでセット
+ var $page = null;
+
+ // 使用コンポーネントを受け取るため
+ var $session = null;
+ var $db = null;
+ var $actionChain = null;
+
+
+ // 値をセットするため
+
+ /**
+ * execute実行
+ *
+ * @access public
+ */
+ function execute()
+ {
+ $this->session->setParameter(array('room', 'export', 'current_page_id'), $this->edit_current_page_id);
+ $this->session->setParameter(array('room', 'export', 'current_page_name'), $this->page['page_name']);
+
+ $select_str =& $this->session->getParameter(array('room', $this->edit_current_page_id, 'selected_select_str'));
+ $from_str =& $this->session->getParameter(array('room', $this->edit_current_page_id, 'selected_from_str'));
+ $add_from_str =& $this->session->getParameter(array('room', $this->edit_current_page_id, 'selected_add_from_str'));
+ $where_str =& $this->session->getParameter(array('room', $this->edit_current_page_id, 'selected_where_str'));
+ $add_where_str =& $this->session->getParameter(array('room', $this->edit_current_page_id,'selected_add_where_str'));
+ $export_add_where_str = ' AND {authorities}.user_authority_id != ?';
+ $params =& $this->session->getParameter(array('room', $this->edit_current_page_id, 'selected_params'));
+ $from_params =& $this->session->getParameter(array('room', $this->edit_current_page_id, 'selected_from_params'));
+ $where_params =& $this->session->getParameter(array('room', $this->edit_current_page_id, 'selected_where_params'));
+ if(!is_array($from_params)) $from_params = array();
+ if(!is_array($where_params)) $where_params = array();
+
+ $export_where_params = array(_AUTH_ADMIN);
+
+ $sql_params = array_merge((array)$params, (array)$from_params, (array)$where_params, (array)$export_where_params);
+
+ $sql = $select_str.$from_str.$add_from_str.$where_str.$add_where_str.$export_add_where_str;
+
+ //
+ // レコード数取得
+ //
+ $count_sql = 'SELECT COUNT(*) FROM (' . $select_str.$from_str.$add_from_str.$where_str.$add_where_str.$export_add_where_str . ') AS T';
+ $count_result =& $this->db->execute($count_sql, $sql_params, null, null, false);
+ if($count_result === false) {
+ $this->db->addError();
+ return 'error';
+ }
+
+ $data_count = intval($count_result[0][0]);
+ if($data_count == 0) {
+ $errorList =& $this->actionChain->getCurErrorList();
+ $errorList->add(get_class($this), ROOM_EXPORT_NONE);
+ return 'error';
+ }
+
+ return 'success';
+ }
+}
+?>
\ No newline at end of file
diff --git a/html/webapp/modules/room/action/admin/export/maple.ini b/html/webapp/modules/room/action/admin/export/maple.ini
new file mode 100644
index 0000000..f5ba385
--- /dev/null
+++ b/html/webapp/modules/room/action/admin/export/maple.ini
@@ -0,0 +1,21 @@
+[TokenExtra::TokenExtraExport]
+mode="check"
+action = "room_view_admin_regist_selectusers"
+
+[ValidateDef]
+parent_page_id.required ="1:lang._invalid_input"
+edit_current_page_id.required ="1:lang._invalid_input"
+parent_page_id,edit_current_page_id.room.RoomRegist = "1,export:lang._invalid_input"
+
+[Action]
+session = "ref:Session"
+db = "ref:DbObject"
+actionChain = "ref:ActionChain"
+
+
+[View]
+define:theme = 0
+success = "main:true.html"
+;success = "location:room_view_admin_export"
+;success = "location_script:"
+error = "main:error.html"
diff --git a/html/webapp/modules/room/action/admin/import/confirm/Confirm.class.php b/html/webapp/modules/room/action/admin/import/confirm/Confirm.class.php
new file mode 100644
index 0000000..d2bd4f6
--- /dev/null
+++ b/html/webapp/modules/room/action/admin/import/confirm/Confirm.class.php
@@ -0,0 +1,203 @@
+authoritiesView->getAuthorities(array('(system_flag ='. _ON . ' OR user_authority_id = '. _AUTH_MODERATE. ') AND user_authority_id != '. _AUTH_ADMIN => null));
+ $this->authorities = array();
+ foreach($tmp_authorities as $a) {
+ $a['new_total'] = 0;
+ $a['added_num'] = 0;
+ $this->authorities[$a['role_authority_id']] = $a;
+ }
+
+ $errorList =& $this->actionChain->getCurErrorList();
+ $warn_cnt = 0;
+
+ // 不要セッション情報初期化
+ $this->session->removeParameter(array('room', 'import', 'count'));
+ $this->session->removeParameter(array('room', 'import', 'warn'));
+
+ // メンバ変数初期化
+ $this->added_auth_member_num = array();
+ $this->total_auth_member_num = array();
+ $this->deleted_auth_member_num = 0;
+
+ // デフォルト参加権限定義情報を取得しておきます
+ $config = $this->configView->getConfigByCatid(_SYS_CONF_MODID, _GENERAL_CONF_CATID);
+ if($this->page['default_entry_flag'] == _OFF) {
+ $default_role_auth = _ROLE_AUTH_OTHER;
+ }
+ else {
+ if($this->page['space_type'] == _SPACE_TYPE_PUBLIC) {
+ $default_role_auth = $config['default_entry_role_auth_public']['conf_value'];
+ }
+ else {
+ $default_role_auth = $config['default_entry_role_auth_group']['conf_value'];
+ }
+ }
+
+ // 変更ユーザ情報、対象ルームユーザ情報取得
+ $change_users = $this->session->getParameter(array('room', 'import', 'data'));
+ $users = $this->roomView->getRoomUsersList($this->page, $this->parent_page, $this->authorities);
+
+ $my_handle = $this->session->getParameter('_handle');
+
+ foreach($change_users as $handle=>$new_auth) {
+ // 対象者が存在しない会員だった
+ // 管理者権限だった
+ // 自分だった
+ // 警告追加＆スキップ
+ if($handle==$my_handle
+ || !isset($users[$handle])
+ || $users[$handle]['user_authority_id'] == _AUTH_ADMIN ) {
+ $this->session->setParameter(array('room', 'import', 'warn', $warn_cnt++), $handle);// 警告追加しスキップ
+ continue;
+ }
+ $where_params = array(
+ 'room_id' => $this->edit_current_page_id,
+ 'user_id' => $users[$handle]['user_id']
+ );
+ $ins_params = array(
+ 'room_id' => $this->edit_current_page_id,
+ 'user_id' => $users[$handle]['user_id'],
+ 'role_authority_id' => $new_auth,
+ 'createroom_flag' => _OFF
+ );
+ $upd_params = array(
+ 'role_authority_id' => $new_auth
+ );
+ $del_upd_params = array(
+ 'role_authority_id' => $new_auth,
+ 'createroom_flag' => _OFF
+ );
+
+ // 不参加に
+ if($new_auth == _ROLE_AUTH_OTHER) {
+ if($default_role_auth==$new_auth) {
+ $resultPageUserLink = $this->pagesAction->delPageUsersLink($where_params);
+ }
+ else {
+ if($users[$handle]['createroom_flag']==_OFF && $users[$handle]['authority_id']==$default_role_auth) {
+ $resultPageUserLink = $this->pagesAction->insPageUsersLink($ins_params);
+ }
+ else {
+ $resultPageUserLink = $this->pagesAction->updPageUsersLink($del_upd_params, $where_params);
+ }
+ }
+
+ // 対象が親ルームの場合は、全てのサブルームからも削除
+ if($this->page['space_type']!=_SPACE_TYPE_PUBLIC && $this->page['thread_num']==1) {
+ $subroom_where_params = array($this->edit_current_page_id, $users[$handle]['user_id']);
+ $sql = ' DELETE FROM {pages_users_link} WHERE room_id IN (SELECT page_id FROM {pages} WHERE parent_id=? AND page_id=room_id) AND user_id = ?';
+ $this->db->execute($sql, $subroom_where_params);
+ }
+ if($resultPageUserLink) {
+ $this->deleted_auth_member_num++;
+ }
+ }
+ // 権限変更
+ else {
+ if(!isset($users[$handle]['permitted_auth'][$new_auth])
+ || $users[$handle]['permitted_auth'][$new_auth]==_OFF) {
+ $this->session->setParameter(array('room', 'import', 'warn', $warn_cnt++), $handle);// 警告追加しスキップ
+ continue;
+ }
+ // デフォルト権限での参加に変更
+ if($new_auth==$default_role_auth) {
+ // しかし現状ルーム作成権限がON
+ if($users[$handle]['createroom_flag']==_ON) {
+ // ならばUPDATEでレコード温存
+ $resultPageUserLink = $this->pagesAction->updPageUsersLink($upd_params, $where_params);
+ }
+ // ルーム作成権限OFF
+ else {
+ // ならばレコード削除
+ $resultPageUserLink = $this->pagesAction->delPageUsersLink($where_params);
+ }
+ }
+ else {
+ if($users[$handle]['authority_id']==$default_role_auth) {
+ // しかし現状ルーム作成権限がON
+ if($users[$handle]['createroom_flag']==_ON) {
+ // ならば既にレコードあり。UPDATE
+ $resultPageUserLink = $this->pagesAction->updPageUsersLink($upd_params, $where_params);
+ }
+ else {
+ $resultPageUserLink = $this->pagesAction->insPageUsersLink($ins_params);
+ }
+ }
+ else {
+ $resultPageUserLink = $this->pagesAction->updPageUsersLink($upd_params, $where_params);
+ }
+ }
+ if($resultPageUserLink) {
+ $this->authorities[$new_auth]['added_num']++;
+ }
+ }
+ if($resultPageUserLink) {
+ $users[$handle]['authority_id'] = $new_auth;
+ }
+ else {
+ $this->session->setParameter(array('room', 'import', 'warn', $warn_cnt++), $handle);// 警告追加しスキップ
+ }
+ }
+
+ foreach($users as $handle=>$user) {
+ if(!isset($this->authorities[$user['authority_id']])) {
+ continue;
+ }
+ $this->authorities[$user['authority_id']]['new_total']++;
+ }
+
+ foreach($this->authorities as $a) {
+ $this->added_auth_member_num[$a['role_authority_name']] = $a['added_num'];
+ $this->total_auth_member_num[$a['role_authority_name']] = $a['new_total'];
+ }
+ return 'success';
+ }
+}
\ No newline at end of file
diff --git a/html/webapp/modules/room/action/admin/import/confirm/dicon.ini b/html/webapp/modules/room/action/admin/import/confirm/dicon.ini
new file mode 100644
index 0000000..fc26ae6
--- /dev/null
+++ b/html/webapp/modules/room/action/admin/import/confirm/dicon.ini
@@ -0,0 +1,3 @@
+[DIContainer]
+roomView = "modules://room.components.view"
+pagesAction = "pages.Action"
diff --git a/html/webapp/modules/room/action/admin/import/confirm/maple.ini b/html/webapp/modules/room/action/admin/import/confirm/maple.ini
new file mode 100644
index 0000000..75da971
--- /dev/null
+++ b/html/webapp/modules/room/action/admin/import/confirm/maple.ini
@@ -0,0 +1,30 @@
+[DIContainer]
+filename_import = "dicon.ini"
+
+[TokenExtra]
+mode="check"
+action="room_view_admin_import_confirm"
+
+[ValidateDef]
+authcheck = "1,_auth_id>=_AUTH_CHEIF:lang._invalid_auth"
+parent_page_id,edit_current_page_id.room.ImportRoomIdCheck = "1:lang._invalid_input"
+parent_page_id.required ="1:lang._invalid_input"
+edit_current_page_id.required ="1:lang._invalid_input"
+parent_page_id,edit_current_page_id.room.RoomRegist = "1,export:lang._invalid_input"
+
+[Action]
+session = "ref:Session"
+configView = "ref:configView"
+usersView = "ref:usersView"
+pagesView = "ref:pagesView"
+pagesAction = "ref:pagesAction"
+roomView = "ref:roomView"
+authoritiesView = "ref:authoritiesView"
+actionChain = "ref:ActionChain"
+db = "ref:DbObject"
+
+[View]
+define:theme = 1
+success = "room_action_admin_import_confirm.html"
+error = "main:error.html"
+
diff --git a/html/webapp/modules/room/action/admin/selmodules/Selmodules.class.php b/html/webapp/modules/room/action/admin/selmodules/Selmodules.class.php
index 385bc49..95f6152 100644
--- a/html/webapp/modules/room/action/admin/selmodules/Selmodules.class.php
+++ b/html/webapp/modules/room/action/admin/selmodules/Selmodules.class.php
@@ -15,109 +15,97 @@
class Room_Action_Admin_Selmodules extends Action
{
// リクエストパラメータを受け取るため
- var $edit_current_page_id = null;
- var $parent_page_id = null;
-
- var $enroll_modules = null;
-
+ var $edit_current_page_id = null;
+ var $parent_page_id = null;
+
+ var $enroll_modules = null;
+
// バリデートによりセット
var $parent_page = null;
var $page = null;
-
- // 使用コンポーネントを受け取るため
- var $pagesView = null;
- var $pagesAction = null;
- var $modulesView = null;
- var $blocksView = null;
- var $blocksAction = null;
- var $preexecuteMain = null;
- var $db = null;
- var $request = null;
-
+
+ // 使用コンポーネントを受け取るため
+ var $pagesView = null;
+ var $pagesAction = null;
+ var $modulesView = null;
+ var $blocksView = null;
+ var $blocksAction = null;
+ var $preexecuteMain = null;
+ var $db = null;
+ var $request = null;
+
//値をセットするため
- /**
- * 使用可能モジュール配置修正
- *
- * @access public
- */
- function execute()
- {
- if($this->edit_current_page_id != 0) {
- $log =& LogFactory::getLog();
- // ----------------------------------------------------------------------
- // --- ページモジュールリンクテーブル変更 ---
- // ----------------------------------------------------------------------
- //if(isset($this->enroll_modules)) {
- $where_params = array(
- "room_id" => $this->edit_current_page_id
- );
- $page_modules =& $this->pagesView->getPageModulesLink($where_params, null, array($this, "_fetchcallbackModulesLink"));
- $error_flag = false;
- if(isset($this->enroll_modules)) {
- foreach($this->enroll_modules as $module_id) {
- if(!isset($page_modules[$module_id])) {
- $params = array(
- "room_id" => $this->edit_current_page_id,
- "module_id" => $module_id
- );
- //insert
- $result = $this->pagesAction->insPagesModulesLink($params);
- if($result === false) {
- $error_flag = true;
- }
- }
- unset($page_modules[$module_id]);
- }
- }
- $page_list =& $this->db->selectExecute("pages", array("room_id" => $this->edit_current_page_id) ,null, null, null, array($this, "_fetchcallback"));
- if($page_list === false) {
- return 'error';
- }
- $blocks =& $this->blocksView->getBlockByPageId($page_list);
-
- //ページモジュールリンクテーブル削除
- foreach($page_modules as $page_module) {
- $where_params = array(
- "room_id" => $page_module['room_id'],
- "module_id" => $page_module['module_id']
- );
- $result = $this->pagesAction->delPagesModulesLink($where_params);
- if($result === false) {
- $error_flag = true;
- }
- //
- // モジュール削除関数を呼び出す
- //
- $module =& $this->modulesView->getModulesById($page_module['module_id']);
- $delete_action = $module['delete_action'];
- if($delete_action != "" && $delete_action != null) {
- $result = $this->pagesAction->delFuncExec($page_module['room_id'], $module, $delete_action);
- }
- }
- if(is_array($blocks) && count($blocks) > 0) {
- foreach($blocks as $block) {
- $module_id = $block['module_id'];
- if(isset($page_modules[$module_id])) {
- //block削除処理
- $preexecute_params = array(
- "block_id" => $block['block_id'],
- "page_id"=> $block['page_id']
- );
- $result = $this->preexecuteMain->preExecute("pages_actionblock_deleteblock", $preexecute_params);
- //if($result === false || $result === "false") {
- // $log->warn(sprintf("%sの削除アクション(%s)が失敗しました。","pages", "pages_actionblock_deleteblock"), "Room_Action_Admin_Create_Selectmodules#execute");
- //}
- }
- }
- }
- if($error_flag) {
- return 'error';
- }
- //}
- }
- // ----------------------------------------------------------------------
- // --- 終了処理 ---
+ /**
+ * 使用可能モジュール配置修正
+ *
+ * @access public
+ */
+ function execute()
+ {
+ $roomId = $this->edit_current_page_id;
+ $usableModuleIds = $this->enroll_modules;
+ if (!isset($usableModuleIds)) {
+ $usableModuleIds = array();
+ }
+ $previousUsableModules = $this->pagesView->getUsableModulesByRoom($roomId, true);
+
+ $isError = false;
+ foreach ($usableModuleIds as $moduleId) {
+ if (isset($previousUsableModules[$moduleId])) {
+ unset($previousUsableModules[$moduleId]);
+ continue;
+ }
+
+ $insertDatas = array(
+ 'room_id' => $roomId,
+ 'module_id' => $moduleId
+ );
+
+ if (!$this->pagesAction->insPagesModulesLink($insertDatas)) {
+ $isError = true;
+ }
+ }
+
+ if (!$this->pagesAction->deleteEachModule($roomId, $previousUsableModules)) {
+ $isError = true;
+ }
+
+ $unusableModuleIds = array_keys($previousUsableModules);
+ if (!$this->pagesAction->deleteRoomModule($roomId, $unusableModuleIds)) {
+ $isError = true;
+ }
+
+ $sql = "SELECT B.block_id, "
+ . "B.page_id "
+ . "FROM {blocks} B "
+ . "INNER JOIN {pages} P "
+ . "ON B.page_id = P.page_id "
+ . "WHERE P.room_id = ? "
+ . "AND B.module_id IN ('" . implode("','", $unusableModuleIds) . "')";
+ $blocks =& $this->db->execute($sql, $roomId);
+ if ($blocks === false) {
+ $this->db->addError();
+ }
+
+ foreach($blocks as $block) {
+ $request = array(
+ 'block_id' => $block['block_id'],
+ 'page_id' => $block['page_id']
+ );
+ $result = $this->preexecuteMain->preExecute('pages_actionblock_deleteblock', $request);
+ if ($result === false
+ || $result === 'false') {
+ $isError = true;
+ }
+ }
+
+ if($isError) {
+ return 'error';
+ }
+
+ // ----------------------------------------------------------------------
+ // --- 終了処理 ---
// ----------------------------------------------------------------------
// リスト表示のリクエストパラメータセット
if(!isset($this->parent_page)) {
@@ -130,37 +118,7 @@ function execute()
$this->request->setParameter("show_default_entry_flag", $this->parent_page['default_entry_flag']);
}
- return 'success';
- }
-
-
- /**
- * fetch時コールバックメソッド
- * @param result adodb object
- * @return array
- * @access private
- */
- function &_fetchcallbackModulesLink($result) {
- $ret = array();
- while ($row = $result->fetchRow()) {
- $ret[$row['module_id']] = $row;
- }
- return $ret;
- }
-
-
- /**
- * fetch時コールバックメソッド
- * @param result adodb object
- * @return array
- * @access private
- */
- function &_fetchcallback($result) {
- $ret = array();
- while ($row = $result->fetchRow()) {
- array_push ( $ret, $row['page_id']);
- }
- return $ret;
+ return 'success';
}
}
?>
diff --git a/html/webapp/modules/room/action/admin/selmodules/dicon.ini b/html/webapp/modules/room/action/admin/selmodules/dicon.ini
index 8431155..d38ced3 100644
--- a/html/webapp/modules/room/action/admin/selmodules/dicon.ini
+++ b/html/webapp/modules/room/action/admin/selmodules/dicon.ini
@@ -1,14 +1,13 @@
[DIContainer]
databaseSqlutility = "database.sqlutility"
-blocksAction = "blocks.action"
pagesAction = "pages.action"
+uploadsAction = "uploads.action"
+blocksAction = "blocks.action"
[blocksAction]
databaseSqlutility = "dicon://databaseSqlutility"
preexecuteMain = "dicon://preexecuteMain"
-modulesView = "dicon://modulesView"
[pagesAction]
databaseSqlutility = "dicon://databaseSqlutility"
-preexecuteMain = "dicon://preexecuteMain"
-modulesView = "dicon://modulesView"
\ No newline at end of file
+preexecuteMain = "dicon://preexecuteMain"
\ No newline at end of file
diff --git a/html/webapp/modules/room/components/View.class.php b/html/webapp/modules/room/components/View.class.php
new file mode 100644
index 0000000..29eec87
--- /dev/null
+++ b/html/webapp/modules/room/components/View.class.php
@@ -0,0 +1,204 @@
+_container =& DIContainerFactory::getContainer();
+ $this->_db =& $this->_container->getComponent("DbObject");
+ $this->_session =& $this->_container->getComponent("Session");
+ $this->_authoritiesView =& $this->_container->getComponent("authoritiesView");
+ $this->_configView =& $this->_container->getComponent("configView");
+ }
+ /**
+ * ルーム内参加可能者一覧、およびそれらの人物へ与えているロール権限、そして権限設定可能上限
+ *
+ * @access public
+ */
+ function &getRoomUsersList($page, $parent_page, $authorities)
+ {
+ $subroom_flag = false;
+ $edit_current_page_id = $page['page_id'];
+ $parent_page_id = $parent_page['page_id'];
+ if($edit_current_page_id != _SELF_TOPPUBLIC_ID && $parent_page['thread_num']==1) {
+ $subroom_flag = true;
+ }
+ $space_type = $page['space_type'];
+ // 親ページがない＝パブリックスペースTOP
+ // このときはcreateroom_flag設定による権限以上の権限取得の抜け駆け禁止
+ if($space_type == _SPACE_TYPE_PUBLIC && $page['thread_num'] == 0) {
+ $public_top_page_flag = _ON;
+ }
+ else {
+ $public_top_page_flag = _OFF;
+ }
+
+ $default_entry_flag = $page['default_entry_flag'];
+
+ $config = $this->_configView->getConfigByCatid(_SYS_CONF_MODID, _GENERAL_CONF_CATID);
+ if($config == false) {
+ return false;
+ }
+ $default_entry_role_auth_public = $config['default_entry_role_auth_public']['conf_value'];
+ $default_entry_role_auth_group = $config['default_entry_role_auth_group']['conf_value'];
+
+
+ $params = array();
+ $select_str = 'SELECT {users}.user_id, {users}.handle, '.
+ '{authorities}.user_authority_id,'.
+ '{authorities}.role_authority_id,'.
+ '{authorities}.public_createroom_flag,'.
+ '{authorities}.group_createroom_flag,'.
+ '{authorities}.hierarchy,'.
+ '{pages_users_link}.role_authority_id AS authority_id,'.
+ '{pages_users_link}.createroom_flag';
+
+ $from_str = ' FROM {authorities}, {users}'.
+ ' LEFT JOIN {pages_users_link} ON {pages_users_link}.room_id='.$edit_current_page_id.
+ ' AND {users}.user_id={pages_users_link}.user_id ';
+
+ $where_str = ' WHERE {users}.role_authority_id={authorities}.role_authority_id';
+
+ if($parent_page['thread_num'] >= 1) {
+ //親ルームに参加している会員すべて（サブグループ作成）
+ if($parent_page['default_entry_flag']) {
+ $where_str .= ' AND {users}.user_id NOT IN (SELECT user_id FROM {pages_users_link} WHERE room_id =' . $parent_page_id . ' AND role_authority_id = ' . _ROLE_AUTH_OTHER . ')';
+ }
+ else {
+ $where_str .= ' AND {users}.user_id IN (SELECT user_id FROM {pages_users_link} WHERE room_id =' . $parent_page_id . ')';
+ }
+ }
+ $sql = $select_str . $from_str . $where_str;
+ $users =& $this->_db->execute($sql, $params, null, null, true,
+ array($this, '_usersFetchCallback'),
+ array($subroom_flag, $space_type, $default_entry_flag, $default_entry_role_auth_public, $default_entry_role_auth_group, $authorities, $public_top_page_flag));
+ return $users;
+ }
+ /**
+ * fetch時コールバックメソッド
+ * @param result adodb object
+ * @return array items
+ * @access private
+ */
+ function &_roomusersFetchcallback($result)
+ {
+ $ret = array();
+ while ($row = $result->fetchRow()) {
+ $ret[$row['user_id']] = $row;
+ }
+ return $ret;
+ }
+ /**
+ * fetch時コールバックメソッド
+ * @param result adodb object
+ * @return array items
+ * @access private
+ */
+ function &_usersFetchcallback($result, $params)
+ {
+ $subroom_flag = $params[0];
+ $space_type = $params[1];
+ $default_entry_flag = $params[2];
+ $default_entry_role_auth_public = $params[3];
+ $default_entry_role_auth_group = $params[4];
+ $authorities = $params[5];
+ $public_top_page_flag = $params[6];
+
+ $auth = array();
+ foreach($authorities as $a) {
+ $auth[$a['role_authority_id']] = $a;
+ }
+
+ $ret = array();
+
+ while ($row = $result->fetchRow()) {
+ // createroom_flag がONでも、該当のページがパブリックスペースのTOPのときは有効にならない！
+ if(($public_top_page_flag==_OFF && $row['createroom_flag']==_ON) || ($public_top_page_flag==_OFF && $space_type==_SPACE_TYPE_PUBLIC && $row['public_createroom_flag']==_ON) || ($space_type==_SPACE_TYPE_GROUP && $row['group_createroom_flag']==_ON)) {
+ $createroom_flag =_ON;
+ }
+ else {
+ $createroom_flag =_OFF;
+ }
+ // authがNULLのとき デフォルト権限を意味する
+ if(is_null($row['authority_id'])) {
+ if($default_entry_flag==_OFF) {
+ $row['authority_id'] = _ROLE_AUTH_OTHER;
+ }
+ else {
+ if($space_type==_SPACE_TYPE_PUBLIC) {
+ $row['authority_id'] = $default_entry_role_auth_public;
+ }
+ else {
+ $row['authority_id'] = $default_entry_role_auth_group;
+ }
+ }
+ }
+
+ $row_auth = array();
+ foreach($auth as $auth_id=>$a) {
+
+ $row_auth[$auth_id] = false;
+
+ if($subroom_flag == true) { // サブルームであれば誰でも何にでもなれる
+ $row_auth[$auth_id] = true;
+ }
+ else {
+ if($auth_id==_ROLE_AUTH_CHIEF) {
+ if($row['hierarchy'] >=_HIERARCHY_CHIEF || ($row['authority_id'] == _ROLE_AUTH_ADMIN || $row['authority_id'] == _ROLE_AUTH_CHIEF) || $createroom_flag==_ON) {
+ $row_auth[$auth_id] = true;
+ }
+ }
+ else if($auth_id==_ROLE_AUTH_GENERAL) {
+ if($row['hierarchy'] >=_HIERARCHY_GENERAL || ($row['authority_id'] == _ROLE_AUTH_GENERAL) || $createroom_flag==_ON) {
+ $row_auth[$auth_id] = true;
+ }
+ }
+ else if($auth_id==_ROLE_AUTH_GUEST) { // ゲストは誰でもなれる
+ $row_auth[$auth_id] = true;
+ }
+ else {
+ if($row['hierarchy']>=$a['hierarchy'] || $createroom_flag == _ON || $row['authority_id'] == $a['role_authority_id']) {
+ $row_auth[$auth_id] = true;
+ }
+ }
+ }
+ }
+ $row['permitted_auth'] = $row_auth;
+ $ret[$row['handle']] = $row;
+ }
+ return $ret;
+ }
+}
diff --git a/html/webapp/modules/room/config/main.ini b/html/webapp/modules/room/config/main.ini
index d90e3c0..3367d25 100644
--- a/html/webapp/modules/room/config/main.ini
+++ b/html/webapp/modules/room/config/main.ini
@@ -6,4 +6,11 @@ room_list_visible_rows = 18 ;//ルーム一覧表示行数
room_users_regist_once = 30000 ;//一度に登録する会員数（この数を越える会員の登録を行う場合、sendを複数回繰り返す）
[Room_View_Admin_Regist_Selectusers:Room_View_Admin_Regist_Confirm]
-room_users_list = 15 ;//会員選択一覧表示行数
\ No newline at end of file
+room_users_list = 15 ;//会員選択一覧表示行数
+
+[Room_View_Admin_Import]
+define:ROOM_IMPORT_LINE_LIMIT = 10000
+
+[Room_View_Admin_Import_Upload]
+define:ROOM_TIME_LIMIT = 12000
+define:ROOM_IMPORT_ITEM_COLUMN = 2
\ No newline at end of file
diff --git a/html/webapp/modules/room/files/css/default/style.css b/html/webapp/modules/room/files/css/default/style.css
index ca6d442..f4e3017 100644
--- a/html/webapp/modules/room/files/css/default/style.css
+++ b/html/webapp/modules/room/files/css/default/style.css
@@ -28,7 +28,7 @@ div.room_init_icon_title {
width:120px;
}
.room_admin{
- width:340px;
+ width:460px;
}
img.room_prefix_icon {
height:15px;
@@ -112,6 +112,11 @@ img.room_prefix_icon {
margin:5px;
padding:0.4em;
}
+div.room_csv_export {
+ float:right;
+ margin:-1.5em 20px 0.5em 0;
+ font-weight:bold;
+}
/* 登録内容確認 */
.room_confirm_default_entry {
font-weight:bold;
@@ -130,4 +135,51 @@ select.room_selectlist {
}
.room_inf td {
padding:6px;
+}
+/* 参加者インポート */
+.room_import_file_select {
+ width:32em;
+}
+.room_import_help_field {
+ width:42em;
+}
+div.room_import_help_description {
+ overflow: auto;
+ border: 1px solid;
+ padding: 5px;
+}
+table.room_import_help_description {
+ width:100%;
+}
+tr.room_grid_row {
+ margin : 1px;
+ border:1px solid #d5d5d5;
+ height : 22px;
+ overflow : hidden;
+ line-height: 18px;
+}
+th.room_grid_header {
+ padding : 3px 2px 2px 3px;
+ text-align:center;
+ background-color:#e0e0e0;
+ border:1px solid #d5d5d5;
+}
+td.room_grid_col {
+ padding : 3px 2px 2px 3px;
+ border:1px solid #d5d5d5;
+ padding-left:4px;
+}
+.room_indent {
+ margin-left:20px;
+}
+.room_import_form label {
+ margin:2px 8px;
+}
+.room_import_result {
+ margin: 5px 15px;
+ padding: 1em;
+ border: 1px solid #999;
+}
+.room_import_result table td {
+ padding: 2px 5px;
}
\ No newline at end of file
diff --git a/html/webapp/modules/room/files/js/room.js b/html/webapp/modules/room/files/js/room.js
index 3be6a2f..3ed2c72 100644
--- a/html/webapp/modules/room/files/js/room.js
+++ b/html/webapp/modules/room/files/js/room.js
@@ -241,5 +241,90 @@ clsRoom.prototype = {
'lang':select_lang
}
commonCls.sendView(this.id, params);
+ },
+ roomUsersExport: function(event, parent_page_id, edit_current_page_id, confirm_mes) {
+
+ var top_el = $(this.id);
+
+ var params = {
+ 'action':'room_action_admin_export',
+ 'parent_page_id':parent_page_id,
+ 'edit_current_page_id':edit_current_page_id
+ }
+ var parameter = new Object();
+ parameter["callbackfunc"] = function(res){
+ if(!commonCls.confirm(confirm_mes))
+ {
+ return false;
+ }
+ location.href= '.' + _nc_index_file_name + '?action=room_view_admin_export&_token='+ $('_token' +this.top_el_id).value;
+ }
+ parameter["callbackfunc_error"] = function(res) {
+ commonCls.alert(res);
+ }
+ commonCls.sendPost(this.id, params, parameter);
+ },
+ _isSelectFile: function(frm) {
+ if($F("room_import_file_select").length > 0) {
+ return(true);
+ }
+ return(false);
+ },
+ _alertImport: function(confirm_message, target) {
+ var keyword = $(target).textContent;
+ var newmsg = confirm_message.replace('%error_item%', keyword);
+ commonCls.alert(newmsg);
+ return;
+ },
+ doUserImport: function(frm, confirm_message) {
+ var keyword;
+ if(!this._isSelectFile(frm)) {
+ this._alertImport(confirm_message, 'room_import_label_file');
+ return false;
+ }
+
+ var this_el = $("room_import_frm");
+ var top_el = $(this.id);
+ var params = new Object();
+ params["method"] = "post";
+
+ params["top_el"] = top_el;
+ params["loading_el"] = top_el;
+ params["timeout_flag"] = 0;
+
+ params['form_prefix'] = "room_import_attachment";
+
+
+
+ params["param"] = new Object();
+ params["param"]["action"] = "room_view_admin_import_upload";
+
+ params["callbackfunc"] = function(res) {
+ this.user_checkdata(this_el);
+ }.bind(this);
+ params["callbackfunc_error"] = function(file_list, res){
+ commonCls.alert(res);
+ }.bind(this);
+ commonCls.sendAttachment(params);
+ },
+ user_checkdata: function(this_el) {
+ var top_el = $(this.id);
+ var chk_params = new Object();
+ chk_params["param"] = {"action":"room_view_admin_import_confirm"};
+ chk_params["top_el"] = top_el;
+ chk_params["loading_el"] = top_el;
+ chk_params["target_el"] = $(this.id);
+
+ commonCls.send(chk_params);
+ },
+ user_importdata: function() {
+ var top_el = $(this.id);
+ var action_params = new Object();
+ action_params['method'] = "post";
+ action_params["param"] = {"action":"room_action_admin_import_confirm"};
+ action_params["top_el"] = top_el;
+ action_params["loading_el"] = top_el;
+ action_params["target_el"] = $(this.id);
+ commonCls.send(action_params);
}
}
\ No newline at end of file
diff --git a/html/webapp/modules/room/install.ini b/html/webapp/modules/room/install.ini
index 72cd700..1d9ca3d 100644
--- a/html/webapp/modules/room/install.ini
+++ b/html/webapp/modules/room/install.ini
@@ -1,4 +1,5 @@
-version = "2.4.0.0"
+version = "2.4.0.2"
action_name="room_view_admin_init"
module_icon="room.gif"
system_flag=1
+module_update_action = "room_update"
diff --git a/html/webapp/modules/room/language/chinese/main.ini b/html/webapp/modules/room/language/chinese/main.ini
index 5eac669..9e26a0d 100644
--- a/html/webapp/modules/room/language/chinese/main.ini
+++ b/html/webapp/modules/room/language/chinese/main.ini
@@ -16,6 +16,7 @@ room_admin = "管理"
room_back_list = "返回"
room_admin_inf = "编辑"
room_admin_edit = "成员"
+room_admin_import = "进口"
room_confirm_roomdelete = "如果删除房间%s，房间内的所有模块都将消失。
您确定要删除房间吗？"
room_list_display_flag_on = "开放"
room_list_display_flag_off = "维护中"
@@ -50,7 +51,14 @@ room_name_error_mes = "该房间名已存在。"
room_top_description ="设置房间内所有成员的角色，然后按%s。按%s可一次性设置所有角色。
如果您想要继续添加成员，请按%s。"
room_top_user_auth_id = "权限"
room_selected_entry_users = "检索成员"
+room_csv_export = "(出口参与者权限列表)"
+room_export_confirm_exp = "您可以导出室成员的角色，排除%s当局。
您确定要继续吗？
*下载CSV文件，将备份文件，这个房间。
下载后，请仔细保存这个文件。"
+room_export_exp = "这个房间里的角色成员列表中显示的将是出口。（是否排除%s）"
+[Room_View_Admin_Export]
+define:ROOM_EXPORT_AUTHORITY_NAME = "角色"
+[Room_View_Admin_Export:Room_Action_Admin_Export]
+define:ROOM_EXPORT_NONE = "暂无可导出的用户。"
[Room_View_Admin_Regist_Userslist:Room_View_Admin_Regist_Confirm]
room_subgroup_create_on ="允许"
@@ -85,4 +93,59 @@ room_entry_modules="允许使用的模块"
confirm_selectmodules = "您确定要更改可用模块设置吗？"
[Room_Action_Admin_Search]
-room_user_search_condition_limit = "选项过多"
\ No newline at end of file
+room_user_search_condition_limit = "选项过多"
+
+
+[Room_View_Admin_Import]
+room_import_title_description = "你可以导入的房间（%s）成员的角色。"
+room_import_file = "导入文件"
+room_import_select_file_description = "请指定导入文件设置的角色。"
+room_import_select_file_note = "第一行被视为一个标题行。
行上限为%d。"
+room_import_help_label = "帮助"
+room_import_help_title = "导入文件设置的详细确认"
+room_import_exp = "你可以注册角色的房间成员从导入的文件。
中止，如果权力不能放弃或成员可以不参加已经描述，进口没有得到执行。
为了避免错误，请使用导出的文件。
"
+room_import_import_imp = "进出口运行"
+room_import_help_open = "显示"
+room_import_help_close = "关闭"
+room_import_item = "项目"
+room_import_contents = "内容"
+room_import_need_on = "※必填字段
+room_import_sel = "＜选项＞"
+room_not_entry = "不参加"
+define:ROOM_IMPORT_ITEM_HANDLE = "设置昵称。"
+room_import_check_message = "%error_item%没有被选中。"
+define:ROOM_IMPORT_HELP_AUTH_LABEL = "参与权"
+define:ROOM_IMPORT_HELP_AUTH_EXP = "在这个房间里的角色设置。"
+define:ROOM_IMPORT_UPLOAD_SYSERR = "系统发生错误。"
+define:ROOM_IMPORT_UPLOAD_OPEN_ERR = "文件打开错误。"
+define:ROOM_IMPORT_UPLOAD_NOROOM_ERR = "房间不存在的指定。"
+define:ROOM_IMPORT_UPLOAD_NO_PERMISSION = "你没有权限。"
+define:ROOM_IMPORT_UPLOAD_COLUMN_ERR = "错误：%d
CSV文件中的列数是错误的。"
+define:ROOM_IMPORT_UPLOAD_NOUSER_ERR = "错误：%d
不存在，或者是不可能的成员角色，%s 已被指定为操作对象。"
+define:ROOM_IMPORT_UPLOAD_NOAUTH_ERR = "错误：%d
%d 是错误的权威价值。"
+define:ROOM_IMPORT_UPLOAD_NOT_PERMIT_AUTH = "错误：%d
成员%s，权威[%d]不能设置。"
+define:ROOM_IMPORT_UPLOAD_NO_CHAGE = "没有变化。"
+define:ROOM_IMPORT_UPLOAD_LINE_OVER_ERR = "文件中的行数超过%d行。"
+define:ROOM_IMPORT_CONFIRM_ADMINUSER_WRAN = "会员“管理”不能改变基本权限。排除在这一进程。"
+define:ROOM_IMPORT_CONFIRM_MYSELF_WRAN = "不能改变自己管理局。排除在这一进程。"
+define:ROOM_IMPORT_CONFIRM_PUBLIC_OTHER_WRAN = "这是不可能改变在公共空间中的不参与。排除在这一进程。"
+define:ROOM_IMPORT_UPLOAD_NODATAS_ERR = "在文件中不存在的数据线。"
+
+[Room_View_Admin_Import_Confirm]
+room_import_confirm_message1 = "这个角色列表将被设置为%s的房间。"
+room_import_confirm_change_count = "%d人将被添加到%s。"
+room_import_confirm_message2 = "本次变动后中，的间客房的的角色设施将作如下安排。
"
+room_import_confirm_count = "%s %d"
+room_import_confirm_message3 = "您确定要继续吗？"
+room_import_confirm_warnMsg = "昵称「%s」"
+
+
+[Room_Action_Admin_Import_Confirm]
+room_import_confirm_message1 = "%s的房间已成立了这个角色列表"
+room_import_confirm_change_count = "%d人已被添加到的%s。"
+room_import_confirm_message2 = "角色房间的情况如下。
"
+room_import_confirm_count = "%s %d"
+
+room_import_confirm_warnMsg = "有一个问题。
而不可能改变成员下面描述的。"
+room_not_entry = "不参加"
+
diff --git a/html/webapp/modules/room/language/english/main.ini b/html/webapp/modules/room/language/english/main.ini
index ce5a3b7..90b0214 100644
--- a/html/webapp/modules/room/language/english/main.ini
+++ b/html/webapp/modules/room/language/english/main.ini
@@ -15,6 +15,7 @@ room_space_common="Open for all members"
room_admin = "Controler"
room_back_list = "Back"
room_admin_inf = "Edit"
+room_admin_import = "Import"
room_admin_edit = "Members"
room_confirm_roomdelete = "By deleting the room, %s, all the modules created in the room will vanish.
Are you sure to proceed?"
room_list_display_flag_on = "Open"
@@ -50,7 +51,14 @@ room_name_error_mes = "There exists a room of the same name."
room_top_description ="Set the roles of the room members, and press %s button. To set the roles all at once, press %s button.
If you wish to continue to add members, press %s button"
room_top_user_auth_id = "Authority"
room_selected_entry_users = "Search for the members"
+room_csv_export = "(Export participants authority list)"
+room_export_confirm_exp = "You can export the roles of the room members, exclude %s authorities.
Are you sure to proceed?
*The download csv files will be backup-file for this room.
Please preserve this file carefully after downloading."
+room_export_exp = "The roles of this room members displayed in the list will be export.(exclude %s) "
+[Room_View_Admin_Export]
+define:ROOM_EXPORT_AUTHORITY_NAME = "Roles"
+[Room_View_Admin_Export:Room_Action_Admin_Export]
+define:ROOM_EXPORT_NONE = "There is no member to export."
[Room_View_Admin_Regist_Userslist:Room_View_Admin_Regist_Confirm]
room_subgroup_create_on ="Allowed"
@@ -85,4 +93,59 @@ room_entry_modules="Modules allowed to use"
confirm_selectmodules = "You are changing the set of modules
which are allowed to be used.
Are you sure to proceed?"
[Room_Action_Admin_Search]
-room_user_search_condition_limit = "Too many conditions."
\ No newline at end of file
+room_user_search_condition_limit = "Too many conditions."
+
+
+[Room_View_Admin_Import]
+room_import_title_description = "You can import the roles of room(%s) members."
+room_import_file = "Import file"
+room_import_select_file_description = "Please specify the import file to set the roles."
+room_import_select_file_note = "The first line is treated as a header line.
Upper limit of the line is %d."
+room_import_help_label = "Help"
+room_import_help_title = "Detailed confirmation of import file settings"
+room_import_exp = "You can register the roles of room members from imported file.
It becomes aborted if the role that can not give or member can not participate has been described, the import is not enforced.
To avoid the error, please use the exported file.
"
+room_import_import_imp = "Import is run"
+room_import_help_open = "Display"
+room_import_help_close = "Close"
+room_import_item = "Item"
+room_import_contents = "description"
+room_import_need_on = "Required fields"
+room_import_sel = "<option>"
+room_not_entry = "not entry"
+define:ROOM_IMPORT_ITEM_HANDLE = "Set handle."
+room_import_check_message = "%error_item% has not been selected."
+define:ROOM_IMPORT_HELP_AUTH_LABEL = "Role"
+define:ROOM_IMPORT_HELP_AUTH_EXP = "Set the role in this room."
+define:ROOM_IMPORT_UPLOAD_SYSERR = "A system error has occurred."
+define:ROOM_IMPORT_UPLOAD_OPEN_ERR = "File open error."
+define:ROOM_IMPORT_UPLOAD_NOROOM_ERR = "Room that does not exist was specified."
+define:ROOM_IMPORT_UPLOAD_NO_PERMISSION = "You do not have authority."
+define:ROOM_IMPORT_UPLOAD_COLUMN_ERR = "Error:%d line
Number of columns in the CSV file is wrong."
+define:ROOM_IMPORT_UPLOAD_NOUSER_ERR = "Error:%d line
Not exist, or member role is not possible, %s has been specified as the operation target."
+define:ROOM_IMPORT_UPLOAD_NOAUTH_ERR = "Error:%d line
%d is wrong value for the role."
+define:ROOM_IMPORT_UPLOAD_NOT_PERMIT_AUTH = "Error：%d line
Member %s, role [%d] can not be set."
+define:ROOM_IMPORT_UPLOAD_NO_CHAGE = "No changes."
+define:ROOM_IMPORT_UPLOAD_LINE_OVER_ERR = "This file has over %d lines."
+define:ROOM_IMPORT_CONFIRM_ADMINUSER_WRAN = "`manager` can not change the role. excluded from the process."
+define:ROOM_IMPORT_CONFIRM_MYSELF_WRAN = "Own role can not be changed. excluded from the process."
+define:ROOM_IMPORT_CONFIRM_PUBLIC_OTHER_WRAN = "It is not possible to change to the non-participation in the public space. excluded from the process."
+define:ROOM_IMPORT_UPLOAD_NODATAS_ERR = "Data line does not exist in the file."
+
+[Room_View_Admin_Import_Confirm]
+room_import_confirm_message1 = "This role list will be setting to %s room."
+room_import_confirm_change_count = "%d member will be added to %s."
+room_import_confirm_message2 = "After the change, roles of the room will be as follows.
"
+room_import_confirm_count = "%s %d"
+room_import_confirm_message3 = "Are you sure to proceed?"
+room_import_confirm_warnMsg = "Handle - %s"
+
+
+[Room_Action_Admin_Import_Confirm]
+room_import_confirm_message1 = "This role list has been set to %s room."
+room_import_confirm_change_count = "%d member have been added to %s."
+room_import_confirm_message2 = "Roles of the room was as follows.
"
+room_import_confirm_count = "%s %d"
+
+room_import_confirm_warnMsg = "There was a problem.
It was not possible to change the members described below."
+room_not_entry = "not entry"
+
diff --git a/html/webapp/modules/room/language/japanese/main.ini b/html/webapp/modules/room/language/japanese/main.ini
index 9f50a0d..caf2367 100644
--- a/html/webapp/modules/room/language/japanese/main.ini
+++ b/html/webapp/modules/room/language/japanese/main.ini
@@ -16,6 +16,7 @@ room_admin = "管理"
room_back_list = "戻る"
room_admin_inf = "基本項目編集"
room_admin_edit = "参加者修正"
+room_admin_import = "参加者インポート"
room_confirm_roomdelete = "「%s」ルームに配置されたすべてのモジュールは完全に削除されます
%sを削除してよろしいですか？"
room_list_display_flag_on = "公開中にする"
room_list_display_flag_off = "準備中にする"
@@ -50,6 +51,14 @@ room_name_error_mes = "同じ階層に同名のルームが存在します"
room_top_description ="このルームでの会員の役割を設定して、[%s]ボタンを押してください。[%s]ボタンより役割を一括で選択できます。
続けて参加会員を追加する場合、[%s]を押してください。"
room_top_user_auth_id = "ベース権限"
room_selected_entry_users = "対象会員の絞込み"
+room_csv_export = "(参加者権限一覧をエクスポート)"
+room_export_confirm_exp = "参加会員修正一覧に表示されている会員のうち、
%s以外の会員のルーム参加権限情報をエクスポートします。
よろしいですか？
※ダウンロードされたCSVは現在のルーム参加者の
バックアップファイルとしても役立ちます。
ダウンロード後は必ず大切に保存しておいてください。"
+room_export_exp = "参加会員修正一覧に表示されている会員をエクスポートします。ただし、%sの会員情報はエクスポートできません。"
+
+[Room_View_Admin_Export]
+define:ROOM_EXPORT_AUTHORITY_NAME = "参加者権限"
+[Room_View_Admin_Export:Room_Action_Admin_Export]
+define:ROOM_EXPORT_NONE = "エクスポート可能な会員が見つかりませんでした。"
[Room_View_Admin_Regist_Userslist:Room_View_Admin_Regist_Confirm]
@@ -85,4 +94,58 @@ room_entry_modules="利用を許可したモジュール"
confirm_selectmodules = "内容を変更しようとしています。利用の許可を途中で取り消すと、
現在利用中のモジュールに蓄積されたデータが消滅するので注意してください。
この変更を確定しますか？"
[Room_Action_Admin_Search]
-room_user_search_condition_limit = "検索条件が多すぎます。条件を減らして再度検索してください。"
\ No newline at end of file
+room_user_search_condition_limit = "検索条件が多すぎます。条件を減らして再度検索してください。"
+
+[Room_View_Admin_Import]
+room_import_title_description = "ルーム「%s」へ参加者情報をインポートします。"
+room_import_file = "インポートファイル"
+room_import_select_file_description = "参加権限を設定したインポートファイルを指定して下さい。"
+room_import_select_file_note = "※１行目はヘッダ行として扱われます。
※処理可能な行数は%d行までです。"
+room_import_help_label = "ヘルプ"
+room_import_help_title = "インポートファイル設定項目の詳細確認"
+room_import_exp = "ルームの参加者／参加権限を指定形式のファイルからインポートし、一括登録ができます。
参加できない会員や与えることのできない権限が記載されていた場合は処理中断となり、インポートは実施されません。
エラー発生を極力避けるため、エクスポートされたファイルを利用してください。
"
+room_import_import_imp = "インポート処理を実行します"
+room_import_help_open = "表示"
+room_import_help_close = "閉じる"
+room_import_item = "項目"
+room_import_contents = "内容"
+room_import_need_on = "※必須入力項目"
+room_import_sel = "＜選択肢＞"
+room_not_entry = "不参加"
+define:ROOM_IMPORT_ITEM_HANDLE = "ハンドルを設定します。"
+room_import_check_message = "%error_item%が選択されていません。"
+define:ROOM_IMPORT_HELP_AUTH_LABEL = "参加権限"
+define:ROOM_IMPORT_HELP_AUTH_EXP = "ルームにどのような権限で参加させるかの値を設定します。"
+define:ROOM_IMPORT_UPLOAD_SYSERR = "システムエラーが発生しました。"
+define:ROOM_IMPORT_UPLOAD_OPEN_ERR = "ファイルのオープンに失敗しました。"
+define:ROOM_IMPORT_UPLOAD_NOROOM_ERR = "存在しないルームが指定されました。"
+define:ROOM_IMPORT_UPLOAD_NO_PERMISSION = "操作権限がありません。"
+define:ROOM_IMPORT_UPLOAD_COLUMN_ERR = "エラー：%d行目
CSVファイルのカラム数が既定のものと異なります。内容を再度確認してください。"
+define:ROOM_IMPORT_UPLOAD_NOUSER_ERR = "エラー：%d行目
存在しない、または参加が不可能な会員「%s」が、操作対象として指定されています。"
+define:ROOM_IMPORT_UPLOAD_NOAUTH_ERR = "エラー：%d行目
%dは設定できる権限種別ではありません。"
+define:ROOM_IMPORT_UPLOAD_NOT_PERMIT_AUTH = "エラー：%d行目
会員%sに、権限[%d]は設定できません。"
+define:ROOM_IMPORT_UPLOAD_NO_CHAGE = "このCSVでは変更となる会員はありませんでした。"
+define:ROOM_IMPORT_UPLOAD_LINE_OVER_ERR = "ファイルの行数が%d行を超えています。"
+define:ROOM_IMPORT_CONFIRM_ADMINUSER_WRAN = "ベース権限が「管理」の会員は変更できません。処理対象から除外しました。"
+define:ROOM_IMPORT_CONFIRM_MYSELF_WRAN = "自分自身の権限は変更できません。処理対象から除外しました。"
+define:ROOM_IMPORT_CONFIRM_PUBLIC_OTHER_WRAN = "パブリック空間で不参加への変更はできません。不参加指定は処理対象から除外しました。"
+define:ROOM_IMPORT_UPLOAD_NODATAS_ERR = "ファイルにデータ行が存在しません。"
+
+[Room_View_Admin_Import_Confirm]
+room_import_confirm_message1 = "%sルームに対して、以下の設定をします。"
+room_import_confirm_change_count = "%d名を%sに変更します。"
+room_import_confirm_message2 = "変更後、ルームの人員構成は以下のとおりとなります。
"
+room_import_confirm_count = "%s %d名"
+room_import_confirm_message3 = "よろしいですか？"
+room_import_confirm_warnMsg = "ハンドル名「%s」"
+
+
+[Room_Action_Admin_Import_Confirm]
+room_import_confirm_message1 = "%sルームに対して、以下の設定をしました。"
+room_import_confirm_change_count = "%d名を%sに変更しました。"
+room_import_confirm_message2 = "ルームの人員構成は以下のとおりとなりました。
"
+room_import_confirm_count = "%s %d名"
+
+room_import_confirm_warnMsg = "何らかの設定変更がなされたようです。
以下の会員の変更ができませんでした。"
+room_not_entry = "不参加"
+
diff --git a/html/webapp/modules/room/templates/default/room_action_admin_import_confirm.html b/html/webapp/modules/room/templates/default/room_action_admin_import_confirm.html
new file mode 100644
index 0000000..1316846
--- /dev/null
+++ b/html/webapp/modules/room/templates/default/room_action_admin_import_confirm.html
@@ -0,0 +1,55 @@
+<{strip}>
+
+
+
+ <{$lang.room_import_confirm_message1|smarty:nodefaults|sprintf:$action.page.page_name}>
+
+
+ <{foreach item=num key=auth_name from=$action.added_auth_member_num}>
+ <{if $num!=0}>
+ <{$lang.room_import_confirm_change_count|sprintf:$num:$auth_name}>
+ <{$lang.room_import_confirm_change_count|sprintf:$action.deleted_auth_member_num:$lang.room_not_entry}>
+ <{/if}>
+
+
+
+ <{$lang.room_import_confirm_message2|smarty:nodefaults}>
+
+
+
+ <{foreach item=num key=auth_name from=$action.total_auth_member_num}>
+ <{if $num!=0}>
+
+ <{$auth_name}>
+ <{$num}>
+
+ <{/if}>
+ <{/foreach}>
+
+
+
+ <{if count($action.warnMsg)>0 && $action.warnMsg.0!=''}>
+
+ <{$lang.room_import_confirm_warnMsg|smarty:nodefaults}>
+
+ <{/if}>
+
+
+ <{* 閉じる *}>
+
+
+
+
+
+<{include file="room_script.html"}>
+
+<{/strip}>
\ No newline at end of file
diff --git a/html/webapp/modules/room/templates/default/room_view_admin_import.html b/html/webapp/modules/room/templates/default/room_view_admin_import.html
new file mode 100644
index 0000000..df278ba
--- /dev/null
+++ b/html/webapp/modules/room/templates/default/room_view_admin_import.html
@@ -0,0 +1,98 @@
+<{strip}>
+
+
+ <{* 各種ボタン *}>
+
+
+
+
+
+ <{* CSVエクスポート *}>
+
+
<{assign var="edit_current_page_id" value=$action.edit_current_page_id}>