Changeset 11893 for trunk/include

Timestamp:

Aug 2, 2011, 9:20:50 PM (13 years ago)

Author:

rvelices

Message:

rename #images.average_rate to rating_score

Location:

trunk/include

Files:

• category_default.inc.php (modified) (1 diff)
• config_default.inc.php (modified) (1 diff)
• functions_category.inc.php (modified) (3 diffs)
• functions_rate.inc.php (modified) (6 diffs)
• picture_rate.inc.php (modified) (1 diff)
• section_init.inc.php (modified) (3 diffs)
• ws_functions.inc.php (modified) (41 diffs)

trunk/include/category_default.inc.php

@@ -154 +154 @@
       case 'best_rated' :
       {
-        $name = '('.$row['average_rate'].') '.$name;
+        $name = '('.$row['rating_score'].') '.$name;
         break;
       }

trunk/include/config_default.inc.php

@@ -497 +497 @@
 // delete from piwigo_sessions;
 // delete from piwigo_rate;
-// update piwigo_images set average_rate = null;
+// update piwigo_images set rating_score = null;
 // delete from piwigo_caddie;
 // delete from piwigo_favorites;

trunk/include/functions_category.inc.php

@@ -291 +291 @@
     array(
     array(l10n('Default'), '', true),
-    array(l10n('Rating score'), 'average_rate DESC', $conf['rate']),
+    array(l10n('Rating score'), 'rating_score DESC', $conf['rate']),
     array(l10n('Most visited'), 'hit DESC', true),
     array(l10n('Creation date'), 'date_creation DESC', true),
@@ -560 +560 @@
   $tree = array();
   $key_of_cat = array();
-  
+
   foreach ($categories as $key => &$node)
   {
     $key_of_cat[$node['id']] = $key;
-    
+
     if (!isset($node['id_uppercat']))
     {
@@ -575 +575 @@
         $categories[ $key_of_cat[ $node['id_uppercat'] ] ]['sub_categories'] = array();
       }
-      
+
       $categories[ $key_of_cat[ $node['id_uppercat'] ] ]['sub_categories'][$key] = &$node;
     }
   }
-  
+
   return $tree;
 }

trunk/include/functions_rate.inc.php

@@ -121 +121 @@
 
 
-/* update images.average_rate field
+/* update images.rating_score field
   * we use a bayesian average (http://en.wikipedia.org/wiki/Bayesian_average) with
 C = average number of rates per item
@@ -127 +127 @@
 
  * param int $element_id optional, otherwise applies to all
- * @return array(average_rate, count) if element_id is specified
+ * @return array(rating_score, count) if element_id is specified
 */
 function update_rating_score($element_id = false)
@@ -167 +167 @@
         );
     }
-    $updates[] = array( 'id'=>$id, 'average_rate'=>$score );
+    $updates[] = array( 'id'=>$id, 'rating_score'=>$score );
   }
   mass_updates(
@@ -173 +173 @@
     array(
       'primary' => array('id'),
-      'update' => array('average_rate')
+      'update' => array('rating_score')
       ),
     $updates
@@ -184 +184 @@
 SELECT id FROM '.IMAGES_TABLE .'
   LEFT JOIN '.RATE_TABLE.' ON id=element_id
-  WHERE element_id IS NULL AND average_rate IS NOT NULL';
+  WHERE element_id IS NULL AND rating_score IS NOT NULL';
 
     $to_update = array_from_query( $query, 'id');
@@ -192 +192 @@
       $query='
 UPDATE '.IMAGES_TABLE .'
-  SET average_rate=NULL
+  SET rating_score=NULL
   WHERE id IN (' . implode(',',$to_update) . ')';
     pwg_query($query);

trunk/include/picture_rate.inc.php

@@ -29 +29 @@
 if ($conf['rate'])
 {
-  $rate_summary = array( 'count'=>0, 'score'=>$picture['current']['average_rate'], 'average'=>null );
+  $rate_summary = array( 'count'=>0, 'score'=>$picture['current']['rating_score'], 'average'=>null );
   if ( NULL != $rate_summary['score'] )
   {

trunk/include/section_init.inc.php

@@ -62 +62 @@
     break;
   }
-  
+
   // the $_GET keys are not protected in include/common.inc.php, only the values
   $rewritten = pwg_db_real_escape_string($rewritten);
-  
+
   $page['root_path'] = PHPWG_ROOT_PATH;
 }
@@ -464 +464 @@
   {
     $page['super_order_by'] = true;
-    $conf['order_by'] = ' ORDER BY hit DESC, file ASC';
+    $conf['order_by'] = ' ORDER BY hit DESC, id DESC';
     $query = '
-SELECT DISTINCT(id), hit, file
+SELECT DISTINCT(id)
   FROM '.IMAGES_TABLE.'
     INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON id = ic.image_id
@@ -490 +490 @@
   {
     $page['super_order_by'] = true;
-    $conf['order_by'] = ' ORDER BY average_rate DESC, id ASC';
+    $conf['order_by'] = ' ORDER BY rating_score DESC, id DESC';
 
     $query ='
-SELECT DISTINCT(id), average_rate
+SELECT DISTINCT(id)
   FROM '.IMAGES_TABLE.'
     INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON id = ic.image_id
-  WHERE average_rate IS NOT NULL
+  WHERE rating_score IS NOT NULL
     '.$forbidden.'
     '.$conf['order_by'].'

trunk/include/ws_functions.inc.php

@@ -55 +55 @@
   if ( is_numeric($params['f_min_rate']) )
   {
-    $clauses[] = $tbl_name.'average_rate>'.$params['f_min_rate'];
+    $clauses[] = $tbl_name.'rating_score>'.$params['f_min_rate'];
   }
   if ( is_numeric($params['f_max_rate']) )
   {
-    $clauses[] = $tbl_name.'average_rate<='.$params['f_max_rate'];
+    $clauses[] = $tbl_name.'rating_score<='.$params['f_max_rate'];
   }
   if ( is_numeric($params['f_min_hit']) )
@@ -124 +124 @@
         $matches[1][$i] = DB_RANDOM_FUNCTION.'()'; break;
     }
-    $sortable_fields = array('id', 'file', 'name', 'hit', 'average_rate',
+    $sortable_fields = array('id', 'file', 'name', 'hit', 'rating_score',
       'date_creation', 'date_available', DB_RANDOM_FUNCTION.'()' );
     if ( in_array($matches[1][$i], $sortable_fields) )
@@ -193 +193 @@
 
   $infos['version'] = PHPWG_VERSION;
-        
+
   $query = 'SELECT COUNT(*) FROM '.IMAGES_TABLE.';';
   list($infos['nb_elements']) = pwg_db_fetch_row(pwg_query($query));
@@ -444 +444 @@
       // which is an element in the XML output. The "hierarchy" output is
       // only compatible with json/php output.
-      
+
       return new PwgError(405, "The tree_output option is only compatible with json/php output formats");
     }
@@ -472 +472 @@
     $where[] = 'status = "public"';
     $where[] = 'visible = "true"';
-    
+
     $join_user = $conf['guest_id'];
   }
@@ -480 +480 @@
     // categories. Function calculate_permissions will only return
     // categories that are either locked or private and not permitted
-    // 
+    //
     // calculate_permissions does not consider empty categories as forbidden
     $forbidden_categories = calculate_permissions($user['id'], $user['status']);
@@ -519 +519 @@
         )
       );
-    
+
     $row['comment'] = strip_tags(
       trigger_event(
@@ -527 +527 @@
         )
       );
-    
+
     array_push($cats, $row);
   }
@@ -533 +533 @@
 
   if ($params['tree_output'])
-  { 
+  {
     return categories_flatlist_to_tree($cats);
   }
@@ -782 +782 @@
   }
   //------------------------------------------------------------- related rates
-        $rating = array('score'=>$image_row['average_rate'], 'count'=>0, 'average'=>null);
+        $rating = array('score'=>$image_row['rating_score'], 'count'=>0, 'average'=>null);
         if (isset($rating['score']))
         {
@@ -1029 +1029 @@
     return new PwgError(401, 'Access denied');
   }
-  
+
   if (!$service->isPost())
   {
@@ -1055 +1055 @@
     return new PwgError(WS_ERR_INVALID_PARAM, "Invalid rank");
   }
-  
+
   // does the image really exist?
   $query='
@@ -1069 +1069 @@
     return new PwgError(404, "image_id not found");
   }
-  
+
   // is the image associated to this category?
   $query = '
@@ -1138 +1138 @@
 {
   global $conf;
-  
+
   ws_logfile('[ws_images_add_chunk] welcome');
   // data
@@ -1159 +1159 @@
       continue;
     }
-    
+
     ws_logfile(
       sprintf(
@@ -1219 +1219 @@
 {
   global $conf;
-  
+
   ws_logfile('[merge_chunks] input parameter $output_filepath : '.$output_filepath);
 
@@ -1287 +1287 @@
 {
   include_once(PHPWG_ROOT_PATH.'admin/include/functions_upload.inc.php');
-  
+
   $file_path = file_path_for_type($file_path, $type);
 
@@ -1298 +1298 @@
   ws_logfile('[add_file] file_path  : '.$file_path);
   ws_logfile('[add_file] upload_dir : '.$upload_dir);
-  
+
   if (!is_dir($upload_dir)) {
     umask(0000);
@@ -1446 +1446 @@
     $where_clause = "file = '".$params['original_filename']."'";
   }
-  
+
   $query = '
 SELECT
@@ -1550 +1550 @@
   require_once(PHPWG_ROOT_PATH.'admin/include/functions_metadata.php');
   update_metadata(array($image_id=>$file_path));
-  
+
   invalidate_user_cache();
 }
@@ -1571 +1571 @@
     return new PwgError(405, "The image (file) parameter is missing");
   }
-  
+
   $params['image_id'] = (int)$params['image_id'];
   if ($params['image_id'] > 0)
@@ -1677 +1677 @@
 ;';
   list($file_path) = pwg_db_fetch_row(pwg_query($query));
-  
+
   require_once(PHPWG_ROOT_PATH.'admin/include/functions_metadata.php');
   update_metadata(array($image_id=>$file_path));
@@ -1732 +1732 @@
   list($dbnow) = pwg_db_fetch_row(pwg_query('SELECT NOW();'));
   $res['current_datetime'] = $dbnow;
-  
+
   return $res;
 }
@@ -1827 +1827 @@
 
   $image_ids = array_slice($image_ids, (int)($params['per_page']*$params['page']), (int)$params['per_page'] );
-  
+
   $image_tag_map = array();
   if ( !empty($image_ids) and !$params['tag_mode_and'] )
@@ -1963 +1963 @@
 {
   global $conf;
-  
+
   if (!is_admin())
   {
@@ -2002 +2002 @@
     }
   }
-  
+
   if ('filename' == $conf['uniqueness_mode'])
   {
@@ -2481 +2481 @@
 {
   global $conf;
-  
+
   if (!is_admin())
   {
@@ -2519 +2519 @@
     return new PwgError(WS_ERR_INVALID_PARAM, "Invalid image_id");
   }
-  
+
   // does the image really exist?
   $query='
@@ -2612 +2612 @@
     return;
   }
-  
+
   include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
   delete_categories($category_ids, $params['photo_deletion_mode']);
@@ -2621 +2621 @@
 {
   global $conf, $page;
-  
+
   if (!is_admin())
   {
@@ -2661 +2661 @@
   // we can't move physical categories
   $categories_in_db = array();
-  
+
   $query = '
 SELECT
@@ -2684 +2684 @@
           )
         );
-      
+
       return new PwgError(
         403,
@@ -2699 +2699 @@
   {
     $unknown_category_ids = array_diff($category_ids, array_keys($categories_in_db));
-    
+
     return new PwgError(
       403,
@@ -2717 +2717 @@
     return new PwgError(403, 'Invalid parent input parameter');
   }
-  
+
   if (0 != $params['parent']) {
     $params['parent'] = intval($params['parent']);
@@ -2766 +2766 @@
   $ret['message'] = ready_for_upload_message();
   $ret['ready_for_upload'] = true;
-  
+
   if (!empty($ret['message']))
   {
     $ret['ready_for_upload'] = false;
   }
-  
+
   return $ret;
 }
@@ -2778 +2778 @@
 {
   global $conf;
-  
+
   if (!is_admin())
   {
@@ -2818 +2818 @@
 {
   global $template;
-  
+
   if (!is_admin())
   {
@@ -2834 +2834 @@
   $errors = $plugins->perform_action($params['action'], $params['plugin']);
 
-  
+
   if (!empty($errors))
   {
@@ -2852 +2852 @@
 {
   global $template;
-  
+
   if (!is_admin())
   {
@@ -2867 +2867 @@
   $themes = new themes();
   $errors = $themes->perform_action($params['action'], $params['theme']);
-  
+
   if (!empty($errors))
   {
@@ -3045 +3045 @@
       );
     }
-    
+
     $upgrade_status = $extension->extract_plugin_files('upgrade', $revision, $extension_id);
     $extension_name = $extension->fs_plugins[$extension_id]['name'];