Merge branch 'master' of https://github.com/slims/slims7_cendana

slims · Feb 19, 2014 · e1cf3e4 · e1cf3e4
2 parents 49858cd + 74c74d6
commit e1cf3e4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/lib/contents/visitor.inc.php b/lib/contents/visitor.inc.php
@@ -76,11 +76,10 @@ function setCounter($str_member_ID) {
       $member_name = $_d['member_name'];
       $member_name = preg_replace("/'/", "\'", $member_name);
       $photo = trim($_d['member_image'])?trim($_d['member_image']):'person.png';
-      $_institution = trim($_d['inst_name'])?"'".$_d['inst_name']."'":'NULL';
-      $_institution = preg_replace("/'/", "\'", $_institution);
+      $_institution = $dbs->escape_string(trim($_d['inst_name']))?$dbs->escape_string(trim($_d['inst_name'])):null;
 
       $_checkin_date = date('Y-m-d H:i:s');
-      $_i = $dbs->query("INSERT INTO visitor_count (member_id, member_name, institution, checkin_date) VALUES ('$member_id', '$member_name', $_institution, '$_checkin_date')");
+      $_i = $dbs->query("INSERT INTO visitor_count (member_id, member_name, institution, checkin_date) VALUES ('$member_id', '$member_name', '$_institution', '$_checkin_date')");
   } else {
   // non member
       $_d = $_q->fetch_assoc();

diff --git a/template/default/style.css b/template/default/style.css
@@ -455,7 +455,6 @@ h4.title {
 }
 
 .itemList td:nth-child(3) {
-	display: none;
 }
 
 .itemList td:nth-child(4) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -455,7 +455,6 @@ h4.title { @@
     }
     .itemList td:nth-child(3) {
-    	display: none;
     }
     .itemList td:nth-child(4) {
@@ Expand Down @@