Preparing for cioccolato RC1
parent
64af9c9b1e
commit
3eb4cd43dc
|
|
@ -13,7 +13,11 @@ if(!defined('entry') || !entry) die('Not a valid page');
|
|||
?>
|
||||
<?php
|
||||
function version() {
|
||||
return "0.90";
|
||||
return "0.95";
|
||||
}
|
||||
|
||||
function codeName() {
|
||||
return "cioccolato RC1";
|
||||
}
|
||||
|
||||
function beginsWith($str, $sub) {
|
||||
|
|
|
|||
116
comments.php
116
comments.php
|
|
@ -1,116 +0,0 @@
|
|||
<?php
|
||||
if(!defined('entry') || !entry) die('Not a valid page');
|
||||
/* ===========================
|
||||
|
||||
gelato CMS - A PHP based tumblelog CMS
|
||||
development version
|
||||
http://www.gelatocms.com/
|
||||
|
||||
gelato CMS is a free software licensed under the GPL 2.0
|
||||
Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
|
||||
|
||||
=========================== */
|
||||
?>
|
||||
<?php
|
||||
require_once('config.php');
|
||||
include("classes/functions.php");
|
||||
include("classes/comments.class.php");
|
||||
require_once("classes/configuration.class.php");
|
||||
|
||||
$comment = new comments();
|
||||
$conf = new configuration();
|
||||
$isEdition = isset($_GET["edit"]);
|
||||
$commentId = ($isEdition) ? $_GET["edit"] : NULL;
|
||||
|
||||
|
||||
if (isset($_GET["delete"])) {
|
||||
$comment->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);
|
||||
}
|
||||
?>
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<title>gelato :: <?php echo __("add user")?></title>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||
<meta name="generator" content="gelato cms <?php echo version();?>" />
|
||||
<link rel="shortcut icon" href="<?php echo $conf->urlGelato;?>/images/favicon.ico" />
|
||||
<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/mootools.js"></script>
|
||||
<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/tools.js"></script>
|
||||
<style type="text/css" media="screen">
|
||||
@import "<?php echo $conf->urlGelato;?>/admin/css/style.css";
|
||||
</style>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<div id="div-process" style="display:none;"><?=__("Processing request…");?></div>
|
||||
<div id="cont">
|
||||
<div id="head">
|
||||
<h1><a href="<?php echo $conf->urlGelato;?>/" title="gelato :: <?=__("home")?>">gelato cms</a></h1>
|
||||
<ul id="nav">
|
||||
<li><a href="<?php echo $conf->urlGelato;?>/" title="<?=__("Take me to the tumblelog")?>"><?=__("Back to the Tumblelog")?></a></li>
|
||||
</ul>
|
||||
</div>
|
||||
<div id="main">
|
||||
|
||||
<div class="box">
|
||||
<ul class="menu manage">
|
||||
<h3><?=__("Start session")?></h3>
|
||||
<li><a href="index.php"><?=__("Post")?></a></li>
|
||||
<li><a href="admin.php"><?=__("Users")?></a></li>
|
||||
<li class="selected"><a><?php echo ($isEdition) ? __("Edit") : __("Add"); ?></a></li>
|
||||
</ul>
|
||||
|
||||
<div class="tabla">
|
||||
|
||||
|
||||
<?php
|
||||
if ($isEdition) {
|
||||
?>
|
||||
<input type="hidden" name="id_user" id="id_user" value="<?php echo $userId;?>" />
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
<div class="footer-box"> </div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="foot">
|
||||
<a href="http://www.gelatocms.com/" title="gelato CMS">gelato CMS</a> :: PHP/MySQL Tumblelog Content Management System.
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
|
|
@ -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');
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ $template = new plantillas($conf->template);
|
|||
}
|
||||
|
||||
$gelato_includes = "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>\n";
|
||||
$gelato_includes .= "\t<meta name=\"generator\" content=\"gelato cms ".version()."\" />\n";
|
||||
$gelato_includes .= "\t<meta name=\"generator\" content=\"gelato ".codeName()." (".version().")\" />\n";
|
||||
$gelato_includes .= "\t<link rel=\"shortcut icon\" href=\"".$conf->urlGelato."/images/favicon.ico\" />\n";
|
||||
$gelato_includes .= "\t<link rel=\"alternate\" type=\"application/rss+xml\" title=\"RSS\" href=\"".$conf->urlGelato.($conf->urlFriendly?"/rss/":"/rss.php")."\"/>\n";
|
||||
$gelato_includes .= "\t<link rel=\"stylesheet\" type=\"text/css\" href=\"".$conf->urlGelato."/themes/".$conf->template."/style.css\"/>\n";
|
||||
|
|
|
|||
|
|
@ -36,8 +36,6 @@ if ($user->isAuthenticated()) {
|
|||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||
<meta name="generator" content="gelato cms <?php echo version();?>" />
|
||||
<link rel="shortcut icon" href="<?php echo $conf->urlGelato;?>/images/favicon.ico" />
|
||||
<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/mootools.js"></script>
|
||||
<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/sortable.js"></script>
|
||||
<style type="text/css" media="screen">
|
||||
@import "<?php echo $conf->urlGelato;?>/admin/css/style.css";
|
||||
</style>
|
||||
|
|
|
|||
12
notice.txt
12
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/
|
||||
|
|
|
|||
17
update.php
17
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 "<p><em>Finished!</em></p>";
|
||||
echo "<p>Now you are running on the new <strong>After 0.90</strong> version!!!</p>";
|
||||
echo "<p>Now you are running on the new <strong>gelato cioccolato RC1</strong> version!!!</p>";
|
||||
|
||||
?>
|
||||
|
|
|
|||
Loading…
Reference in New Issue