diff --git a/config/func.inc.php b/config/func.inc.php index 16a617261..421144e0c 100644 --- a/config/func.inc.php +++ b/config/func.inc.php @@ -120,12 +120,11 @@ } /** - * @brief YYYYMMDDHHIISS 형식의 시간값을 원하는 시간 포맷으로 변형 + * @brief YYYYMMDDHHIISS 형식의 시간값을 unix time으로 변경 * @param str YYYYMMDDHHIISS 형식의 시간값 - * @param format php date()함수의 시간 포맷 - * @return string + * @return int **/ - function zdate($str, $format = "Y-m-d H:i:s") { + function ztime($str) { if(!$str) return; $hour = (int)substr($str,8,2); $min = (int)substr($str,10,2); @@ -133,7 +132,18 @@ $year = (int)substr($str,0,4); $month = (int)substr($str,4,2); $day = (int)substr($str,6,2); - return date($format, mktime($hour, $min, $sec, $month?$month:1, $day?$day:1, $year)); + return mktime($hour, $min, $sec, $month?$month:1, $day?$day:1, $year); + } + + /** + * @brief YYYYMMDDHHIISS 형식의 시간값을 원하는 시간 포맷으로 변형 + * @param str YYYYMMDDHHIISS 형식의 시간값 + * @param format php date()함수의 시간 포맷 + * @return string + **/ + function zdate($str, $format = "Y-m-d H:i:s") { + if(!$str) return; + return date($format, ztime($str)); } /** diff --git a/plugins/calendar/calendar.class.php b/plugins/calendar/calendar.class.php index 9c63e6626..1cc6de243 100644 --- a/plugins/calendar/calendar.class.php +++ b/plugins/calendar/calendar.class.php @@ -21,17 +21,25 @@ // DocumentModel::getDailyArchivedList()를 이용하기 위한 변수 정리 $obj->mid = $mid_list; - $obj->regdate = date("Ym"); + + if(Context::get('search_target')=='regdate') { + $regdate = Context::get('search_keyword'); + if($regdate) $obj->regdate = zdate($regdate, 'Ym'); + } + if(!$obj->regdate) $obj->regdate = date('Ym'); // document 모듈의 model 객체를 받아서 getDailyArchivedList() method를 실행 $oDocumentModel = &getModel('document'); $output = $oDocumentModel->getDailyArchivedList($obj); // 템플릿 파일에서 사용할 변수들을 세팅 - $plugin_info->cur_date = date('Ym'); - $plugin_info->today_str = sprintf('%2d%s %2d%s',date('m'), Context::getLang('unit_month'), date('d'), Context::getLang('unit_day')); - $plugin_info->last_day = date('t'); - $plugin_info->start_week= date('w', mktime(0,0,0,date('m'),1,date('Y'))); + $plugin_info->cur_date = $obj->regdate; + $plugin_info->today_str = sprintf('%4d%s %2d%s',zdate($obj->regdate, 'Y'), Context::getLang('unit_year'), zdate($obj->regdate,'m'), Context::getLang('unit_month')); + $plugin_info->last_day = date('t', ztime($obj->regdate)); + $plugin_info->start_week= date('w', ztime($obj->regdate)); + + $plugin_info->prev_month = date('Ym', mktime(1,0,0,zdate($obj->regdate,'m'),1,zdate($obj->regdate,'Y'))-60*60*24); + $plugin_info->next_month = date('Ym', mktime(1,0,0,zdate($obj->regdate,'m'),$plugin_info->last_day,zdate($obj->regdate,'Y'))+60*60*24); if(count($mid_list)==1) $plugin_info->module_name = $mid_list[0]; $plugin_info->title = $title; diff --git a/plugins/calendar/skins/blog_calendar_list/list.html b/plugins/calendar/skins/blog_calendar_list/list.html index 5f6584024..37caabf46 100644 --- a/plugins/calendar/skins/blog_calendar_list/list.html +++ b/plugins/calendar/skins/blog_calendar_list/list.html @@ -10,6 +10,10 @@
diff --git a/plugins/calendar/skins/blog_calendar_list/normal/style.css b/plugins/calendar/skins/blog_calendar_list/normal/style.css index bd076804d..7d09e4926 100644 --- a/plugins/calendar/skins/blog_calendar_list/normal/style.css +++ b/plugins/calendar/skins/blog_calendar_list/normal/style.css @@ -18,6 +18,12 @@ float:left; } +.calendar_normal .calendar_box .title_box .move_month { + font-weight:bold; + height:14px; + float:right; +} + .calendar_normal .calendar_box .calendar_box { padding:5px; border:3px solid #EEEEEE;