WIP #140 Add avatar module

Allow relative and absolute paths for avatars

Author: JN-Jones

boards/mybb/avatars.php

@@ -89,7 +89,8 @@ function generate_raw_filename($avatar)
 	{
 		global $import_session;
 
-		return ltrim(str_replace($import_session['relative_avatar_path'], '', $avatar['avatar']), '/');
+		$filename = ltrim(str_replace($import_session['relative_avatar_path'], '', $avatar['avatar']), '/');
+		return my_substr($filename, 0, strpos($filename, '?'));
 	}
 }
 

language/global.lang.php

@@ -175,7 +175,7 @@
 $l['module_settings_updating'] = "Updating settings {1}";
 
 $l['module_attachment_link'] = "Please type in the link to your {1} forum attachment directory";
-$l['module_attachment_label'] = "Link (URL) to your forum attachment directory";
+$l['module_attachment_label'] = "Link (URL) to your forum attachment directory<br /><span class='smalltext'>If possible use a relative or absolute path. Note that the <b>merge</b> directory is used as working directory</span>";
 $l['module_attachment_error'] = "Error transfering the attachment (ID: {1})";
 $l['module_attachment_not_found'] = "Error could not find the attachment (ID: {1})";
 $l['module_attachment_thumbnail_error'] = "Error transfering the attachment thumbnail (ID: {1})";
@@ -185,7 +185,7 @@
 $l['attmodule_ipadress2'] = "You may not use \"127.0.0.1\" in the URL. Please use your Internet IP Address (Please make sure Port 80 is open on your firewall and router).";
 
 $l['module_avatar_link'] = "Please type in the link to your {1} avatar directory";
-$l['module_avatar_label'] = "Link (URL) to your forum avatar directory";
+$l['module_avatar_label'] = "Link (URL) to your forum avatar directory<br /><span class='smalltext'>If possible use a relative or absolute path. Note that the <b>merge</b> directory is used as working directory</span>";
 $l['module_avatar_error'] = "Error transfering the avatar (ID: {1})";
 $l['module_avatar_not_found'] = "Error could not find the avatar (ID: {1})";
 

resources/functions.php

@@ -643,8 +643,9 @@ function merge_fetch_remote_file($url, $post_data=array())
 		$post_body = ltrim($post_body, '&');
 	}
 
-	// Use this method if we have a relative or absolute path as our url
-	if(my_substr($url, 0, 1) == '.' || my_substr($url, 0, 1) == '/' || my_substr($url, 1, 2) == ':\\')
+	// Use fopen if we have an internal path
+	// Internal pathes start either with a '.' (relative), a '/' (UNIX) or 'X:\' where X can be anything. Also Windows can be used with a slash instead of a backslash
+	if(my_substr($url, 0, 1) == '.' || my_substr($url, 0, 1) == '/' || my_substr($url, 1, 2) == ':\\' || my_substr($url, 1, 2) == ':/')
 	{
 		@clearstatcache();
 		if(is_readable($url))

resources/modules/avatars.php

@@ -151,7 +151,16 @@ public function test_readability()
 			$import_session['uploads_avatars_test'] = 0;
 		}
 
-		if(!check_url_exists($mybb->input['avatarspath'])) {
+		if(strpos($import_session['avatarspath'], '../') !== false || my_substr($import_session['avatarspath'], 0, 1) == '/' || my_substr($import_session['avatarspath'], 1, 1) == ':')
+		{
+			$readable = @is_readable($import_session['avatarspath']);
+		}
+		else
+		{
+			$readable = check_url_exists($import_session['avatarspath']);
+		}
+
+		if(!$readable) {
 			$this->debug->log->error("Avatar directory not readable");
 			$this->errors[] = $lang->download_not_readable;
 			$import_session['uploads_avatars_test'] = 0;
@@ -171,6 +180,7 @@ function after_insert($unconverted_data, $converted_data, $aid)
 		}
 
 		// Transfer avatar
+		$this->debug->log->error($import_session['avatarspath'].$this->generate_raw_filename($unconverted_data));
 		$data_file = merge_fetch_remote_file($import_session['avatarspath'].$this->generate_raw_filename($unconverted_data));
 		if(!empty($data_file))
 		{

stylesheet.css

@@ -265,6 +265,11 @@ label {
 
 /* Misc */
 
+.smalltext {
+    font-size: 11px;
+    font-weight: normal;
+}
+
 .invisible {
 	display: none;
 }