Changeset 319

Timestamp:

Mar 17, 2008 11:58:08 PM (16 years ago)

Author:

quinn

Message:

 

Files:

• tags/2.0.2/lib/Auth_SQL.inc.php (modified) (2 diffs)
• trunk/bin/module_maker/form_template.cli.php (modified) (1 diff)
• trunk/bin/module_maker/module.cli.php (modified) (1 diff)

tags/2.0.2/lib/Auth_SQL.inc.php

@@ -76 +76 @@
         // An array of IP blocks that are bypass the remote_ip comparison check. Useful for dynamic IPs or those behind proxy servers.
         'trusted_networks' => array(),
+
+        // Match the user's current remote IP against the one they logged in with.
+        'match_remote_ip' => true,
 
         // Allow user accounts to be blocked? Requires the user table to have the columns 'blocked' and 'blocked_reason'
@@ -507 +510 @@
             && strtotime($_SESSION[$this->_sess]['login_datetime']) > time() - $this->_params['login_timeout']
             && strtotime($_SESSION[$this->_sess]['last_access_datetime']) > time() - $this->_params['idle_timeout']
-            && ($_SESSION[$this->_sess]['remote_ip'] == getRemoteAddr() || $user_in_trusted_network)
+            && (!$this->_params['match_remote_ip'] || $_SESSION[$this->_sess]['remote_ip'] == getRemoteAddr() || $user_in_trusted_network)
         ) {
             // User is authenticated!

trunk/bin/module_maker/form_template.cli.php

@@ -85 +85 @@
         <div class="sc-help"><\x3fphp printf(_("The current file <a href=\"%s/%2\\\$s\"><strong>%2\\\$s</strong></a> will be deleted if a new file is selected for upload."), '/_db_files/__///__', \$upload->getFilenameGlob(getFormData('$primary_key') . '_*')) \x3f></div>
     <\x3fphp } \x3f>
-    <div class="sc-help"><\x3fphp printf(_("File to upload must have one of the following file-name extensions: %s."), join(', ', \$upload->getParam('valid_file_extensions'))) \x3f></div>
+    <div class="sc-help"><\x3fphp printf(_("Allowed file types: %s."), join(', ', \$upload->getParam('valid_file_extensions'))) \x3f></div>
 </div>
 E_O_F;

trunk/bin/module_maker/module.cli.php

@@ -230 +230 @@
 if ($upload_file_capability) {
     // Form arguments
-    $replace['admin_form_tag_init'] = "<form enctype=\"multipart/form-data\" method=\"post\" action=\"<\x3fphp echo oTxt(\$_SERVER['PHP_SELF']); \x3f>\" class=\"sc-form\">\n<input type=\"hidden\" name=\"MAX_FILE_SIZE\" value=\"__///__\" />";
+    $replace['admin_form_tag_init'] = "<form enctype=\"multipart/form-data\" method=\"post\" action=\"<\x3fphp echo oTxt(\$_SERVER['PHP_SELF']); \x3f>\" class=\"sc-form\">\n<input type=\"hidden\" name=\"MAX_FILE_SIZE\" value=\"<\x3fphp echo intval(ini_get('upload_max_filesize')) * 1024 * 1024; \x3f>\" />";
 
     // Include statement.