firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Merge branch 'g5'

Browse Source
This commit is contained in:
chicpro
2016-11-22 10:46:46 +09:00
parent 5aec33d732 02e4ec4584
commit e3f28c9e76
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adm/member_delete.php
View File

@ -1,4 +1,4 @@
<? <?php
$sub_menu = "200100"; $sub_menu = "200100";
include_once("./_common.php"); include_once("./_common.php");

2
adm/member_list_delete.php
View File

@ -1,4 +1,4 @@
<? <?php
$sub_menu = "200100"; $sub_menu = "200100";
include_once("./_common.php"); include_once("./_common.php");

16
adm/write_count.php
View File

@ -14,7 +14,7 @@ add_javascript('<script src="'.G5_PLUGIN_URL.'/jqplot/plugins/jqplot.categoryAxi
add_javascript('<script src="'.G5_PLUGIN_URL.'/jqplot/plugins/jqplot.pointLabels.min.js"></script>', 0); add_javascript('<script src="'.G5_PLUGIN_URL.'/jqplot/plugins/jqplot.pointLabels.min.js"></script>', 0);
add_javascript('<!--[if lt IE 9]><script src="'.G5_PLUGIN_URL.'/jqplot/excanvas.js"></script><![endif]-->', 0); add_javascript('<!--[if lt IE 9]><script src="'.G5_PLUGIN_URL.'/jqplot/excanvas.js"></script><![endif]-->', 0);
if (!($graph == 'line' || $graph == 'bar')) if (!($graph == 'line' || $graph == 'bar'))
$graph = 'line'; $graph = 'line';
if ($graph == 'bar') { if ($graph == 'bar') {
@ -49,7 +49,7 @@ foreach($period_array as $key=>$value) {
break; break;
} }
} }
if (!$is_period) if (!$is_period)
$period = '오늘'; $period = '오늘';
$day = $period_array[$period][0]; $day = $period_array[$period][0];
@ -64,15 +64,15 @@ if ($period == '오늘') {
$from = $yesterday; $from = $yesterday;
$to = $from; $to = $from;
} else if ($period == '내일') { } else if ($period == '내일') {
$from = date('Y-m-d', G5_SERVER_TIME + (86400 * 2)); $from = date('Y-m-d', G5_SERVER_TIME + (86400 * 2));
$to = $from; $to = $from;
} else { } else {
$from = date('Y-m-d', G5_SERVER_TIME - (86400 * $period_array[$period][1])); $from = date('Y-m-d', G5_SERVER_TIME - (86400 * $period_array[$period][1]));
$to = $yesterday; $to = $yesterday;
} }
$sql_bo_table = ''; $sql_bo_table = '';
if ($bo_table) if ($bo_table)
$sql_bo_table = "and bo_table = '$bo_table'"; $sql_bo_table = "and bo_table = '$bo_table'";
switch ($day) { switch ($day) {
@ -130,7 +130,7 @@ switch ($day) {
<form> <form>
<select name="bo_table"> <select name="bo_table">
<option value="">전체게시판</a> <option value="">전체게시판</a>
<?php <?php
$sql = " select bo_table, bo_subject from {$g5['board_table']} order by bo_count_write desc "; $sql = " select bo_table, bo_subject from {$g5['board_table']} order by bo_count_write desc ";
$result = sql_query($sql); $result = sql_query($sql);
for($i=0; $row=sql_fetch_array($result); $i++) { for($i=0; $row=sql_fetch_array($result); $i++) {
@ -179,7 +179,7 @@ $(document).ready(function(){
var line1 = [<?php echo implode($line1, ','); ?>]; var line1 = [<?php echo implode($line1, ','); ?>];
var line2 = [<?php echo implode($line2, ','); ?>]; var line2 = [<?php echo implode($line2, ','); ?>];
var plot1 = $.jqplot ('chart1', [line1, line2], { var plot1 = $.jqplot ('chart1', [line1, line2], {
seriesDefaults: { seriesDefaults: {
<?php if ($graph == 'bar') { ?> <?php if ($graph == 'bar') { ?>
renderer:$.jqplot.BarRenderer, renderer:$.jqplot.BarRenderer,
<?php } ?> <?php } ?>
@ -205,6 +205,6 @@ $(document).ready(function(){
} }
?> ?>
<? <?php
include_once ('./admin.tail.php'); include_once ('./admin.tail.php');
?> ?>