Changeset 12920 for trunk/include/functions.inc.php

Timestamp:

Jan 17, 2012, 10:58:18 PM (12 years ago)

Author:

rvelices

Message:

feature 2548 multisize - code cleanup + better usage in category_cats + i.php logs memory usage peak

File:

• trunk/include/functions.inc.php (modified) (6 diffs)

trunk/include/functions.inc.php

@@ -34 +34 @@
 include_once( PHPWG_ROOT_PATH .'include/derivative_std_params.inc.php');
 include_once( PHPWG_ROOT_PATH .'include/derivative.inc.php');
+require_once( PHPWG_ROOT_PATH .'include/smarty/libs/Smarty.class.php');
+include_once( PHPWG_ROOT_PATH .'include/template.class.php');
 
 //----------------------------------------------------------- generic functions
@@ -53 +55 @@
 function get_moment()
 {
-  $t1 = explode( ' ', microtime() );
-  $t2 = explode( '.', $t1[0] );
-  $t2 = $t1[1].'.'.$t2[1];
-  return $t2;
+  return microtime(true);
 }
 
@@ -664 +663 @@
     return '';
   }
-  
+
   $query_string = '';
 
@@ -817 +816 @@
 
 /**
- * returns the title of the thumbnail based on photo properties
- */
-function get_thumbnail_title($info)
-{
-  global $conf, $user;
-
-  $title = get_picture_title($info);
-
-  $details = array();
-
-  if (!empty($info['hit']))
-  {
-    $details[] = $info['hit'].' '.strtolower(l10n('Visits'));
-  }
-
-  if ($conf['rate'] and !empty($info['rating_score']))
-  {
-    $details[] = strtolower(l10n('Rating score')).' '.$info['rating_score'];
-  }
-
-  if (isset($info['nb_comments']) and $info['nb_comments'] != 0)
-  {
-    $details[] = l10n_dec('%d comment', '%d comments', $info['nb_comments']);
-  }
-
-  if (count($details) > 0)
-  {
-    $title.= ' ('.implode(', ', $details).')';
-  }
-
-  if (!empty($info['comment']))
-  {
-    $info['comment'] = trigger_event('render_element_description', $info['comment']);
-    $title.= ' '.substr($info['comment'], 0, 100).(strlen($info['comment']) > 100 ? '...' : '');
-  }
-
-  $title = htmlspecialchars(strip_tags($title));
-
-  $title = trigger_event('get_thumbnail_title', $title, $info);
-
-  return $title;
-}
-
-/**
  * fill the current user caddie with given elements, if not already in
  * caddie
@@ -902 +857 @@
 {
   return str_replace('_',' ',get_filename_wo_extension($filename));
-}
-
-/**
- */
-function get_picture_title($info)
-{
-  if (isset($info['name']) and !empty($info['name']))
-  {
-    return trigger_event('render_element_description', $info['name']);
-  }
-
-  return  get_name_from_file($info['file']);
 }
 
@@ -1436 +1379 @@
         return $time.':'.$valid_after_seconds.':'
                 .hash_hmac(
-                        'md5', 
-                        $time.substr($_SERVER['REMOTE_ADDR'],0,5).$valid_after_seconds.$aditionnal_data_to_hash, 
+                        'md5',
+                        $time.substr($_SERVER['REMOTE_ADDR'],0,5).$valid_after_seconds.$aditionnal_data_to_hash,
                         $conf['secret_key']);
 }