| @@ -1364,7 +1364,6 @@ | ||
| 1364 | 1364 | // return all the info. | 
| 1365 | 1365 | return $context['to_install']; | 
| 1366 | 1366 | } | 
| 1367 | - | |
| 1368 | 1367 | else | 
| 1369 | 1368 |  		fatal_lang_error('theme_install_error_title', false); | 
| 1370 | 1369 | } | 
| @@ -2291,7 +2291,6 @@ | ||
| 2291 | 2291 |  		list ($hookData['class'], $hookData['method']) = explode('::', $modFunc); | 
| 2292 | 2292 | $hookData['pureFunc'] = $hookData['method']; | 
| 2293 | 2293 | } | 
| 2294 | - | |
| 2295 | 2294 | else | 
| 2296 | 2295 | $hookData['pureFunc'] = $modFunc; | 
| 2297 | 2296 | |
| @@ -849,7 +849,6 @@ | ||
| 849 | 849 |  			die("\x47\x49\x46\x38\x39\x61\x01\x00\x01\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x21\xF9\x04\x01\x00\x00\x00\x00\x2C\x00\x00\x00\x00\x01\x00\x01\x00\x00\x02\x02\x44\x01\x00\x3B"); | 
| 850 | 850 | } | 
| 851 | 851 | } | 
| 852 | - | |
| 853 | 852 | elseif ($_REQUEST['format'] === '.wav') | 
| 854 | 853 |  	{ | 
| 855 | 854 | require_once($sourcedir . '/Subs-Sound.php'); | 
| @@ -756,7 +756,6 @@ | ||
| 756 | 756 | $groups[$row['id_group']]['num_members'] += $row['num_members']; | 
| 757 | 757 | $smcFunc['db_free_result']($query); | 
| 758 | 758 | } | 
| 759 | - | |
| 760 | 759 | else | 
| 761 | 760 |  		{ | 
| 762 | 761 |  			$query = $smcFunc['db_query']('', ' | 
| @@ -199,7 +199,6 @@ | ||
| 199 | 199 | list ($context['attachments']['quantity'], $context['attachments']['total_size']) = $smcFunc['db_fetch_row']($request); | 
| 200 | 200 | $smcFunc['db_free_result']($request); | 
| 201 | 201 | } | 
| 202 | - | |
| 203 | 202 | else | 
| 204 | 203 | $context['attachments'] = array( | 
| 205 | 204 | 'quantity' => 0, | 
| @@ -222,7 +222,6 @@ | ||
| 222 | 222 | |
| 223 | 223 |  			$this->_validLikes['can_like'] = ($this->_user['id'] == $topicOwner ? 'cannot_like_content' : (allowedTo('likes_like') ? true : 'cannot_like_content')); | 
| 224 | 224 | } | 
| 225 | - | |
| 226 | 225 | else | 
| 227 | 226 |  		{ | 
| 228 | 227 | // Modders: This will give you whatever the user offers up in terms of liking, e.g. $this->_type=msg, $this->_content=1 | 
| @@ -1252,7 +1252,6 @@ | ||
| 1252 | 1252 | if (!empty($modSettings['enableAllMessages']) && $topic_length < $modSettings['enableAllMessages']) | 
| 1253 | 1253 | $pages .= '  <a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.0;all">' . $txt['all'] . '</a>'; | 
| 1254 | 1254 | } | 
| 1255 | - | |
| 1256 | 1255 | else | 
| 1257 | 1256 | $pages = ''; | 
| 1258 | 1257 | |
| @@ -93,7 +93,6 @@ | ||
| 93 | 93 | |
| 94 | 94 | continue; | 
| 95 | 95 | } | 
| 96 | - | |
| 97 | 96 | elseif (empty($row['show_online']) && empty($membersOnlineOptions['show_hidden'])) | 
| 98 | 97 |  		{ | 
| 99 | 98 | // Just increase the stats and don't add this hidden user to any list. | 
| @@ -881,7 +881,6 @@ discard block | ||
| 881 | 881 | $is_writable = true; | 
| 882 | 882 | break; | 
| 883 | 883 | } | 
| 884 | - | |
| 885 | 884 | else | 
| 886 | 885 |  			{ | 
| 887 | 886 |  				// Convert the chmod value from octal (0777) to text ("777"). | 
| @@ -935,8 +934,9 @@ discard block | ||
| 935 | 934 |  	{ | 
| 936 | 935 | // Wait for a response that isn't continued with -, but don't wait too long. | 
| 937 | 936 | $time = time(); | 
| 938 | - do | |
| 939 | - $this->last_message = fgets($this->connection, 1024); | |
| 937 | +		do { | |
| 938 | + $this->last_message = fgets($this->connection, 1024); | |
| 939 | + } | |
| 940 | 940 | while ((strlen($this->last_message) < 4 || strpos($this->last_message, ' ') === 0 || strpos($this->last_message, ' ', 3) !== 3) && time() - $time < 5); | 
| 941 | 941 | |
| 942 | 942 | // Was the desired response returned? | 
| @@ -957,8 +957,9 @@ discard block | ||
| 957 | 957 | // Request a passive connection - this means, we'll talk to you, you don't talk to us. | 
| 958 | 958 | @fwrite($this->connection, 'PASV' . "\r\n"); | 
| 959 | 959 | $time = time(); | 
| 960 | - do | |
| 961 | - $response = fgets($this->connection, 1024); | |
| 960 | +		do { | |
| 961 | + $response = fgets($this->connection, 1024); | |
| 962 | + } | |
| 962 | 963 | while (strpos($response, ' ', 3) !== 3 && time() - $time < 5); | 
| 963 | 964 | |
| 964 | 965 | // If it's not 227, we weren't given an IP and port, which means it failed. | 
| @@ -1080,8 +1081,9 @@ discard block | ||
| 1080 | 1081 | |
| 1081 | 1082 | @fwrite($this->connection, 'PWD' . "\r\n"); | 
| 1082 | 1083 | $time = time(); | 
| 1083 | - do | |
| 1084 | - $response = fgets($this->connection, 1024); | |
| 1084 | +		do { | |
| 1085 | + $response = fgets($this->connection, 1024); | |
| 1086 | + } | |
| 1085 | 1087 | while ($response[3] != ' ' && time() - $time < 5); | 
| 1086 | 1088 | |
| 1087 | 1089 | // Check for 257! |