Browse Source

Merge branch 'master' of https://github.com/Spuds/playpen

emanuele 12 years ago
parent
commit
7a4335487a
60 changed files with 53 additions and 6 deletions
  1. 25 0
      DCO.txt
  2. 22 0
      README.md
  3. 1 1
      Sources/Profile.php
  4. 1 1
      Sources/Subs-Admin.php
  5. 1 1
      Themes/default/MessageIndex.template.php
  6. BIN
      Themes/default/images/bbc/email.png
  7. BIN
      Themes/default/images/bbc/ftp.png
  8. BIN
      Themes/default/images/bbc/img.png
  9. BIN
      Themes/default/images/bbc/url.png
  10. BIN
      Themes/default/images/theme/quickbuttons.png
  11. BIN
      Themes/default/images/topic/hot_poll.png
  12. BIN
      Themes/default/images/topic/hot_poll_locked.png
  13. BIN
      Themes/default/images/topic/hot_poll_locked_sticky.png
  14. BIN
      Themes/default/images/topic/hot_poll_sticky.png
  15. BIN
      Themes/default/images/topic/hot_post.png
  16. BIN
      Themes/default/images/topic/hot_post_locked.png
  17. BIN
      Themes/default/images/topic/hot_post_locked_sticky.png
  18. BIN
      Themes/default/images/topic/hot_post_sticky.png
  19. BIN
      Themes/default/images/topic/my_hot_poll.png
  20. BIN
      Themes/default/images/topic/my_hot_poll_locked.png
  21. BIN
      Themes/default/images/topic/my_hot_poll_locked_sticky.png
  22. BIN
      Themes/default/images/topic/my_hot_poll_sticky.png
  23. BIN
      Themes/default/images/topic/my_hot_post.png
  24. BIN
      Themes/default/images/topic/my_hot_post_locked.png
  25. BIN
      Themes/default/images/topic/my_hot_post_locked_sticky.png
  26. BIN
      Themes/default/images/topic/my_hot_post_sticky.png
  27. BIN
      Themes/default/images/topic/my_normal_poll.png
  28. BIN
      Themes/default/images/topic/my_normal_poll_locked.png
  29. BIN
      Themes/default/images/topic/my_normal_poll_locked_sticky.png
  30. BIN
      Themes/default/images/topic/my_normal_poll_sticky.png
  31. BIN
      Themes/default/images/topic/my_normal_post.png
  32. BIN
      Themes/default/images/topic/my_normal_post_locked.png
  33. BIN
      Themes/default/images/topic/my_normal_post_locked_sticky.png
  34. BIN
      Themes/default/images/topic/my_normal_post_sticky.png
  35. BIN
      Themes/default/images/topic/my_veryhot_poll.png
  36. BIN
      Themes/default/images/topic/my_veryhot_poll_locked.png
  37. BIN
      Themes/default/images/topic/my_veryhot_poll_locked_sticky.png
  38. BIN
      Themes/default/images/topic/my_veryhot_poll_sticky.png
  39. BIN
      Themes/default/images/topic/my_veryhot_post.png
  40. BIN
      Themes/default/images/topic/my_veryhot_post_locked.png
  41. BIN
      Themes/default/images/topic/my_veryhot_post_locked_sticky.png
  42. BIN
      Themes/default/images/topic/my_veryhot_post_sticky.png
  43. BIN
      Themes/default/images/topic/normal_poll.png
  44. BIN
      Themes/default/images/topic/normal_poll_locked.png
  45. BIN
      Themes/default/images/topic/normal_poll_locked_sticky.png
  46. BIN
      Themes/default/images/topic/normal_poll_sticky.png
  47. BIN
      Themes/default/images/topic/normal_post.png
  48. BIN
      Themes/default/images/topic/normal_post_locked.png
  49. BIN
      Themes/default/images/topic/normal_post_locked_sticky.png
  50. BIN
      Themes/default/images/topic/normal_post_sticky.png
  51. BIN
      Themes/default/images/topic/veryhot_poll.png
  52. BIN
      Themes/default/images/topic/veryhot_poll_locked.png
  53. BIN
      Themes/default/images/topic/veryhot_poll_locked_sticky.png
  54. BIN
      Themes/default/images/topic/veryhot_poll_sticky.png
  55. BIN
      Themes/default/images/topic/veryhot_post.png
  56. BIN
      Themes/default/images/topic/veryhot_post_locked.png
  57. BIN
      Themes/default/images/topic/veryhot_post_locked_sticky.png
  58. BIN
      Themes/default/images/topic/veryhot_post_sticky.png
  59. 1 1
      Themes/default/languages/ManageSmileys.english.php
  60. 2 2
      other/Settings.php

+ 25 - 0
DCO.txt

@@ -0,0 +1,25 @@
+Developer's Certificate of Origin 1.1
+
+      By making a contribution to this project, I certify that:
+
+      (a) The contribution was created in whole or in part by me and I
+          have the right to submit it under the open source license
+          indicated in the file; or
+
+      (b) The contribution is based upon previous work that, to the best
+          of my knowledge, is covered under an appropriate open source
+          license and I have the right under that license to submit that
+          work with modifications, whether created in whole or in part
+          by me, under the same open source license (unless I am
+          permitted to submit under a different license), as indicated
+          in the file; or
+
+      (c) The contribution was provided directly to me by some other
+          person who certified (a), (b) or (c) and I have not modified
+          it.
+
+      (d) I understand and agree that this project and the contribution
+          are public and that a record of the contribution (including all
+          personal information I submit with it, including my sign-off) is
+          maintained indefinitely and may be redistributed consistent with
+          this project or the open source license(s) involved.

+ 22 - 0
README.md

@@ -0,0 +1,22 @@
+**SMF**, www.simplemachines.org
+
+This is a SMF 2.1 development repository.
+The software is licensed under [BSD 3-clause license](http://www.opensource.org/licenses/BSD-3-Clause).
+
+Contributions to documentation are CC-by-SA 3. Third party libraries or sets of images, are under their own licenses.
+
+######Notes:
+
+Feel free to fork this repository and make your desired changes.
+
+Please see the [Developer's Certificate of Origin](https://github.com/Spuds/playpen/blob/master/DCO.txt) in the repository:
+by signing off your contributions, you acknowledge that you can and do license your submissions under the license of the project.
+
+######How to contribute:
+* fork the repository. If you are not used to Github, please check out [fork a repository](http://help.github.com/fork-a-repo).
+* branch your repository, to commit the desired changes.
+* sign-off your commits, to acknowledge your submission under the license of the project.
+* send a pull request to us.
+
+Finally, feel free to play around. That's what we're doing. ;)
+

+ 1 - 1
Sources/Profile.php

@@ -541,7 +541,7 @@ function ModifyProfile($post_errors = array())
 				$good_password = in_array(true, call_integration_hook('integrate_verify_password', array($cur_profile['member_name'], $_POST['oldpasswrd'], false)), true);
 
 				// Bad password!!!
-				if (!$good_password && $user_info['passwd'] != sha1(strtolower($cur_profile['member_name']) . $_POST['oldpasswrd']))
+				if (!$good_password && $user_info['passwd'] != sha1(strtolower($user_profile[$memID]['memberName']) . un_htmlspecialchars(stripslashes($_POST['oldpasswrd']))))
 					$post_errors[] = 'bad_password';
 
 				// Warn other elements not to jump the gun and do custom changes!

+ 1 - 1
Sources/Subs-Admin.php

@@ -386,7 +386,7 @@ function updateDbLastError($time)
 	global $boarddir; 
 	
 	// Write out the db_last_error file with the error timestamp 
-	file_put_contents($boarddir . '/db_last_error.php', "<?php\n$db_last_error = " . $time . ";\n?" . ">\n", LOCK_EX);
+	file_put_contents($boarddir . '/db_last_error.php', '<' . '?' . "php\n" . '$db_last_error = ' . $time . ';' . "\n" . '?' . '>', LOCK_EX);
 	@touch($boarddir . '/' . 'Settings.php');
 }
 /**

+ 1 - 1
Themes/default/MessageIndex.template.php

@@ -255,7 +255,7 @@ function template_main()
 					</td>
 					<td class="subject ', $alternate_class, '">
 						<div ', (!empty($topic['quick_mod']['modify']) ? 'id="topic_' . $topic['first_post']['id'] . '" onmouseout="mouse_on_div = 0;" onmouseover="mouse_on_div = 1;" ondblclick="modify_topic(\'' . $topic['id'] . '\', \'' . $topic['first_post']['id'] . '\');"' : ''), '>
-							', $topic['is_sticky'] ? '<strong>' : '', '<span title="', $topic[(empty($settings['message_index_preview_first']) ? 'last_post' : 'first_post')]['preview'], '"><span id="msg_' . $topic['first_post']['id'] . '">', $topic['first_post']['link'], ($context['can_approve_posts'] && !$topic['approved'] ? '&nbsp;<em>(' . $txt['awaiting_approval'] . ')</em>' : ''), '</span>', $topic['is_sticky'] ? '</strong>' : '';
+							', $topic['is_sticky'] ? '<strong>' : '', '<span title="', $topic[(empty($settings['message_index_preview_first']) ? 'last_post' : 'first_post')]['preview'], '"><span id="msg_' . $topic['first_post']['id'] . '">', $topic['first_post']['link'], ($context['can_approve_posts'] && !$topic['approved'] ? '&nbsp;<em>(' . $txt['awaiting_approval'] . ')</em>' : ''), '</span></span>', $topic['is_sticky'] ? '</strong>' : '';
 
 			// Is this topic new? (assuming they are logged in!)
 			if ($topic['new'] && $context['user']['is_logged'])

BIN
Themes/default/images/bbc/email.png


BIN
Themes/default/images/bbc/ftp.png


BIN
Themes/default/images/bbc/img.png


BIN
Themes/default/images/bbc/url.png


BIN
Themes/default/images/theme/quickbuttons.png


BIN
Themes/default/images/topic/hot_poll.png


BIN
Themes/default/images/topic/hot_poll_locked.png


BIN
Themes/default/images/topic/hot_poll_locked_sticky.png


BIN
Themes/default/images/topic/hot_poll_sticky.png


BIN
Themes/default/images/topic/hot_post.png


BIN
Themes/default/images/topic/hot_post_locked.png


BIN
Themes/default/images/topic/hot_post_locked_sticky.png


BIN
Themes/default/images/topic/hot_post_sticky.png


BIN
Themes/default/images/topic/my_hot_poll.png


BIN
Themes/default/images/topic/my_hot_poll_locked.png


BIN
Themes/default/images/topic/my_hot_poll_locked_sticky.png


BIN
Themes/default/images/topic/my_hot_poll_sticky.png


BIN
Themes/default/images/topic/my_hot_post.png


BIN
Themes/default/images/topic/my_hot_post_locked.png


BIN
Themes/default/images/topic/my_hot_post_locked_sticky.png


BIN
Themes/default/images/topic/my_hot_post_sticky.png


BIN
Themes/default/images/topic/my_normal_poll.png


BIN
Themes/default/images/topic/my_normal_poll_locked.png


BIN
Themes/default/images/topic/my_normal_poll_locked_sticky.png


BIN
Themes/default/images/topic/my_normal_poll_sticky.png


BIN
Themes/default/images/topic/my_normal_post.png


BIN
Themes/default/images/topic/my_normal_post_locked.png


BIN
Themes/default/images/topic/my_normal_post_locked_sticky.png


BIN
Themes/default/images/topic/my_normal_post_sticky.png


BIN
Themes/default/images/topic/my_veryhot_poll.png


BIN
Themes/default/images/topic/my_veryhot_poll_locked.png


BIN
Themes/default/images/topic/my_veryhot_poll_locked_sticky.png


BIN
Themes/default/images/topic/my_veryhot_poll_sticky.png


BIN
Themes/default/images/topic/my_veryhot_post.png


BIN
Themes/default/images/topic/my_veryhot_post_locked.png


BIN
Themes/default/images/topic/my_veryhot_post_locked_sticky.png


BIN
Themes/default/images/topic/my_veryhot_post_sticky.png


BIN
Themes/default/images/topic/normal_poll.png


BIN
Themes/default/images/topic/normal_poll_locked.png


BIN
Themes/default/images/topic/normal_poll_locked_sticky.png


BIN
Themes/default/images/topic/normal_poll_sticky.png


BIN
Themes/default/images/topic/normal_post.png


BIN
Themes/default/images/topic/normal_post_locked.png


BIN
Themes/default/images/topic/normal_post_locked_sticky.png


BIN
Themes/default/images/topic/normal_post_sticky.png


BIN
Themes/default/images/topic/veryhot_poll.png


BIN
Themes/default/images/topic/veryhot_poll_locked.png


BIN
Themes/default/images/topic/veryhot_poll_locked_sticky.png


BIN
Themes/default/images/topic/veryhot_poll_sticky.png


BIN
Themes/default/images/topic/veryhot_post.png


BIN
Themes/default/images/topic/veryhot_post_locked.png


BIN
Themes/default/images/topic/veryhot_post_locked_sticky.png


BIN
Themes/default/images/topic/veryhot_post_sticky.png


+ 1 - 1
Themes/default/languages/ManageSmileys.english.php

@@ -91,6 +91,6 @@ $txt['icons_edit_icon'] = 'Edit Message Icon';
 $txt['icons_new_icon'] = 'New Message Icon';
 $txt['icons_location_first_icon'] = 'As First Icon';
 $txt['icons_location_after'] = 'After';
-$txt['icons_filename_all_gif'] = 'All files must be &quot;png&quot; files';
+$txt['icons_filename_all_gif'] = 'All files must be &quot;gif&quot; files';
 $txt['icons_no_entries'] = 'There are currently no message icons configured.';
 ?>

+ 2 - 2
other/Settings.php

@@ -156,13 +156,13 @@ $sourcedir = dirname(__FILE__) . '/Sources';
 
 ########## Error-Catching ##########
 # Note: You shouldn't touch these settings.
-if (file_exists(dirname(__FILE__) . '/db_last_error.php')); 
+if (file_exists(dirname(__FILE__) . '/db_last_error.php'))
 	include(dirname(__FILE__) . '/db_last_error.php'); 
 
 if (!isset($db_last_error))
 {
 	// File does not exist so lets try to create it
-	updateDbLastError(0); 
+	file_put_contents(dirname(__FILE__) . '/db_last_error.php', '<' . '?' . "php\n" . '$db_last_error = 0;' . "\n" . '?' . '>');
 	$db_last_error = 0; 
 }