Creating 2x branch with latest changes.

chrisjaure · Apr 9, 2009 · 594db4d · 594db4d
2 parents 67e3dd7 + ad02d95
commit 594db4d
Show file tree

Hide file tree

Showing 299 changed files with 113 additions and 27,398 deletions.
diff --git a/source/LICENSE.txt b/source/LICENSE.txt
@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2008 Chris Jaure, <http://www.jibberbook.com/>
+Copyright (c) 2009 Chris Jaure, <http://www.jibberbook.com/>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/source/README.txt b/source/README.txt
@@ -1,6 +1,6 @@
 -----------------------------------------------------------
-JibberBook v2.2
-(c) 2008 Chris Jaure
+JibberBook v2.3
+(c) 2009 Chris Jaure
 license: MIT License
 website: http://www.jibberbook.com/
 -----------------------------------------------------------
@@ -14,11 +14,11 @@ INSTALLATION:
 
 1. Unpack files.
 
-2. Open /inc/config.php and on line 22, change 'password' to a password of your choice.
+2. Open /inc/config.php and on line 33, change 'password' to a password of your choice.
 
 3. Upload the files to your web server.
 
-4. Make sure your server has permission to write to /xml/comments.xml
+4. Make sure your server has permission to write to /data_layer/xml/comments.xml
 
 If you plan on using HTML Purifier, your server MUST have permission to write to /libraries/htmlpurifier/standalone/HTMLPurifier/DefinitionCache/Serializer
 
@@ -28,32 +28,7 @@ If you want to use a non-supported storage system, just extend /data_layer/datal
 CONFIGURATION:
 
 The configuration file contains many options.
-You can change (on line number):
-
-12. Type of storage. Accepts xml or mysql.
-13. The filename of the comments page. If you rename the file, change it here.
-14. How many comments are loaded at a time. A good range is 20-50.
-15. The date format. For other date formats, go to http://php.net/manual/en/function.date.php
-16. The folder name of the theme to be used.
-17. Language pack to be used. Should be the filename of any file in /localization/ without the extension. Uncomment if you need to change it.
-18. Location of the emoticon images. Must be an absolute url. Set to false to disable emoticon replacement.
-19. Enter your email address here if you want notifications of new comments. Set to false to disable.
-
-22. If you're using xml for storage, the name of the xml file located in /data_layer/xml/
-
-25.-29. If you're using mysql for storage, the information needed to connect to the database
-
-32. The password for the admin section.
-
-35. If true, HTML Purifier will be used to filter HTML. If false, all tags will be stripped. For more information on HTML Purifier, go to http://htmlpurifier.org/
-36. The character encoding of your page. Required by HTML Purifier.
-37. The doctype of your page. Required by HTML Purifier.
-38. Allowed HTML elements and attributes. Required by HTML Purifier.
-
-41. Your Akismet key. If a key is provided, Akismet will be used to filter spam. If a key is not provided, a simple spam filtration technique will be used. For more information on Akismet, go to http://akismet.com/
-42. The URL of the guestbook page. Required by Akismet.
-
-45. If emoticon replacement is enabled, the keys will be replaced by the images.
+For an up-to-date description of configuration options, visit http://code.google.com/p/jibberbook/wiki/Installation
 
 
 ADMINISTRATION:
@@ -74,7 +49,7 @@ INSTALLING THEMES:
 
 Themes should be unzipped and uploaded to the 'theme' directory and should be contained in their own subdirectory.
 
-To enable a theme, in config.inc on line number 19, enter the name of the subdirectory of the theme.
+To enable a theme, in config.inc on line number 16, enter the name of the subdirectory of the theme.
 
 
 CREATING THEMES:

diff --git a/source/actions/add.php b/source/actions/add.php
@@ -1,7 +1,7 @@
 <?php
 //-------------------------------------------------------------------------------------
-//	JibberBook v2.1
-//	(c) 2008 Chris Jaure
+//	JibberBook v2.3
+//	(c) 2009 Chris Jaure
 //	license: MIT License
 //	website: http://www.jibberbook.com/
 //
@@ -19,23 +19,20 @@
 unset($_SESSION['form_website']);
 unset($_SESSION['form_comment']);
 
-$data = $_POST;
+$data = array();
+$data['name'] = $_POST['name'];
+$data['website'] = $_POST['website'];
+$data['comment'] = $_POST['comment'];
+$data['jbemail'] = $_POST['jbemail'];
 
-if ($data['_ajax'] == 'true'){
-	$ajax = true;
-}
-else $ajax = false;
-unset($data['_ajax']);
+$ajax = ($_POST['_ajax'] == 'true');
 
 foreach ($data as $key => &$datem){ // clean input
-    if (!($key == 'name' || $key == 'website' || $key == 'comment' || $key == 'jbemail')) {
-        unset($data[$key]);
-        continue;
-    }
     if (get_magic_quotes_gpc()) {
         $datem = stripslashes($datem);
     }
-    $datem = trim($datem);
+    $datem = trim($datem);
+    $datem = iconv("UTF-8", "UTF-8//IGNORE", $datem);
     if ($key != 'comment') {
         $datem = strip_tags($datem);
         $datem = htmlspecialchars($datem, ENT_QUOTES); 
@@ -51,6 +48,12 @@
 $message = __('Your comment has been added.');
 $value = '1';
 validateForm($data);
+
+if (JB_CHAR_LIMIT) {
+    if (strlen($data['comment']) > JB_CHAR_LIMIT) {
+        $data['comment'] = substr($data['comment'], 0, JB_CHAR_LIMIT) . '...';
+    }
+}
 
 if (JB_ENABLE_HTML_PURIFIER) {
     //HTMLPurifier filtering

diff --git a/source/actions/loadcomments.php b/source/actions/loadcomments.php
@@ -1,7 +1,7 @@
 <?php
 //-------------------------------------------------------------------------------------
-//	JibberBook v2.1
-//	(c) 2008 Chris Jaure
+//	JibberBook v2.3
+//	(c) 2009 Chris Jaure
 //	license: MIT License
 //	website: http://www.jibberbook.com/
 //

diff --git a/source/actions/transformxml.php b/source/actions/transformxml.php
@@ -1,7 +1,7 @@
 <?php
 //-------------------------------------------------------------------------------------
-//	JibberBook v2.1
-//	(c) 2008 Chris Jaure
+//	JibberBook v2.3
+//	(c) 2009 Chris Jaure
 //	license: MIT License
 //	website: http://www.jibberbook.com/
 //
@@ -32,4 +32,4 @@ function replaceEmoticons($matches) {
         return $matches[0];
     }
 }
-?>
+?>
diff --git a/source/actions/validateform.php b/source/actions/validateform.php
@@ -1,7 +1,7 @@
 <?php
 //-------------------------------------------------------------------------------------
-//	JibberBook v2.1
-//	(c) 2008 Chris Jaure
+//	JibberBook v2.3
+//	(c) 2009 Chris Jaure
 //	license: MIT License
 //	website: http://www.jibberbook.com/
 //
@@ -58,6 +58,11 @@ function validateForm(&$formData){
             $errordesc = __('Please wait a bit before adding another comment.');
         }
     }
+
+    if (!JB_KEEP_SPAM && $formData['spam']) {
+      $errornum = '6';
+      $errordesc = __('Your comment was discarded because it was flagged as spam.');
+    }
 
     // if there's an error, return json object or set session vars, and then stop further actions
     if (isset($errornum)) {

diff --git a/source/admin/actions/delete.php b/source/admin/actions/delete.php
@@ -1,7 +1,7 @@
 <?php
 //-------------------------------------------------------------------------------------
-//	JibberBook v2.1
-//	(c) 2008 Chris Jaure
+//	JibberBook v2.3
+//	(c) 2009 Chris Jaure
 //	license: MIT License
 //	website: http://www.jibberbook.com/
 //
@@ -32,4 +32,4 @@
   $_SESSION['message_type'] = 'confirm';
   header("Location: {$_SESSION['referer']}");
 }
-?>
+?>
diff --git a/source/admin/actions/load.php b/source/admin/actions/load.php
@@ -1,7 +1,7 @@
 <?php
 //-------------------------------------------------------------------------------------
-//	JibberBook v2.1
-//	(c) 2008 Chris Jaure
+//	JibberBook v2.3
+//	(c) 2009 Chris Jaure
 //	license: MIT License
 //	website: http://www.jibberbook.com/
 //

diff --git a/source/admin/actions/login.php b/source/admin/actions/login.php
@@ -1,7 +1,7 @@
 <?php
 //-------------------------------------------------------------------------------------
-//	JibberBook v2.1
-//	(c) 2008 Chris Jaure
+//	JibberBook v2.3
+//	(c) 2009 Chris Jaure
 //	license: MIT License
 //	website: http://www.jibberbook.com/
 //
@@ -21,4 +21,4 @@
 $url = 'http://' . $_SERVER['HTTP_HOST'] . dirname(dirname($_SERVER['REQUEST_URI'] . 'x')) . '/index.php';
 header("Location: $url");
 exit();
-?>
+?>
diff --git a/source/admin/actions/logout.php b/source/admin/actions/logout.php
@@ -1,7 +1,7 @@
 <?php
 //-------------------------------------------------------------------------------------
-//	JibberBook v2.1
-//	(c) 2008 Chris Jaure
+//	JibberBook v2.3
+//	(c) 2009 Chris Jaure
 //	license: MIT License
 //	website: http://www.jibberbook.com/
 //
@@ -12,4 +12,4 @@
 session_unset();
 session_destroy();
 header("Location: ../index.php");
-?>
+?>
diff --git a/source/admin/actions/reclassify.php b/source/admin/actions/reclassify.php
@@ -1,7 +1,7 @@
 <?php
 //-------------------------------------------------------------------------------------
-//	JibberBook v2.1
-//	(c) 2008 Chris Jaure
+//	JibberBook v2.3
+//	(c) 2009 Chris Jaure
 //	license: MIT License
 //	website: http://www.jibberbook.com/
 //
@@ -24,4 +24,4 @@
   header("Location: {$_SESSION['referer']}");
 }
 
-?>
+?>
diff --git a/source/admin/actions/transformxml.php b/source/admin/actions/transformxml.php
@@ -1,7 +1,7 @@
 <?php
 //-------------------------------------------------------------------------------------
-//	JibberBook v2.1
-//	(c) 2008 Chris Jaure
+//	JibberBook v2.3
+//	(c) 2009 Chris Jaure
 //	license: MIT License
 //	website: http://www.jibberbook.com/
 //
@@ -35,4 +35,4 @@ function transformXML($input, $type){
   </div>
   <?php
 }
-?>
+?>
diff --git a/source/admin/ham.php b/source/admin/ham.php
@@ -1,7 +1,7 @@
 <?php
 //-------------------------------------------------------------------------------------
-//	JibberBook v2.1
-//	(c) 2008 Chris Jaure
+//	JibberBook v2.3
+//	(c) 2009 Chris Jaure
 //	license: MIT License
 //	website: http://www.jibberbook.com/
 //

diff --git a/source/admin/inc/footer.php b/source/admin/inc/footer.php
@@ -1,7 +1,7 @@
 <?php
 //-------------------------------------------------------------------------------------
-//	JibberBook v2.1
-//	(c) 2008 Chris Jaure
+//	JibberBook v2.3
+//	(c) 2009 Chris Jaure
 //	license: MIT License
 //	website: http://www.jibberbook.com/
 //

diff --git a/source/admin/inc/header.php b/source/admin/inc/header.php
@@ -1,7 +1,7 @@
 <?php
 //-------------------------------------------------------------------------------------
-//	JibberBook v2.1
-//	(c) 2008 Chris Jaure
+//	JibberBook v2.3
+//	(c) 2009 Chris Jaure
 //	license: MIT License
 //	website: http://www.jibberbook.com/
 //

diff --git a/source/admin/inc/jbascript.js b/source/admin/inc/jbascript.js
@@ -1,6 +1,6 @@
 //-------------------------------------------------------------------------------------
-//	JibberBook v2.1
-//	(c) 2008 Chris Jaure
+//	JibberBook v2.3
+//	(c) 2009 Chris Jaure
 //	license: MIT License
 //	website: http://www.jibberbook.com/
 //

diff --git a/source/admin/inc/jbastyle.css b/source/admin/inc/jbastyle.css
@@ -1,6 +1,6 @@
 /*-------------------------------------------------------------------------------------
- //	JibberBook v2.1
- //	(c) 2008 Chris Jaure
+ //	JibberBook v2.3
+ //	(c) 2009 Chris Jaure
  //	license: MIT License
  //	website: http://www.jibberbook.com/
  //

diff --git a/source/admin/inc/jbastyle_js.css b/source/admin/inc/jbastyle_js.css
@@ -1,6 +1,6 @@
 /*-------------------------------------------------------------------------------------
-//	JibberBook v2.1
-//	(c) 2008 Chris Jaure
+//	JibberBook v2.3
+//	(c) 2009 Chris Jaure
 //	license: MIT License
 //	website: http://www.jibberbook.com/
 //

diff --git a/source/admin/inc/secure.php b/source/admin/inc/secure.php
@@ -1,7 +1,7 @@
 <?php
 //-------------------------------------------------------------------------------------
-//	JibberBook v2.1
-//	(c) 2008 Chris Jaure
+//	JibberBook v2.3
+//	(c) 2009 Chris Jaure
 //	license: MIT License
 //	website: http://www.jibberbook.com/
 //
@@ -21,4 +21,4 @@
 } else {
   $loggedin = true;
 }
-?>
+?>
diff --git a/source/admin/index.php b/source/admin/index.php
@@ -1,7 +1,7 @@
 <?php
 //-------------------------------------------------------------------------------------
-//	JibberBook v2.1
-//	(c) 2008 Chris Jaure
+//	JibberBook v2.3
+//	(c) 2009 Chris Jaure
 //	license: MIT License
 //	website: http://www.jibberbook.com/
 //

diff --git a/source/admin/login_form.php b/source/admin/login_form.php
@@ -1,7 +1,7 @@
 <?php
 //-------------------------------------------------------------------------------------
-//	JibberBook v2.1
-//	(c) 2008 Chris Jaure
+//	JibberBook v2.3
+//	(c) 2009 Chris Jaure
 //	license: MIT License
 //	website: http://www.jibberbook.com/
 //

diff --git a/source/admin/spam.php b/source/admin/spam.php
@@ -1,7 +1,7 @@
 <?php
 //-------------------------------------------------------------------------------------
-//	JibberBook v2.1
-//	(c) 2008 Chris Jaure
+//	JibberBook v2.3
+//	(c) 2009 Chris Jaure
 //	license: MIT License
 //	website: http://www.jibberbook.com/
 //

diff --git a/source/feed/index.php b/source/feed/index.php
@@ -1,7 +1,7 @@
 <?php
 //-------------------------------------------------------------------------------------
-//	JibberBook v2.1
-//	(c) 2008 Chris Jaure
+//	JibberBook v2.3
+//	(c) 2009 Chris Jaure
 //	license: MIT License
 //	website: http://www.jibberbook.com/
 //
@@ -32,4 +32,4 @@
     endforeach;
 ?>
   </channel>
-</rss>
+</rss>