@@ -136,6 +143,11 @@
onSelect:function(){
$(this).prev('input[type="hidden"]').val(this.value.replace(/-/g,""))
+ if($('#until').val()){
+ limited_reason_division.slideDown(200);
+ } else {
+ limited_reason_division.slideUp(200);
+ }
}
};
$.extend($.datepicker.regional['{$lang_type}'],option);
@@ -147,7 +159,9 @@
}
$(".dateRemover").click(function() {
$(this).prevAll('input').val('');
- return false;});
+ limited_reason_division.slideUp(200);
+ return false;
+ });
});
var refused_reason_division = $('.div_refused_reason');
@@ -165,5 +179,11 @@
refused_reason_division.slideUp(200);
}
});
+
+ var limited_reason_division = $('.div_limited_reason');
+ if(!$('#until').val())
+ {
+ limited_reason_division.hide();
+ }
})(jQuery);
diff --git a/modules/member/tpl/member_list.html b/modules/member/tpl/member_list.html
index 18bc43e5b..f40c3f92f 100644
--- a/modules/member/tpl/member_list.html
+++ b/modules/member/tpl/member_list.html
@@ -48,7 +48,15 @@
{@ $member_info['group_list'] = implode(', ', $member_info['group_list'])}
{$member_info[$name]} |
- {$lang->denied}{$lang->approval} |
+
+
+ {$lang->denied}
+
+ {$lang->member_limited}
+
+ {$lang->approval}
+
+ |
{zdate($member_info['regdate'], 'Y-m-d')} |
{zdate($member_info['last_login'], 'Y-m-d')} |
{$member_info['group_list']} |
diff --git a/modules/ncenterlite/ncenterlite.admin.controller.php b/modules/ncenterlite/ncenterlite.admin.controller.php
index aa2c553bc..33d0023d9 100644
--- a/modules/ncenterlite/ncenterlite.admin.controller.php
+++ b/modules/ncenterlite/ncenterlite.admin.controller.php
@@ -55,20 +55,19 @@ class ncenterliteAdminController extends ncenterlite
$config->mention_suffixes = array_map('trim', explode(',', $config->mention_suffixes));
}
}
-
+
if ($obj->disp_act == 'dispNcenterliteAdminSeletedmid')
{
- if (!$config->hide_module_srls)
+ if (!$obj->hide_module_srls)
{
$config->hide_module_srls = array();
}
- if (!$config->admin_notify_module_srls)
+ if (!$obj->admin_notify_module_srls)
{
$config->admin_notify_module_srls = array();
}
}
-
- $output = $oModuleController->updateModuleConfig('ncenterlite', $config);
+ $output = $oModuleController->insertModuleConfig('ncenterlite', $config);
if(!$output->toBool())
{
return new Object(-1, 'ncenterlite_msg_setting_error');
diff --git a/modules/ncenterlite/skins/default/NotifyList.html b/modules/ncenterlite/skins/default/NotifyList.html
index dae56b337..6428b8878 100644
--- a/modules/ncenterlite/skins/default/NotifyList.html
+++ b/modules/ncenterlite/skins/default/NotifyList.html
@@ -36,9 +36,11 @@
diff --git a/modules/ncenterlite/skins/default_bottom/NotifyList.html b/modules/ncenterlite/skins/default_bottom/NotifyList.html
index dae56b337..c3369bf08 100644
--- a/modules/ncenterlite/skins/default_bottom/NotifyList.html
+++ b/modules/ncenterlite/skins/default_bottom/NotifyList.html
@@ -35,10 +35,12 @@
diff --git a/tests/unit/framework/StorageTest.php b/tests/unit/framework/StorageTest.php
index f12b797a1..d7dd46ddb 100644
--- a/tests/unit/framework/StorageTest.php
+++ b/tests/unit/framework/StorageTest.php
@@ -9,11 +9,13 @@ class StorageTest extends \Codeception\TestCase\Test
public function _after()
{
+ @chmod(\RX_BASEDIR . 'tests/_output', 0755);
Rhymix\Framework\Storage::deleteDirectory(\RX_BASEDIR . 'tests/_output', false);
}
public function _failed()
{
+ @chmod(\RX_BASEDIR . 'tests/_output', 0755);
Rhymix\Framework\Storage::deleteDirectory(\RX_BASEDIR . 'tests/_output', false);
}
@@ -191,13 +193,28 @@ class StorageTest extends \Codeception\TestCase\Test
{
$source = \RX_BASEDIR . 'tests/_output/copy.source.txt';
$target = \RX_BASEDIR . 'tests/_output/copy.target.txt';
+ $target_dir = \RX_BASEDIR . 'tests/_output';
file_put_contents($source, 'foobarbaz');
chmod($source, 0646);
+ // Copy with exact destination filename
$this->assertTrue(Rhymix\Framework\Storage::copy($source, $target));
$this->assertTrue(file_exists($target));
$this->assertTrue(file_get_contents($target) === 'foobarbaz');
+ // Copy into directory with source filename
+ $this->assertTrue(Rhymix\Framework\Storage::copy($source, $target_dir));
+ $this->assertTrue(file_exists($target_dir . '/copy.source.txt'));
+ $this->assertTrue(file_get_contents($target_dir . '/copy.source.txt') === 'foobarbaz');
+
+ // Copy into directory with no write permissions
+ chmod($target_dir, 0555);
+ file_put_contents($source, 'foobarbaz has changed');
+ $this->assertTrue(Rhymix\Framework\Storage::copy($source, $target));
+ $this->assertTrue(file_exists($target));
+ $this->assertTrue(file_get_contents($target) === 'foobarbaz has changed');
+ chmod($target_dir, 0755);
+
if (strncasecmp(\PHP_OS, 'Win', 3) !== 0)
{
$this->assertEquals(0646, fileperms($target) & 0777);