Changeset 026d680 in github

Timestamp:

Apr 4, 2006 5:45:45 PM (7 years ago)

Author:

thomascube <thomas@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

f3704e1

Parents:

03f8558

Message:

Add configured domain to user names for login; changed get_input_value()

File:

• program/include/main.inc (modified) (4 diffs)

program/include/main.inc

@@ -388 +388 @@
     $imap_port = $CONFIG['default_port'];
 
+
+  /* Modify username with domain if required  
+     Inspired by Marco <P0L0_notspam_binware.org>
+  */
+  // Check if we need to add domain
+  if ($CONFIG['username_domain'] && !strstr($user, '@'))
+    {
+    if (is_array($CONFIG['username_domain']) && isset($CONFIG['username_domain'][$host]))
+      $user .= '@'.$CONFIG['username_domain'][$host];
+    else if (!empty($CONFIG['username_domain']))
+      $user .= '@'.$CONFIG['username_domain'];    
+    }
+
+
   // query if user already registered
   $sql_result = $DB->query("SELECT user_id, username, language, preferences
@@ -929 +943 @@
   else if ($source==RCUBE_INPUT_GPC)
     {
-    if (isset($_GET[$fname]))
+    if (isset($_POST[$fname]))
+      $value = $_POST[$fname];
+    else if (isset($_GET[$fname]))
       $value = $_GET[$fname];
-    else if (isset($_POST[$fname]))
-      $value = $_POST[$fname];
     else if (isset($_COOKIE[$fname]))
       $value = $_COOKIE[$fname];
@@ -946 +960 @@
   
   // convert to internal charset
-  return rcube_charset_convert($value, $OUTPUT->get_charset(), $charset);
+  if (is_object($OUTPUT))
+    return rcube_charset_convert($value, $OUTPUT->get_charset(), $charset);
+  else
+    return $value;
   }
 
@@ -1131 +1148 @@
         return rep_specialchars_output($name, 'html', 'all');
         }
+      else if ($object=='version')
+        {
+        return (string)RCMAIL_VERSION;
+        }
       else if ($object=='pagetitle')
         {