Changeset 3147 for branches/2.0/include/functions.inc.php

Timestamp:

Feb 14, 2009, 3:28:21 AM (15 years ago)

Author:

rvelices

Message:

merge 3145-3146 from trunk
Last (I hope) paranoic optims ...

• move get_uysername and get_groupname from public to admin/functions.inc.php
• optim in index.php
• tags.tpl does not need smarty modifier included
• move func get_comment_post_key from functions_comment to functions (avoid extra inclusion every time on picture page)

File:

• branches/2.0/include/functions.inc.php (modified) (3 diffs)

branches/2.0/include/functions.inc.php

@@ -494 +494 @@
   closedir($dir);
   @asort($languages);
-  @reset($languages);
 
   return $languages;
@@ -1373 +1372 @@
       $source_file = $f;
       break;
-    }
-
-    if ($target_charset=='utf-8')
-    { // we accept conversion from ISO-8859-1 to UTF-8
-      $f = $dir.'.iso-8859-1/'.$filename;
-      if (file_exists($f))
-      {
-        $source_charset = 'iso-8859-1';
-        $source_file = $f;
-        break;
-      }
     }
   }
@@ -1484 +1472 @@
   }
 }
+
+/**
+ * returns a "secret key" that is to be sent back when a user enters a comment
+ *
+ * @param int image_id
+ */
+function get_comment_post_key($image_id)
+{
+  global $conf;
+
+  $time = time();
+
+  return sprintf(
+    '%s:%s',
+    $time,
+    hash_hmac(
+      'md5',
+      $time.':'.$image_id,
+      $conf['secret_key']
+      )
+    );
+}
 ?>