Changeset 19225 for trunk

Timestamp:

Nov 29, 2012, 3:57:32 PM (12 years ago)

Author:

mistic100

Message:

clean some function desc

Location:

trunk/include

Files:

• functions.inc.php (modified) (3 diffs)
• functions_mail.inc.php (modified) (10 diffs)

trunk/include/functions.inc.php

@@ -903 +903 @@
  *
  * @param string key: translation key
- * @param array/string/../number args:
- *   arguments to use on sprintf($key, args)
+ * @param mixed args: arguments to use on sprintf($key, args)
  *   if args is a array, each values are used on sprintf
  * @return string
@@ -922 +921 @@
 
 /*
- * returns a string with formated with l10n_args elements
- *
- * @param element/array $key_args: element or array of l10n_args elements
- * @param $sep: if $key_args is array,
- *   separator is used when translated l10n_args elements are concated
+ * returns a string formated with l10n elements
+ *
+ * @param array $key_args: l10n_args element or array of l10n_args elements
+ * @param string $sep: used when translated elements are concatened
  * @return string
  */
@@ -946 +944 @@
       if ($key === 'key_args')
       {
-        array_unshift($element, l10n(array_shift($element)));
+        array_unshift($element, l10n(array_shift($element))); // translate the key
         $result .= call_user_func_array('sprintf', $element);
       }

trunk/include/functions_mail.inc.php

@@ -64 +64 @@
  * Returns an array of mail configuration parameters :
  *
- * - mail_options: see $conf['mail_options']
- * - send_bcc_mail_webmaster: see $conf['send_bcc_mail_webmaster']
- * - email_webmaster: mail corresponding to $conf['webmaster_id']
- * - formated_email_webmaster: the name of webmaster is $conf['gallery_title']
- * - text_footer: Piwigo and version
+ * - mail_options
+ * - send_bcc_mail_webmaster
+ * - default_email_format
+ * - alternative_email_format
+ * - use_smtp
+ * - smtp_host
+ * - smtp_user
+ * - smtp_password
+ * - boundary_key
+ * - email_webmaster
+ * - formated_email_webmaster
  *
  * @return array
@@ -84 +90 @@
     'smtp_host' => $conf['smtp_host'],
     'smtp_user' => $conf['smtp_user'],
-    'smtp_password' => $conf['smtp_password']
+    'smtp_password' => $conf['smtp_password'],
+    'boundary_key' => generate_key(32),
     );
 
@@ -93 +100 @@
   $conf_mail['formated_email_webmaster'] =
     format_email(get_mail_sender_name(), $conf_mail['email_webmaster']);
-
-  $conf_mail['boundary_key'] = generate_key(32);
 
   return $conf_mail;
@@ -148 +153 @@
   }
 
-  return implode(',', $result);
+  return implode(',', array_unique($result));
 }
 
@@ -155 +160 @@
  * Return an new mail template
  *
- * @params:
- *   - email_format: mail format
- *   - args: function params of mail function:
- *       o template: template to use [default get_default_theme()]
- *       o theme: template to use [default get_default_theme()]
+ * @param string email_format: mail format, text/html or text/plain
+ * @param string theme: theme to use [default get_default_theme()]
  */
 function & get_mail_template($email_format, $theme='')
@@ -174 +176 @@
 
 /**
- * Return string email format (html or not)
+ * Return string email format (text/html or text/plain)
  *
  * @param string format
@@ -275 +277 @@
  *   - keyargs_subject: mail subject on l10n_args format
  *   - keyargs_content: mail content on l10n_args format
+ *   - send_technical_details: send user IP and browser
  *
  * @return boolean (Ok or not)
@@ -318 +321 @@
   if (count($admins) > 0)
   {
-    $keyargs_content_admin_info = array(
-      get_l10n_args('Connected user: %s', stripslashes($user['username'])),
-      get_l10n_args('IP: %s', $_SERVER['REMOTE_ADDR']),
-      get_l10n_args('Browser: %s', $_SERVER['HTTP_USER_AGENT'])
-      );
-
     switch_lang_to(get_default_language());
 
@@ -329 +326 @@
     if ($send_technical_details)
     {
+      $keyargs_content_admin_info = array(
+        get_l10n_args('Connected user: %s', stripslashes($user['username'])),
+        get_l10n_args('IP: %s', $_SERVER['REMOTE_ADDR']),
+        get_l10n_args('Browser: %s', $_SERVER['HTTP_USER_AGENT'])
+        );
+      
       $content.= "\n".l10n_args($keyargs_content_admin_info)."\n";
     }
@@ -355 +358 @@
  *   - email_format: mail format
  *   - keyargs_subject: mail subject on l10n_args format
- *   - dirname: short name of directory including template
  *   - tpl_shortname: short template name without extension
  *   - assign_vars: array used to assign_vars to mail template