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

merge

Browse Source
This commit is contained in:
whitedot
2012-12-27 17:32:04 +09:00
parent 12894d08dc 2b5c471bdb
commit ee344294d9
11 changed files with 85 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
adm/visit_list.php
View File

@ -15,9 +15,8 @@ $colspan = 5;
$sql_common = " from {$g4['visit_table']} ";
$sql_search = " where vi_date between '{$fr_date}' and '{$to_date}' ";
if ($domain) {
if (isset($domain))
$sql_search .= " and vi_referer like '%{$domain}%' ";
}
$sql = " select count(*) as cnt
{$sql_common}
@ -106,7 +105,14 @@ if ($i == 0)
</tbody>
</table>
<?
<<<<<<< HEAD
$page = get_paging($config['cf_write_pages'], $page, $total_page, "$_SERVER[PHP_SELF]?$qstr&amp;domain=$domain&amp;page=");
=======
if (isset($domain))
$qstr .= "&amp;domain=$domain";
$qstr .= "&amp;page=";
$page = get_paging($config['cf_write_pages'], $page, $total_page, "{$_SERVER['PHP_SELF']}?$qstr");
>>>>>>> 2b5c471bdb62542fc9cb8b6740a934c34e5de04b
if ($page) {
?>
<div class="pg">