--- a/includes/http.php Tue Apr 06 15:54:45 2010 -0400
+++ b/includes/http.php Tue Apr 06 15:55:21 2010 -0400
@@ -370,10 +370,8 @@
$newline = "\r\n";
if ( $this->debug )
+ {
echo '<p>Connection opened. Writing main request to socket. Raw socket data follows.</p><pre>';
-
- if ( $this->debug )
- {
echo '<hr /><div style="white-space: nowrap;">';
echo '<p><b>' . __CLASS__ . ': Sending request</b></p><p>Request parameters:</p>';
echo "<p><b>Headers:</b></p><pre>$headers</pre>";
@@ -386,7 +384,7 @@
$portline = ( $this->port == 80 ) ? '' : ":$this->port";
$this->_fputs($connection, "{$this->method} {$this->uri}{$get} HTTP/1.1{$newline}");
- $this->_fputs($connection, "Host: {$this->host}$portline{$newline}");
+ $this->_fputs($connection, "Host: {$this->host}{$portline}{$newline}");
$this->_fputs($connection, $headers);
$this->_fputs($connection, $cookies);
@@ -528,7 +526,17 @@
{
echo "Pulling response using fread(), size $size\n";
}
- $this->response .= fread($this->socket, $size);
+ $basesize = strlen($this->response);
+ while ( strlen($this->response) - $basesize < $size )
+ {
+ $remaining_bytes = $size - (strlen($this->response) - $basesize);
+ $this->response .= fread($this->socket, $remaining_bytes);
+ if ( $this->debug )
+ {
+ $remaining_bytes = $size - (strlen($this->response) - $basesize);
+ echo "<br />Received " . (strlen($this->response) - $basesize) . " of $size bytes ($remaining_bytes remaining)...\n";
+ }
+ }
}
else
{
--- a/language/english/admin.json Tue Apr 06 15:54:45 2010 -0400
+++ b/language/english/admin.json Tue Apr 06 15:55:21 2010 -0400
@@ -425,14 +425,14 @@
heading_avatars: 'Avatars',
avatars_intro: 'Avatars are small images that users can display on their profiles and in comments.',
field_avatar_enable: 'Enable avatar support:',
- field_avatar_enable_hint: 'Supported formats are JPEG, PNG, and GIF™.',
+ field_avatar_enable_hint: 'Supported formats are JPEG, PNG, and GIF℠.',
field_avatar_enable_label: 'Enabled',
field_avatar_max_filesize: 'Maximum avatar file size:',
field_avatar_max_filesize_hint: 'For smaller sites, the highest value for this should be about 50KB, 51200. Larger sites with more visitors will likely want to use something much smaller, such as 10KB.',
field_avatar_max_dimensions: 'Maximum avatar dimensions:',
field_avatar_max_dimensions_hint: 'The format is width × height. Typically you want to have this square (the same width and height). These are only maximum dimensions; users are not prevented from having smaller images.',
field_avatar_allow_anim_title: 'Allow animated avatars:',
- field_avatar_allow_anim_hint: 'If this is checked, users can upload APNG and Animated GIF™ avatars. Sometimes such images can be specifically made to be distracting, like rapidly flashing images. If this is unchecked, these formats will be blocked, and only still PNGs and GIFs will be allowed.',
+ field_avatar_allow_anim_hint: 'If this is checked, users can upload APNG and Animated GIF℠ avatars. Sometimes such images can be specifically made to be distracting, like rapidly flashing images. If this is unchecked, these formats will be blocked, and only still PNGs and GIFs will be allowed.',
field_avatar_allow_anim: 'Don\'t block animated images',
field_avatar_upload_methods: 'Allowed upload methods:',
field_avatar_upload_file: 'Allow users to upload image files from their computers',
@@ -935,11 +935,11 @@
heading_imcontact: 'Instant messenger contact information',
- field_aim: 'AIM handle:',
- field_wlm: '<acronym title="Windows™ Live Messenger">WLM</acronym> handle:',
+ field_aim: 'AIM® handle:',
+ field_wlm: '<acronym title="Windows Live™ Messenger">WLM</acronym> handle:',
field_wlm_hint: 'If you don\'t specify the domain (@whatever.com), "@hotmail.com" will be assumed.',
- field_yim: 'Yahoo! IM handle:',
- field_xmpp: 'Jabber™/XMPP handle:',
+ field_yim: 'Yahoo!® IM handle:',
+ field_xmpp: 'Jabber®/XMPP handle:',
heading_contact_extra: 'Extra contact information',
--- a/language/english/install.json Tue Apr 06 15:54:45 2010 -0400
+++ b/language/english/install.json Tue Apr 06 15:55:21 2010 -0400
@@ -137,7 +137,7 @@
driver_intro: 'The next step is to choose the database driver that Enano will use. In most cases this is MySQL, but there are certain advantages to PostgreSQL, which is made available only experimentally.',
driver_msg_virt_appliance: '<b>You\'re using the Enano virtual appliance.</b><br />Unless you configured the appliance manually, PostgreSQL support is not available. In 99% of cases you\'ll want to click MySQL below.',
driver_err_no_mysql: 'You don\'t have the MySQL PHP extension installed.',
- driver_err_no_pgsql: 'You don\'t have the PostgreSQL PHP extensnion installed.',
+ driver_err_no_pgsql: 'You don\'t have the PostgreSQL PHP extension installed.',
driver_mysql: 'MySQL',
driver_mysql_intro: 'Click this button to use MySQL as the database backend for your site. Most web hosts support MySQL, and if you have administrative access to your MySQL server, you can create a new database and user during this installation process if you haven\'t done so already.',
driver_pgsql: 'PostgreSQL',
@@ -406,7 +406,7 @@
<p>The last option, Tiny URLs, is the most friendly URL scheme for search engines, because your URLs won\'t have any special characters
at all in them. However, this only works if your webhost has configured Apache with support for mod_rewrite. Most of the time if your
host supports this you will see a listing for it in their feature matrix. None of the popular Linux distributions (such as Ubuntu,
- Debian, Red Hat Enterprise Linux™, Fedora, openSUSE™, or CentOS) come with mod_rewrite enabled, so if you run a
+ Debian®, Red Hat® Enterprise Linux®, Fedora™, openSUSE™, or CentOS) come with mod_rewrite enabled, so if you run a
home-brew server, you should consult your distribution\'s documentation for enabling mod_rewrite before selecting this option.
With this scheme, URLs at your site will look like <tt>http://yoursite.com/path-to-enano/Main_Page</tt>.</p>
</p>',
--- a/plugins/SpecialUserPrefs.php Tue Apr 06 15:54:45 2010 -0400
+++ b/plugins/SpecialUserPrefs.php Tue Apr 06 15:55:21 2010 -0400
@@ -1157,6 +1157,7 @@
$db->_die('Avatar CP switching user avatar off');
$has_avi = 1;
+ $avi_type = 'grv';
$quiet || print '<div class="info-box">' . $lang->get('usercp_avatar_gravatar_success') . '</div>';
$had_a_boo_boo = false;
break;
--- a/plugins/admin/UserManager.php Tue Apr 06 15:54:45 2010 -0400
+++ b/plugins/admin/UserManager.php Tue Apr 06 15:55:21 2010 -0400
@@ -1242,8 +1242,8 @@
echo '<div class="info-box">' . $lang->get('acphome_msg_lockout_clear_success', array('ip' => htmlspecialchars($ip))) . '</div>';
}
- $q = $db->sql_query('SELECT COUNT(id) AS fail_count, ipaddr, username, timestamp FROM ' . table_prefix . "lockout\n"
- . " WHERE timestamp > ( " . time() . " - " . intval(getConfig('lockout_duration', 15)) . "*60 ) GROUP BY ipaddr ORDER BY COUNT(id) DESC, timestamp DESC;");
+ $q = $db->sql_query('SELECT COUNT(id) AS fail_count, ipaddr, username, timestamp FROM ' . table_prefix . "lockout AS l\n"
+ . " WHERE timestamp > ( " . time() . " - " . intval(getConfig('lockout_duration', 15)) . "*60 ) GROUP BY ipaddr, username, timestamp ORDER BY COUNT(id) DESC, timestamp DESC;");
if ( !$q )
$db->_die();