diff --git a/classes/functions.php b/classes/functions.php index a1fd6f4..eeb2aa0 100644 --- a/classes/functions.php +++ b/classes/functions.php @@ -13,7 +13,11 @@ if(!defined('entry') || !entry) die('Not a valid page'); ?> - - =========================== */ -?> -deleteComment($_GET['delete']); - header("Location: comments.php?delete=true"); - die(); -} - -if(isset($_POST["btnAdd"])) { - unset($_POST["btnAdd"]); - $_POST["username"] = strip_tags($_POST["username"]); - $_POST["email"] = strip_tags($_POST["email"]); - $_POST["web"] = strip_tags($_POST["web"]); - - if (isset($_POST["id_comment"])) { - $comment->modifyComment($_POST, $_POST["id_comment"]); - } else { - $comment->generateCookie($_POST); - $_POST["spam"] = ($comment->isSpam($_POST)) ? "1" : "0"; - $_POST["ip_user"] = $_SERVER["REMOTE_ADDR"]; - - if ($comment->addComment($_POST)) { - header("Location: comments.php?added=true"); - die(); - } else { - header("Location: comments.php?added=false"); - die(); - } - } -} else { - if ($isEdition) { - $row = $comment->getCommentByID($userId); - } -?> - - - - gelato :: <?php echo __("add user")?> - - - - - - - - - - -
- -
- -
-
    -

    -
    • -
    • -
    • -
- -
- - - - - - - -
- -
 
-
-
- -
- - - \ No newline at end of file diff --git a/db/gelato_db.sql b/db/gelato_db.sql index 77f69b4..3766ee7 100644 --- a/db/gelato_db.sql +++ b/db/gelato_db.sql @@ -1,4 +1,4 @@ --- DB Gelato CMS v0.90 +-- DB Gelato CMS v0.95 CREATE TABLE `gel_data` ( `id_post` int(11) NOT NULL auto_increment, @@ -81,4 +81,5 @@ INSERT INTO `gel_options` VALUES ('rich_text', '0'); INSERT INTO `gel_options` VALUES ('allow_comments', '0'); INSERT INTO `gel_options` VALUES ('offset_city', 'Mexico/General'); INSERT INTO `gel_options` VALUES ('offset_time', '-6'); +INSERT INTO `gel_options` VALUES ('shorten_links', '0'); INSERT INTO `gel_options` VALUES ('rss_import_frec', '5 minutes'); diff --git a/index.php b/index.php index 416415a..3e6a879 100644 --- a/index.php +++ b/index.php @@ -47,7 +47,7 @@ $template = new plantillas($conf->template); } $gelato_includes = "\n"; - $gelato_includes .= "\t\n"; + $gelato_includes .= "\t\n"; $gelato_includes .= "\turlGelato."/images/favicon.ico\" />\n"; $gelato_includes .= "\turlGelato.($conf->urlFriendly?"/rss/":"/rss.php")."\"/>\n"; $gelato_includes .= "\turlGelato."/themes/".$conf->template."/style.css\"/>\n"; diff --git a/login.php b/login.php index d00af0b..3425aaa 100644 --- a/login.php +++ b/login.php @@ -36,8 +36,6 @@ if ($user->isAuthenticated()) { - - diff --git a/notice.txt b/notice.txt index b175db7..2d516ad 100644 --- a/notice.txt +++ b/notice.txt @@ -11,13 +11,13 @@ Juan del Rio [ http://elcaminante.net/ ] = COPYRIGHT NOTICES = This product includes code and libraries developed by third parties, which are governed by different licenses. These components, and their licenses, are listed below. -= Mootools = -Copyright (c) 2006 Valerio Proietti, http://mad4milk.net -Mootools is available under MIT Style License. += jQuery = +Copyright (c) 2007 John Resig, http://jquery.com +jQuery is available under a dual licensed the MIT and GPL licenses. -= Slimbox = -Copyright (c) Christophe Beyls, http://www.digitalia.be -Slimbox available under MIT Style License. += jQuery Lightbox = +Copyright (c) 2007 Warren Krewenki, http://warren.mesozen.com/jquery-lightbox/ +jQuery Lightbox available under an Open License. = Sortable = Copyright (c) 1997-2006 Stuart Langridge, Joost de Valk, http://www.joostdevalk.nl/code/sortable-table/ diff --git a/update.php b/update.php index ecb9e36..08be93b 100644 --- a/update.php +++ b/update.php @@ -27,29 +27,14 @@ if (!file_exists($configFile)) { $db = new Conexion_Mysql(DB_name, DB_Server, DB_User, DB_Password); -/*$sqlStr = "INSERT INTO `".Table_prefix."options` VALUES ('allow_comments', '0');"; - -$db->ejecutarConsulta($sqlStr); - -$sqlStr = "INSERT INTO `".Table_prefix."options` VALUES ('offset_city', 'Mexico/General');"; - -$db->ejecutarConsulta($sqlStr); - -$sqlStr = "INSERT INTO `".Table_prefix."options` VALUES ('offset_time', '-6');"; - -$db->ejecutarConsulta($sqlStr); - $sqlStr = "INSERT INTO `".Table_prefix."options` VALUES ('shorten_links', '0');"; $db->ejecutarConsulta($sqlStr); - - AFTER v0.90 */ $sqlStr = "INSERT INTO `".Table_prefix."options` VALUES ('rss_import_frec', '5 minutes');"; $db->ejecutarConsulta($sqlStr); - $sqlStr = "CREATE TABLE `".Table_prefix."feeds` ( `id_feed` int(11) NOT NULL auto_increment, `url` varchar(255) NOT NULL, @@ -71,6 +56,6 @@ if(!is_dir('upload/CACHE')){ } echo "

Finished!

"; -echo "

Now you are running on the new After 0.90 version!!!

"; +echo "

Now you are running on the new gelato cioccolato RC1 version!!!

"; ?>