- bug fixed: HTML error on nested UL in categories menu.

- bug 161 fixed: guest_id not taken into account for history table insert.

- bug 164 fixed: category inserted in history table becomes too long if HTML
  tags are kept.


git-svn-id: http://piwigo.org/svn/trunk@876 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 5 insertions, 2 deletions

diff --git a/include/functions.inc.php b/include/functions.inc.php
index ae5f46415..0c4e462e9 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -354,15 +354,18 @@ function pwg_log( $file, $category, $picture = '' )
 
   if ($conf['log'])
   {
+    $login = ($user['id'] == $conf['guest_id'])
+      ? 'guest' : addslashes($user['username']);
+    
     $query = '
 INSERT INTO '.HISTORY_TABLE.'
   (date,login,IP,file,category,picture)
   VALUES
   (NOW(),
-  \''.(($user['id'] == 2) ? 'guest' : addslashes($user['username'])).'\',
+  \''.$login.'\',
   \''.$_SERVER['REMOTE_ADDR'].'\',
   \''.addslashes($file).'\',
-  \''.addslashes($category).'\',
+  \''.addslashes(strip_tags($category)).'\',
   \''.addslashes($picture).'\')
 ;';
     pwg_query($query);