issue #916 and issue #1917 increment images.hit when calling pwg.history.log

include/functions_picture.inc.php

@@ -115,4 +115,24 @@ function encode_slideshow_params($decode_params=array())
   return $result;
 }
 
+/**
+ * Increase the number of visits for a given photo.
+ * 
+ * Code moved from picture.php to be used by both the API and picture.php
+ * 
+ * @since 14
+ * @param int $image_id
+ */
+function increase_image_visit_counter($image_id)
+{
+  // avoiding auto update of "lastmodified" field
+  $query = '
+UPDATE
+  '.IMAGES_TABLE.'
+  SET hit = hit+1, lastmodified = lastmodified
+  WHERE id = '.$image_id.'
+;';
+  pwg_query($query);
+}
+
 ?>

include/ws_functions/pwg.php

@@ -614,6 +614,14 @@ function ws_history_log($params, &$service)
     $page['tag_ids'] = explode(',', $params['tags_string']);
   }
 
+  // when visiting a photo (which is currently, in version 14, the only event registered
+  // by pwg.history.log) we should also increment images.hit
+  if (!empty($params['image_id']))
+  {
+    include_once(PHPWG_ROOT_PATH.'include/functions_picture.inc.php');
+    increase_image_visit_counter($params['image_id']);
+  }
+
   pwg_log($params['image_id'], 'picture');
 }
 

picture.php

@@ -430,14 +430,7 @@ else
 // don't increment if adding a comment
 if (trigger_change('allow_increment_element_hit_count', $inc_hit_count, $page['image_id'] ) )
 {
-  // avoiding auto update of "lastmodified" field
+  increase_image_visit_counter($page['image_id']);
-  $query = '
-UPDATE
-  '.IMAGES_TABLE.'
-  SET hit = hit+1, lastmodified = lastmodified
-  WHERE id = '.$page['image_id'].'
-;';
-  pwg_query($query);
 }
 
 //---------------------------------------------------------- related categories