Home Explore Help
Sign In
richard
/
sorbetcms
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Commits 290 Releases 0 Wiki
Browse Source

Renamed the whole source code to "Sorbet CMS", the name of our fork of Gelato CMS.

Klectik 7 years ago
parent
f073feed40
commit
ffd91e7b02
89 changed files with 628 additions and 2067 deletions
Split View Show Diff Stats
  1. 19 22
      admin/admin.php
  2. 5 8
      admin/ajax.php
  3. 20 23
      admin/bm.php
  4. 17 20
      admin/close.php
  5. 17 20
      admin/comments.php
  6. 1 157
      admin/css/archive.css
  7. BIN
      admin/css/images/gelato-logo.png
  8. BIN
      admin/css/images/sorbet-logo.png
  9. 1 92
      admin/css/lightbox.css
  10. 1 198
      admin/css/style.css
  11. 25 28
      admin/feeds.php
  12. 16 19
      admin/index.php
  13. 42 45
      admin/options.php
  14. 32 35
      admin/plugins.php
  15. 1 35
      admin/scripts/markitup/sets/html/set.js
  16. 1 39
      admin/scripts/markitup/sets/html/style.css
  17. 1 131
      admin/scripts/markitup/skins/simple/style.css
  18. 30 33
      admin/settings.php
  19. 5 5
      admin/themes/admin/api.xml
  20. 34 34
      admin/themes/admin/index.htm
  21. 5 5
      admin/themes/admin/install.htm
  22. 19 19
      admin/themes/admin/login.htm
  23. 7 7
      admin/themes/admin/template_bm.htm
  24. 26 29
      admin/user.php
  25. 5 8
      api.php
  26. 11 14
      archive.php
  27. 5 8
      classes/comments.class.php
  28. 4 7
      classes/configuration.class.php
  29. 2 5
      classes/feeds.class.php
  30. 2 2
      classes/install.class.php
  31. 2 5
      classes/lang.functions.php
  32. 8 11
      classes/plugin.class.php
  33. 3 6
      classes/plugins.class.php
  34. 9 12
      classes/sorbet.class.php
  35. 2 5
      classes/templates.class.php
  36. 10 13
      classes/user.class.php
  37. 5 8
      classes/util.class.php
  38. 3 6
      config.php
  39. BIN
      db/gelato_db.erwin
  40. BIN
      db/sorbet_db.erwin
  41. 20 16
      db/sorbet_db.sql
  42. 11 11
      entry.php
  43. 6 6
      gettext.bat
  44. BIN
      images/favicon.ico
  45. 23 26
      index.php
  46. 3 6
      install.php
  47. BIN
      languages/ca/messages.mo
  48. 7 8
      languages/ca/messages.po
  49. BIN
      languages/de/messages.mo
  50. 7 8
      languages/de/messages.po
  51. BIN
      languages/en/messages.mo
  52. 7 8
      languages/en/messages.po
  53. BIN
      languages/es-AR/messages.mo
  54. 7 8
      languages/es-AR/messages.po
  55. BIN
      languages/es-ES/messages.mo
  56. 7 8
      languages/es-ES/messages.po
  57. BIN
      languages/es-MX/messages.mo
  58. 7 8
      languages/es-MX/messages.po
  59. BIN
      languages/fr/messages.mo
  60. 5 6
      languages/fr/messages.po
  61. BIN
      languages/it/messages.mo
  62. 7 8
      languages/it/messages.po
  63. BIN
      languages/nl/messages.mo
  64. 7 8
      languages/nl/messages.po
  65. BIN
      languages/no/messages.mo
  66. 7 8
      languages/no/messages.po
  67. BIN
      languages/pl/messages.mo
  68. 5 6
      languages/pl/messages.po
  69. BIN
      languages/pt-BR/messages.mo
  70. 7 8
      languages/pt-BR/messages.po
  71. BIN
      languages/ru/messages.mo
  72. 6 7
      languages/ru/messages.po
  73. BIN
      languages/zh-CN/messages.mo
  74. 7 8
      languages/zh-CN/messages.po
  75. BIN
      languages/zh-TW/messages.mo
  76. 8 9
      languages/zh-TW/messages.po
  77. 7 10
      login.php
  78. 16 17
      plugins/feedreplacement.php
  79. 2 3
      plugins/kodrs.php
  80. 2 3
      plugins/post_confirmation.php
  81. 7 13
      readme.txt
  82. 7 10
      rss.php
  83. 5 8
      sitemap.php
  84. 11 11
      sitemap.xsl
  85. 2 2
      themes/Dreamscape/index.htm
  86. 1 378
      themes/Dreamscape/style.css
  87. 2 2
      themes/tumblr/index.htm
  88. 1 308
      themes/tumblr/style.css
  89. 5 7
      uploads/index.php

+ 19 - 22
admin/admin.php View File 

@@ -4,16 +4,13 @@ if (!defined('entry')) {
4 4 
 }
5 5 
 /* ===========================
6 6
7 
-  gelato CMS - A PHP based tumblelog CMS
8 
-  development version
9 
-  http://www.gelatocms.com/
7 
+  Sorbet CMS - A PHP based tumblelog CMS forked from Gelato CMS
10 8
11 
-  gelato CMS is a free software licensed under the GPL 2.0
12 
-  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
9 
+  Sorbet CMS is a free software licensed under the GPL 3.0
13 10
14 11 
   =========================== */
15 12
16 
-require_once('../entry.php');
13 
+require_once '../entry.php';
17 14 
 global $user, $conf, $tumble;
18 15
19 16 
 if ($user->isAdmin()) {
 
@@ -21,14 +18,14 @@ if ($user->isAdmin()) {
21 18 
 	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
22 19 
 	<html xmlns="http://www.w3.org/1999/xhtml">
23 20 
 	<head>
24 
-		<title>gelato :: <?php echo __("admin users")?></title>
21 
+		<title>sorbet :: <?php echo __("admin users")?></title>
25 22 
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
26 23 
 		<?php $util_class = new util(); ?>
27 
-		<meta name="generator" content="gelato cms <?php echo $util_class->version(); ?>" />
28 
-		<link rel="shortcut icon" href="<?php echo $conf->urlGelato; ?>/images/favicon.ico" />
29 
-		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato; ?>/admin/scripts/jquery.js"></script>
30 
-		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato; ?>/admin/scripts/tools.js"></script>
31 
-		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato; ?>/admin/scripts/jquery.tablesorter.min.js"></script>
24 
+		<meta name="generator" content="sorbet cms <?php echo $util_class->version(); ?>" />
25 
+		<link rel="shortcut icon" href="<?php echo $conf->urlSorbet; ?>/images/favicon.ico" />
26 
+		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlSorbet; ?>/admin/scripts/jquery.js"></script>
27 
+		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlSorbet; ?>/admin/scripts/tools.js"></script>
28 
+		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlSorbet; ?>/admin/scripts/jquery.tablesorter.min.js"></script>
32 29 
 		<script type="text/javascript">
33 30 
 		$(document).ready(function(){
34 31 
 			$("#admin-table").tablesorter({

@@ -43,7 +40,7 @@ if ($user->isAdmin()) {
43 40 
 		});
44 41 
 		</script>
45 42 
 		<style type="text/css" media="screen">
46 
-			@import "<?php echo $conf->urlGelato; ?>/admin/css/style.css";
43 
+			@import "<?php echo $conf->urlSorbet; ?>/admin/css/style.css";
47 44 
 		</style>
48 45 
 	</head>
49 46 
 

@@ -51,10 +48,10 @@ if ($user->isAdmin()) {
51 48 
 		<div id="div-process" style="display:none;"><?php echo __("Processing request&hellip;")?></div>
52 49 
 		<div id="cont">
53 50 
 			<div id="head">
54 
-				<h1><a href="<?php echo $conf->urlGelato; ?>/admin/index.php" title="gelato :: <?php echo __("home")?>">gelato cms</a></h1>
51 
+				<h1><a href="<?php echo $conf->urlSorbet; ?>/admin/index.php" title="sorbet :: <?php echo __("home")?>">sorbet cms</a></h1>
55 52 
 				<ul id="nav">
56 
-					<li><a href="<?php echo $conf->urlGelato; ?>/" title="Take me to the tumblelog"><?php echo __("View Tumblelog")?></a></li>
57 
-					<li><a href="close.php" title="Log off" onclick="return exit('div-process','<?php echo $conf->urlGelato; ?>/admin/ajax.php?action=close');"><?php echo __("Log out")?></a></li>
53 
+					<li><a href="<?php echo $conf->urlSorbet; ?>/" title="Take me to the tumblelog"><?php echo __("View Tumblelog")?></a></li>
54 
+					<li><a href="close.php" title="Log off" onclick="return exit('div-process','<?php echo $conf->urlSorbet; ?>/admin/ajax.php?action=close');"><?php echo __("Log out")?></a></li>
58 55 
 			  	</ul>
59 56 
 			</div>
60 57 
 			<div id="main">

@@ -62,10 +59,10 @@ if ($user->isAdmin()) {
62 59 
 				<div class="box">
63 60 
 					<ul class="menu manage">
64 61 
 					<h3>Manage</h3>
65 
-					<li><a href="<?php echo $conf->urlGelato; ?>/admin/plugins.php"><?php echo __("Plugins")?></a></li>
66 
-					<li><a href="<?php echo $conf->urlGelato; ?>/admin/settings.php"><?php echo __("Settings")?></a></li>
67 
-					<li><a href="<?php echo $conf->urlGelato; ?>/admin/index.php"><?php echo __("Posts")?></a></li>
68 
-					<li><a href="<?php echo $conf->urlGelato; ?>/admin/user.php"><?php echo __("Add user")?></a></li>
62 
+					<li><a href="<?php echo $conf->urlSorbet; ?>/admin/plugins.php"><?php echo __("Plugins")?></a></li>
63 
+					<li><a href="<?php echo $conf->urlSorbet; ?>/admin/settings.php"><?php echo __("Settings")?></a></li>
64 
+					<li><a href="<?php echo $conf->urlSorbet; ?>/admin/index.php"><?php echo __("Posts")?></a></li>
65 
+					<li><a href="<?php echo $conf->urlSorbet; ?>/admin/user.php"><?php echo __("Add user")?></a></li>
69 66 
 					<li class="selected"><a><?php echo __("Users")?></a></li>
70 67 
 					</ul>
71 68 
 					<p>&nbsp;</p>

@@ -143,7 +140,7 @@ if ($user->isAdmin()) {
143 140 
 				</div>
144 141 
 			</div>
145 142 
 			<div id="foot">
146 
-				<a href="http://www.gelatocms.com/" title="gelato CMS">gelato CMS</a> :: PHP/MySQL Tumblelog Content Management System.
143 
+				Sorbet CMS :: PHP Tumblelog Content Management System.
147 144 
 			</div>
148 145 
 		</div>
149 146 
 	</body>

@@ -151,6 +148,6 @@ if ($user->isAdmin()) {
151 148 
 <?php
152 149
153 150 
 } else {
154 
-    header("Location: ".$conf->urlGelato."/login.php");
151 
+    header("Location: ".$conf->urlSorbet."/login.php");
155 152 
 }
156 153 
 ?>

+ 5 - 8
admin/ajax.php View File 

@@ -4,19 +4,16 @@ if (!defined('entry')) {
4 4 
 }
5 5 
 /* ===========================
6 6
7 
-  gelato CMS - A PHP based tumblelog CMS
8 
-  development version
9 
-  http://www.gelatocms.com/
7 
+  Sorbet CMS - A PHP based tumblelog CMS forked from Gelato CMS
10 8
11 
-  gelato CMS is a free software licensed under the GPL 2.0
12 
-  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
9 
+  Sorbet CMS is a free software licensed under the GPL 3.0
13 10
14 11 
   =========================== */
15 12 
 ?>
16 13 
 <?php
17 14 
     require_once('../entry.php');
18 15 
     global $user;
19 
-
16 
+
20 17 
     if ($user->isAdmin()) {
21 18 
         if ($_GET["action"]) {
22 19 
             if ($_GET["action"] == "close") {
 
@@ -26,7 +23,7 @@ if (!defined('entry')) {
26 23 
                     echo __("&nbsp;failure ending session&hellip;");
27 24 
                 }
28 25 
             }    // $_GET["action"] == "close"
29 
-
26 
+
30 27 
             if ($_GET["action"] == "verify") {
31 28 
                 if ($_GET["login"]=="") {
32 29 
                     echo "<div class=\"error\">".__("Required field cannot be left blank.")."</div>";
 
@@ -40,4 +37,4 @@ if (!defined('entry')) {
40 37 
             }    // $_GET["action"] == "verify"
41 38 
         }    // $_GET["action"]
42 39 
     }    // $user->isAdmin()
43 
-?>
40 
+?>

+ 20 - 23
admin/bm.php View File 

@@ -4,18 +4,15 @@ if (!defined('entry')) {
4 4 
 }
5 5 
 /* ===========================
6 6
7 
-  gelato CMS - A PHP based tumblelog CMS
8 
-  development version
9 
-  http://www.gelatocms.com/
7 
+  Sorbet CMS - A PHP based tumblelog CMS forked from Gelato CMS
10 8
11 
-  gelato CMS is a free software licensed under the GPL 2.0
12 
-  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
9 
+  Sorbet CMS is a free software licensed under the GPL 3.0
13 10
14 11 
   =========================== */
15 12 
 ?>
16 13 
 <?php
17 14
18 
-require('../entry.php');
15 
+require '../entry.php';
19 16 
 global $user, $conf, $tumble;
20 17 
 $template = new plantillas("admin");
21 18 
 $util_class = new util();
 
@@ -27,7 +24,7 @@ if ($user->isAdmin()) {
27 24 
             if (isset($_POST["url"]) && $_POST["url"]!="") {
28 25 
                 $photoName = $util_class->getFileName($_POST["url"]);
29 26 
                 if (!$tumble->savePhoto($_POST["url"])) {
30 
-                    header("Location: ".$conf->urlGelato."/admin/index.php?photo=false");
27 
+                    header("Location: ".$conf->urlSorbet."/admin/index.php?photo=false");
31 28 
                     die();
32 29 
                 }
33 30 
                 $_POST["url"] = "../uploads/".$util_class->sanitizeName($photoName);
 
@@ -41,11 +38,11 @@ if ($user->isAdmin()) {
41 38 
             set_time_limit(300);
42 39 
             $mp3Name = $util_class->getFileName($_POST["url"]);
43 40 
             if (!$tumble->saveMP3($_POST["url"])) {
44 
-                header("Location: ".$conf->urlGelato."/admin/index.php?mp3=false");
41 
+                header("Location: ".$conf->urlSorbet."/admin/index.php?mp3=false");
45 42 
                 die();
46 43 
             }
47 44 
             if (isMP3($remoteFileName)) {
48 
-                $_POST["url"] = $conf->urlGelato."/uploads/".$mp3Name;
45 
+                $_POST["url"] = $conf->urlSorbet."/uploads/".$mp3Name;
49 46 
             }
50 47 
         }
51 48 
 
@@ -53,7 +50,7 @@ if ($user->isAdmin()) {
53 50 
             $_POST["title"] = addslashes($_POST["title"]);
54 51 
             $_POST["description"] = addslashes($_POST["description"]);
55 52 
         }
56 
-
53 
+
57 54 
         $_POST["title"] = $util_class->removeBadTags($_POST["title"], true);
58 55 
         $_POST["description"] = $util_class->removeBadTags($_POST["description"]);
59 56 
 
@@ -65,7 +62,7 @@ if ($user->isAdmin()) {
65 62 
             $template->mostrarPlantilla();
66 63 
             die();
67 64 
         } else {
68 
-            header("Location: ".$conf->urlGelato."/admin/index.php?error=2&des=".$this->merror);
65 
+            header("Location: ".$conf->urlSorbet."/admin/index.php?error=2&des=".$this->merror);
69 66 
             die();
70 67 
         }
71 68 
     } else {
 
@@ -97,22 +94,22 @@ if ($user->isAdmin()) {
97 94 
 	<html xmlns="http://www.w3.org/1999/xhtml">
98 95 
 	<head>
99 96 
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
100 
-		<meta name="generator" content="gelato cms <?php echo $util_class->version(); ?>" />
101 
-		<title>gelato :: <?php echo __("bookmarklet")?></title>
102 
-		<link rel="shortcut icon" href="<?php echo $conf->urlGelato; ?>/images/favicon.ico" />
103 
-        <script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato; ?>/admin/scripts/jquery.js"></script>
104 
-		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato; ?>/admin/scripts/tools.js"></script>
105 
-        <script type="text/javascript" src="<?php echo $conf->urlGelato; ?>/admin/scripts/markitup/jquery.markitup.pack.js"></script>
106 
-		<script type="text/javascript" src="<?php echo $conf->urlGelato; ?>/admin/scripts/markitup/sets/html/set.js"></script>
107 
-        <link rel="stylesheet" type="text/css" href="<?php echo $conf->urlGelato; ?>/admin/scripts/markitup/skins/simple/style.css" />
108 
-        <link rel="stylesheet" type="text/css" href="<?php echo $conf->urlGelato; ?>/admin/scripts/markitup/sets/html/style.css" />
97 
+		<meta name="generator" content="sorbet cms <?php echo $util_class->version(); ?>" />
98 
+		<title>sorbet :: <?php echo __("bookmarklet")?></title>
99 
+		<link rel="shortcut icon" href="<?php echo $conf->urlSorbet; ?>/images/favicon.ico" />
100 
+        <script language="javascript" type="text/javascript" src="<?php echo $conf->urlSorbet; ?>/admin/scripts/jquery.js"></script>
101 
+		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlSorbet; ?>/admin/scripts/tools.js"></script>
102 
+        <script type="text/javascript" src="<?php echo $conf->urlSorbet; ?>/admin/scripts/markitup/jquery.markitup.pack.js"></script>
103 
+		<script type="text/javascript" src="<?php echo $conf->urlSorbet; ?>/admin/scripts/markitup/sets/html/set.js"></script>
104 
+        <link rel="stylesheet" type="text/css" href="<?php echo $conf->urlSorbet; ?>/admin/scripts/markitup/skins/simple/style.css" />
105 
+        <link rel="stylesheet" type="text/css" href="<?php echo $conf->urlSorbet; ?>/admin/scripts/markitup/sets/html/style.css" />
109 106 
         <script type="text/javascript" >
110 107 
            $(document).ready(function() {
111 108 
               $("#description").markItUp(my_html);
112 109 
            });
113 110 
         </script>
114 111 
 		<style type="text/css" media="screen">
115 
-			@import "<?php echo $conf->urlGelato; ?>/admin/css/style.css";
112 
+			@import "<?php echo $conf->urlSorbet; ?>/admin/css/style.css";
116 113 
 		</style>
117 114 
 	</head>
118 115 
 

@@ -224,7 +221,7 @@ if ($user->isAdmin()) {
224 221
225 222 
     } ?>
226 223 
 			<div id="foot">
227 
-				<a href="http://www.gelatocms.com/" title="gelato CMS">gelato CMS</a> :: PHP/MySQL Tumblelog Content Management System.
224 
+				Sorbet CMS :: PHP Tumblelog Content Management System.
228 225 
 			</div>
229 226 
 		</div>
230 227 
 	</body>

@@ -233,6 +230,6 @@ if ($user->isAdmin()) {
233 230
234 231 
 } else {
235 232 
     $target = (isset($_GET["url"]))? "/login.php?redirect_url=".$_GET["url"]."&sel=".$_GET["sel"] : "/login.php";
236 
-    header("Location: ".$conf->urlGelato.$target);
233 
+    header("Location: ".$conf->urlSorbet.$target);
237 234 
 }
238 235 
 ?>

+ 17 - 20
admin/close.php View File 

@@ -4,17 +4,14 @@ if (!defined('entry')) {
4 4 
 }
5 5 
 /* ===========================
6 6
7 
-  gelato CMS - A PHP based tumblelog CMS
8 
-  development version
9 
-  http://www.gelatocms.com/
7 
+  Sorbet CMS - A PHP based tumblelog CMS forked from Gelato CMS
10 8
11 
-  gelato CMS is a free software licensed under the GPL 2.0
12 
-  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
9 
+  Sorbet CMS is a free software licensed under the GPL 3.0
13 10
14 11 
   =========================== */
15 12 
 ?>
16 13 
 <?php
17 
-require('../entry.php');
14 
+require '../entry.php';
18 15 
 global $user;
19 16 
 $closed = $user->closeSession();
20 17 
 
@@ -22,36 +19,36 @@ $closed = $user->closeSession();
22 19 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
23 20 
 	<html xmlns="http://www.w3.org/1999/xhtml">
24 21 
 	<head>
25 
-		<title>gelato :: <?php echo __("logout")?></title>
22 
+		<title>sorbet :: <?php echo __("logout")?></title>
26 23 
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
27 
-		<meta name="generator" content="gelato cms <?php echo util::version();?>" />
24 
+		<meta name="generator" content="sorbet cms <?php echo util::version();?>" />
28 25 
 		<meta http-equiv="Refresh" content="3;URL=../login.php" />
29 
-		<link rel="shortcut icon" href="<?php echo $conf->urlGelato;?>/images/favicon.ico" />
30 
-		<style type="text/css" media="screen">
31 
-			@import "<?php echo $conf->urlGelato;?>/admin/css/style.css";
26 
+		<link rel="shortcut icon" href="<?php echo $conf->urlSorbet;?>/images/favicon.ico" />
27 
+		<style type="text/css" media="screen">
28 
+			@import "<?php echo $conf->urlSorbet;?>/admin/css/style.css";
32 29 
 		</style>
33 30 
 	</head>
34 31 
 <body>
35 32 
 <div id="cont">
36 33 
 			<div id="head">
37 
-				<h1><a href="<?php echo $conf->urlGelato;?>/" title="gelato :: <?php echo __("home")?>">gelato cms</a></h1>
34 
+				<h1><a href="<?php echo $conf->urlSorbet;?>/" title="sorbet :: <?php echo __("home")?>">sorbet cms</a></h1>
38 35 
 				<ul id="nav">
39 
-					<li><a href="<?php echo $conf->urlGelato;?>/" title="<?php echo __("Take me to the tumblelog")?>"><?php echo __("Back to the Tumblelog")?></a></li>
36 
+					<li><a href="<?php echo $conf->urlSorbet;?>/" title="<?php echo __("Take me to the tumblelog")?>"><?php echo __("Back to the Tumblelog")?></a></li>
40 37 
 			  	</ul>
41 38 
 			</div>
42 
-			<div id="main">
43 
-
39 
+			<div id="main">
40 
+
44 41 
 				<div class="box">
45 42 
 					<ul class="menu manage">
46 43 
 					<h3><?php echo __("Closing session")?></h3>
47 44 
 					<li class="selected"><a><?php echo __("logoff")?></a></li>
48 45 
 					</ul>
49 
-
46 
+
50 47 
 					<div class="tabla">
51 48 
 						<p>
52 49 
 <?php
53 50 
                         if ($closed) {
54 
-                            ?>
51 
+                            ?>
55 52 
 							<h2><?php echo __("Ending session&hellip;")?></h2>
56 53 
 <?php
57 54 
 
@@ -61,7 +58,7 @@ $closed = $user->closeSession();
61 58 
 <?php
62 59
63 60 
                         }
64 
-?>
61 
+?>
65 62 
 						</p>
66 63 
 					</div>
67 64 
 

@@ -69,8 +66,8 @@ $closed = $user->closeSession();
69 66 
 				</div>
70 67 
 			</div>
71 68 
 			<div id="foot">
72 
-				<a href="http://www.gelatocms.com/" title="gelato CMS">gelato CMS</a> :: PHP/MySQL Tumblelog Content Management System.
69 
+				Sorbet CMS :: PHP Tumblelog Content Management System.
73 70 
 			</div>
74 71 
 		</div>
75 72 
 </body>
76 
-</html>
73 
+</html>

+ 17 - 20
admin/comments.php View File 

@@ -4,17 +4,14 @@ if (!defined('entry')) {
4 4 
 }
5 5 
 /* ===========================
6 6
7 
-  gelato CMS - A PHP based tumblelog CMS
8 
-  development version
9 
-  http://www.gelatocms.com/
7 
+  Sorbet CMS - A PHP based tumblelog CMS forked from Gelato CMS
10 8
11 
-  gelato CMS is a free software licensed under the GPL 2.0
12 
-  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
9 
+  Sorbet CMS is a free software licensed under the GPL 3.0
13 10
14 11 
   =========================== */
15 12 
 ?>
16 13 
 <?php
17 
-require_once('../entry.php');
14 
+require_once '../entry.php';
18 15 
 global $user, $conf, $tumble;
19 16
20 17 
 $comment = new comments();
 
@@ -48,10 +45,10 @@ if (isset($_POST["btnAdd"])) {
48 45
49 46 
         $strEnd=($conf->urlFriendly) ? "/" : "";
50 47 
         if ($comment->addComment($_POST)) {
51 
-            header("Location: ".$conf->urlGelato.($conf->urlFriendly?"/post/":"/index.php?post=").$_POST["id_post"].$strEnd);
48 
+            header("Location: ".$conf->urlSorbet.($conf->urlFriendly?"/post/":"/index.php?post=").$_POST["id_post"].$strEnd);
52 49 
             die();
53 50 
         } else {
54 
-            header("Location: ".$conf->urlGelato.($conf->urlFriendly?"/post/":"/index.php?post=").$_POST["id_post"].$strEnd);
51 
+            header("Location: ".$conf->urlSorbet.($conf->urlFriendly?"/post/":"/index.php?post=").$_POST["id_post"].$strEnd);
55 52 
             die();
56 53 
         }
57 54 
     }
 
@@ -70,12 +67,12 @@ if ($isAdmin) {
70 67 
 	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
71 68 
 	<html xmlns="http://www.w3.org/1999/xhtml">
72 69 
 	<head>
73 
-		<title>gelato :: <?php echo __("comments")?></title>
70 
+		<title>sorbet :: <?php echo __("comments")?></title>
74 71 
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
75 
-		<meta name="generator" content="gelato cms <?php echo util::version(); ?>" />
76 
-		<link rel="shortcut icon" href="<?php echo $conf->urlGelato; ?>/images/favicon.ico" />
77 
-		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato; ?>/admin/scripts/jquery.js"></script>
78 
-		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato; ?>/admin/scripts/tools.js"></script>
72 
+		<meta name="generator" content="sorbet cms <?php echo util::version(); ?>" />
73 
+		<link rel="shortcut icon" href="<?php echo $conf->urlSorbet; ?>/images/favicon.ico" />
74 
+		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlSorbet; ?>/admin/scripts/jquery.js"></script>
75 
+		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlSorbet; ?>/admin/scripts/tools.js"></script>
79 76 
 		<script language="javascript" type="text/javascript">
80 77 
 		$(document).ready(function(){
81 78 
 			$("#divMessages").fadeOut(5000,function(){

@@ -84,7 +81,7 @@ if ($isAdmin) {
84 81 
 		});
85 82 
 		</script>
86 83 
 		<style type="text/css" media="screen">
87 
-			@import "<?php echo $conf->urlGelato; ?>/admin/css/style.css";
84 
+			@import "<?php echo $conf->urlSorbet; ?>/admin/css/style.css";
88 85 
 		</style>
89 86 
 	</head>
90 87 
 

@@ -92,9 +89,9 @@ if ($isAdmin) {
92 89 
 		<div id="div-process" style="display:none;"><?=__("Processing request&hellip;"); ?></div>
93 90 
 		<div id="cont">
94 91 
 			<div id="head">
95 
-				<h1><a href="<?php echo $conf->urlGelato; ?>/admin/index.php" title="gelato :: <?=__("home")?>">gelato cms</a></h1>
92 
+				<h1><a href="<?php echo $conf->urlSorbet; ?>/admin/index.php" title="sorbet :: <?=__("home")?>">sorbet cms</a></h1>
96 93 
 				<ul id="nav">
97 
-					<li><a href="<?php echo $conf->urlGelato; ?>/" title="<?=__("Take me to the tumblelog")?>"><?=__("Back to the Tumblelog")?></a></li>
94 
+					<li><a href="<?php echo $conf->urlSorbet; ?>/" title="<?=__("Take me to the tumblelog")?>"><?=__("Back to the Tumblelog")?></a></li>
98 95 
 			  	</ul>
99 96 
 			</div>
100 97 
 			<div id="main">

@@ -136,7 +133,7 @@ if ($isAdmin) {
136 133 
                             $date = strtotime($row["comment_date"]);
137 134
138 135 
                             $input = array("{User}", "{Email}", "{Web}", "{Comment}", "{Id_Post}", "{Date_Added}", "{Id_Comment}", "{Form_Action}");
139 
-                            $output = array($row["username"], $row["email"], $row["web"], $row["content"], $row["id_post"], $date, $row["id_comment"], $conf->urlGelato."/admin/comments.php");
136 
+                            $output = array($row["username"], $row["email"], $row["web"], $row["content"], $row["id_post"], $date, $row["id_comment"], $conf->urlSorbet."/admin/comments.php");
140 137
141 138 
                             $template->cargarPlantilla($input, $output, "template_comment_post");
142 139 
                             $template->mostrarPlantilla();
 
@@ -168,7 +165,7 @@ if ($isAdmin) {
168 165 
                                     $commentAuthor = ($rowComment["web"]=="") ? $rowComment["username"]." | ".$rowComment["email"]  : "<a href=\"".$rowComment["web"]."\" rel=\"external\">".$rowComment["username"]."</a> | ".$rowComment["email"];
169 166
170 167 
                                     $input = array("{Permalink}", "{URL_Tumble}", "{Id_Comment}", "{Comment_Author}", "{Comment}");
171 
-                                    $output = array($conf->urlGelato."/index.php/post/".$rowComment["id_post"]."#comment-".$rowComment["id_comment"], $conf->urlGelato, $rowComment["id_comment"], $commentAuthor, $rowComment["content"]);
168 
+                                    $output = array($conf->urlSorbet."/index.php/post/".$rowComment["id_post"]."#comment-".$rowComment["id_comment"], $conf->urlSorbet, $rowComment["id_comment"], $commentAuthor, $rowComment["content"]);
172 169
173 170 
                                     $template->cargarPlantilla($input, $output, "template_comment");
174 171 
                                     $template->mostrarPlantilla();
 
@@ -187,7 +184,7 @@ if ($isAdmin) {
187 184 
 				</div>
188 185 
 			</div>
189 186 
 			<div id="foot">
190 
-				<a href="http://www.gelatocms.com/" title="gelato CMS">gelato CMS</a> :: PHP/MySQL Tumblelog Content Management System.
187 
+				Sorbet CMS :: PHP Tumblelog Content Management System.
191 188 
 			</div>
192 189 
 		</div>
193 190 
 	</body>

@@ -195,6 +192,6 @@ if ($isAdmin) {
195 192 
 <?php
196 193
197 194 
 } else {
198 
-    header("Location: ".$conf->urlGelato."/login.php");
195 
+    header("Location: ".$conf->urlSorbet."/login.php");
199 196 
 }
200 197 
 ?>

File diff suppressed because it is too large
+ 1 - 157
admin/css/archive.css


BIN
admin/css/images/gelato-logo.png View File


BIN
admin/css/images/sorbet-logo.png View File


File diff suppressed because it is too large
+ 1 - 92
admin/css/lightbox.css


File diff suppressed because it is too large
+ 1 - 198
admin/css/style.css


+ 25 - 28
admin/feeds.php View File 

@@ -2,14 +2,11 @@
2 2 
 if (!defined('entry')) {
3 3 
     define('entry', true);
4 4 
 }
5 
- /* ===========================
5 
+/* ===========================
6 6
7 
-  gelato CMS - A PHP based tumblelog CMS
8 
-  development version
9 
-  http://www.gelatocms.com/
7 
+  Sorbet CMS - A PHP based tumblelog CMS forked from Gelato CMS
10 8
11 
-  gelato CMS is a free software licensed under the GPL 2.0
12 
-  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
9 
+  Sorbet CMS is a free software licensed under the GPL 3.0
13 10
14 11 
   =========================== */
15 12 
 ?>

@@ -27,7 +24,7 @@ if ($user->isAdmin()) {
27 24 
             $messageStatus = 'exito';
28 25 
         }
29 26 
     }
30 
-
27 
+
31 28 
     if (isset($_GET['delete']) && is_numeric($_GET['delete'])) {
32 29 
         if ($f->removeFeed((int)$_GET['delete'])) {
33 30 
             $message = __('Feed deleted');
 
@@ -37,13 +34,13 @@ if ($user->isAdmin()) {
37 34 
 	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
38 35 
 	<html xmlns="http://www.w3.org/1999/xhtml">
39 36 
 	<head>
40 
-		<title>gelato :: <?php echo __("Feeds")?></title>
37 
+		<title>sorbet :: <?php echo __("Feeds")?></title>
41 38 
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
42 
-		<meta name="generator" content="gelato cms <?php echo util::version(); ?>" />
43 
-		<link rel="shortcut icon" href="<?php echo $conf->urlGelato; ?>/images/favicon.ico" />
44 
-		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato; ?>/admin/scripts/jquery.js"></script>
45 
-		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato; ?>/admin/scripts/tools.js"></script>
46 
-		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato; ?>/admin/scripts/jquery.validate.min.js"></script>
39 
+		<meta name="generator" content="sorbet cms <?php echo util::version(); ?>" />
40 
+		<link rel="shortcut icon" href="<?php echo $conf->urlSorbet; ?>/images/favicon.ico" />
41 
+		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlSorbet; ?>/admin/scripts/jquery.js"></script>
42 
+		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlSorbet; ?>/admin/scripts/tools.js"></script>
43 
+		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlSorbet; ?>/admin/scripts/jquery.validate.min.js"></script>
47 44 
 		<script type="text/javascript">
48 45 
 		$(document).ready(function(){
49 46 
 			$("#divMessages").fadeOut(5000,function(){

@@ -58,36 +55,36 @@ if ($user->isAdmin()) {
58 55 
 					}
59 56 
 				},
60 57 
 				errorElement: "span",
61 
-				errorClass: "validate_span",
62 
-				errorPlacement: function(label, element) {
58 
+				errorClass: "validate_span",
59 
+				errorPlacement: function(label, element) {
63 60 
 					label.prependTo(element.prev())
64 
-				}
61 
+				}
65 62 
 			});
66 63
67 64 
 		});
68 65 
 		</script>
69 
-		<style type="text/css" media="screen">
70 
-			@import "<?php echo $conf->urlGelato; ?>/admin/css/style.css";
66 
+		<style type="text/css" media="screen">
67 
+			@import "<?php echo $conf->urlSorbet; ?>/admin/css/style.css";
71 68 
 		</style>
72 69 
 	</head>
73 
-
70 
+
74 71 
 	<body>
75 72 
 		<div id="cont">
76 73 
 			<div id="head">
77 
-				<h1><a href="<?php echo $conf->urlGelato; ?>/admin/index.php" title="gelato :: <?php echo __("home")?>">gelato cms</a></h1>
74 
+				<h1><a href="<?php echo $conf->urlSorbet; ?>/admin/index.php" title="sorbet :: <?php echo __("home")?>">sorbet cms</a></h1>
78 75 
 				<ul id="nav">
79 
-					<li><a href="<?php echo $conf->urlGelato; ?>/" title="<?php echo __("Take me to the tumblelog")?>"><?php echo __("Back to the Tumblelog")?></a></li>
76 
+					<li><a href="<?php echo $conf->urlSorbet; ?>/" title="<?php echo __("Take me to the tumblelog")?>"><?php echo __("Back to the Tumblelog")?></a></li>
80 77 
 			  	</ul>
81 78 
 			</div>
82 
-			<div id="main">
83 
-
79 
+			<div id="main">
80 
+
84 81 
 				<div class="box">
85 82 
 					<h3><?php echo __("Configure your feeds")?></h3>
86 83 
 					<ul class="menu manage">
87 84 
 					<li><a href="index.php"><?php echo __("Post")?></a></li>
88 85 
                     <li><a href="options.php"><?php echo __("Options")?></a></li>
89 86 
 					</ul>
90 
-
87 
+
91 88 
 					<?php echo(!(empty($message))? '<div class="'.$messageStatus.'" id="divMessages"> '.$message.'</div>' : ''); ?>
92 89
93 90 
 					<div class="tabla">

@@ -126,7 +123,7 @@ if ($user->isAdmin()) {
126 123 
 						</ul>
127 124 
 						</fieldset>
128 125 
 						</form>
129 
-						<div id="feedlist">
126 
+						<div id="feedlist">
130 127 
 						  <ul>
131 128 
 						    <?php
132 129 
                             $actual_feeds = $f->getFeedList();
 
@@ -145,7 +142,7 @@ if ($user->isAdmin()) {
145 142 
 				</div>
146 143 
 			</div>
147 144 
 			<div id="foot">
148 
-				<a href="http://www.gelatocms.com/" title="gelato CMS">gelato CMS</a> :: PHP/MySQL Tumblelog Content Management System.
145 
+				Sorbet CMS :: PHP Tumblelog Content Management System.
149 146 
 			</div>
150 147 
 		</div>
151 148 
 	</body>

@@ -153,6 +150,6 @@ if ($user->isAdmin()) {
153 150 
 <?php
154 151
155 152 
 } else {
156 
-    header("Location: ".$conf->urlGelato."/login.php");
153 
+    header("Location: ".$conf->urlSorbet."/login.php");
157 154 
 }
158 
-?>
155 
+?>

+ 16 - 19
admin/index.php View File 

@@ -4,17 +4,14 @@ if (!defined('entry')) {
4 4 
 }
5 5 
 /* ===========================
6 6
7 
-  gelato CMS - A PHP based tumblelog CMS
8 
-  development version
9 
-  http://www.gelatocms.com/
7 
+  Sorbet CMS - A PHP based tumblelog CMS forked from Gelato CMS
10 8
11 
-  gelato CMS is a free software licensed under the GPL 2.0
12 
-  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
9 
+  Sorbet CMS is a free software licensed under the GPL 3.0
13 10
14 11 
   =========================== */
15 12 
 ?>
16 13 
 <?php
17 
-require('../entry.php');
14 
+require '../entry.php';
18 15
19 16 
 global $user, $conf, $tumble;
20 17 
 #$template = new plantillas("admin");
 
@@ -48,7 +45,7 @@ if ($user->isAuthenticated()) {
48 45 
                         if (isset($_POST["url"]) && $_POST["url"]!="") {
49 46 
                             $photoName = $util_class->getFileName($_POST["url"]);
50 47 
                             if (!$tumble->savePhoto($_POST["url"])) {
51 
-                                header("Location: ".$conf->urlGelato."/admin/index.php?photo=false");
48 
+                                header("Location: ".$conf->urlSorbet."/admin/index.php?photo=false");
52 49 
                                 die();
53 50 
                             }
54 51 
                             $_POST["url"] = "../uploads/".$util_class->sanitizeName($photoName);
 
@@ -66,11 +63,11 @@ if ($user->isAuthenticated()) {
66 63 
                         set_time_limit(300);
67 64 
             $mp3Name = $util_class->getFileName($_POST["url"]);
68 65 
             if (!$tumble->saveMP3($_POST["url"])) {
69 
-                header("Location: ".$conf->urlGelato."/admin/index.php?mp3=false");
66 
+                header("Location: ".$conf->urlSorbet."/admin/index.php?mp3=false");
70 67 
                 die();
71 68 
             }
72 69 
             if ($util_class->isMP3($remoteFileName)) {
73 
-                $_POST["url"] = $conf->urlGelato."/uploads/".$mp3Name;
70 
+                $_POST["url"] = $conf->urlSorbet."/uploads/".$mp3Name;
74 71 
             }
75 72 
         }
76 73 
 
@@ -93,10 +90,10 @@ if ($user->isAuthenticated()) {
93 90 
             $tumble->modifyPost($_POST, $_POST["id_post"]);
94 91 
         } else {
95 92 
             if ($tumble->addPost($_POST)) {
96 
-                header("Location: ".$conf->urlGelato."/admin/index.php?added=true");
93 
+                header("Location: ".$conf->urlSorbet."/admin/index.php?added=true");
97 94 
                 die();
98 95 
             } else {
99 
-                header("Location: ".$conf->urlGelato."/admin/index.php?error=2&des=".$tumble->merror);
96 
+                header("Location: ".$conf->urlSorbet."/admin/index.php?error=2&des=".$tumble->merror);
100 97 
                 die();
101 98 
             }
102 99 
         }
 
@@ -110,7 +107,7 @@ if ($user->isAuthenticated()) {
110 107
111 108 
         $theme->set('version', $util_class->version());
112 109 
         $theme->set('conf', array(
113 
-                        'urlGelato'=>$conf->urlGelato,
110 
+                        'urlSorbet'=>$conf->urlSorbet,
114 111 
                         'richText'=>$conf->richText
115 112 
                 ));
116 113 
         $theme->set('new', isset($_GET['new'])?$_GET['new']:'');
 
@@ -119,9 +116,9 @@ if ($user->isAuthenticated()) {
119 116
120 117 
         if ($conf->check_version) {
121 118 
             $present = $util_class->version();
122 
-            $lastest = $util_class->_file_get_contents("http://www.gelatocms.com/vgel.txt");
119 
+            $lastest = "1.0";//$util_class->_file_get_contents("");
123 120 
             if ($present < $lastest) {
124 
-                $theme->set('information', __("A new gelato version has been released and is ready <a href=\"http://www.gelatocms.com/\">for download</a>."));
121 
+                $theme->set('information', __("A new version has been released and is ready for download."));
125 122 
             }
126 123 
         }
127 124 
 
@@ -192,7 +189,7 @@ if ($user->isAuthenticated()) {
192 189 
                                 $theme->set('form', $form->fetch(Absolute_Path.'admin/themes/admin/template_add_post.htm'));
193 190 
                                 break;
194 191 
                         case "photo":
195 
-                                $url = str_replace("../", $conf->urlGelato."/", $url);
192 
+                                $url = str_replace("../", $conf->urlSorbet."/", $url);
196 193 
                                 $form->set('editUrl', $url);
197 194 
                                 $theme->set('form', $form->fetch(Absolute_Path.'admin/themes/admin/template_add_photo.htm'));
198 195 
                                 break;
 
@@ -245,7 +242,7 @@ if ($user->isAuthenticated()) {
245 242
246 243 
                     $formatedDate = gmdate("M d", strtotime($register["date"]) + $util_class->transform_offset($conf->offsetTime));
247 244 
                     $strEnd=($conf->urlFriendly) ? "/" : "";
248 
-                    $permalink = $conf->urlGelato.($conf->urlFriendly?"/post/":"/index.php?post=").$register["id_post"].$strEnd;
245 
+                    $permalink = $conf->urlSorbet.($conf->urlFriendly?"/post/":"/index.php?post=").$register["id_post"].$strEnd;
249 246
250 247 
                     $register["title"] = stripslashes($register["title"]);
251 248 
                     $register["description"] = stripslashes($register["description"]);
 
@@ -264,12 +261,12 @@ if ($user->isAuthenticated()) {
264 261
265 262 
                                                         $x = @getimagesize($fileName);
266 263 
                                                         if ($x[0] > 100) {
267 
-                                                            $photoPath = $conf->urlGelato."/classes/imgsize.php?w=100&img=".$register["url"];
264 
+                                                            $photoPath = $conf->urlSorbet."/classes/imgsize.php?w=100&img=".$register["url"];
268 265 
                                                         } else {
269 266 
                                                             $photoPath = $register["url"];
270 267 
                                                         }
271 268
272 
-                                                        $effect = " href=\"".str_replace("../", $conf->urlGelato."/", $register["url"])."\" rel=\"lightbox\"";
269 
+                                                        $effect = " href=\"".str_replace("../", $conf->urlSorbet."/", $register["url"])."\" rel=\"lightbox\"";
273 270
274 271 
                                                         $row['PhotoURL'] = $photoPath;
275 272 
                                                         $row['PhotoAlt'] = strip_tags($register["description"]);
 
@@ -321,6 +318,6 @@ if ($user->isAuthenticated()) {
321 318 
         $theme->display(Absolute_Path.'admin/themes/admin/index.htm');
322 319 
     }
323 320 
 } else {
324 
-    header("Location: ".$conf->urlGelato."/login.php");
321 
+    header("Location: ".$conf->urlSorbet."/login.php");
325 322 
 }
326 323 
 ?>

+ 42 - 45
admin/options.php View File 

@@ -4,105 +4,102 @@ if (!defined('entry')) {
4 4 
 }
5 5 
 /* ===========================
6 6
7 
-  gelato CMS - A PHP based tumblelog CMS
8 
-  development version
9 
-  http://www.gelatocms.com/
7 
+  Sorbet CMS - A PHP based tumblelog CMS forked from Gelato CMS
10 8
11 
-  gelato CMS is a free software licensed under the GPL 2.0
12 
-  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
9 
+  Sorbet CMS is a free software licensed under the GPL 3.0
13 10
14 11 
   =========================== */
15 12 
 ?>
16 13 
 <?php
17 
-require_once('../entry.php');
14 
+require_once '../entry.php';
18 15 
 global $user, $conf, $tumble;
19 16
20 17 
 if ($user->isAdmin()) {
21 18 
     if (isset($_POST["btnsubmit"])) {
22 19 
         if (!$tumble->saveOption($_POST["rich_text"], "rich_text")) {
23 
-            header("Location: ".$conf->urlGelato."/admin/options.php?error=1&des=".$conf->merror);
20 
+            header("Location: ".$conf->urlSorbet."/admin/options.php?error=1&des=".$conf->merror);
24 21 
             die();
25 22 
         }
26 23 
         if (!$tumble->saveOption($_POST["url_friendly"], "url_friendly")) {
27 
-            header("Location: ".$conf->urlGelato."/admin/options.php?error=1&des=".$conf->merror);
24 
+            header("Location: ".$conf->urlSorbet."/admin/options.php?error=1&des=".$conf->merror);
28 25 
             die();
29 26 
         }
30 
-
27 
+
31 28 
         $off_r= split(",", $_POST['time_offsets']);
32 29 
         $_POST['offset_time'] = $off_r[0];
33 30 
         $_POST['offset_city'] = $off_r[1];
34 31 
         unset($_POST['time_offsets']);
35 32 
         if (!$tumble->saveOption($_POST["offset_city"], "offset_city")) {
36 
-            header("Location: ".$conf->urlGelato."/admin/options.php?error=1&des=".$conf->merror);
33 
+            header("Location: ".$conf->urlSorbet."/admin/options.php?error=1&des=".$conf->merror);
37 34 
             die();
38 35 
         }
39 36 
         if (!$tumble->saveOption($_POST["offset_time"], "offset_time")) {
40 
-            header("Location: ".$conf->urlGelato."/admin/options.php?error=1&des=".$conf->merror);
37 
+            header("Location: ".$conf->urlSorbet."/admin/options.php?error=1&des=".$conf->merror);
41 38 
             die();
42 39 
         }
43 
-
40 
+
44 41 
         if (!$tumble->saveOption($_POST["allow_comments"], "allow_comments")) {
45 
-            header("Location: ".$conf->urlGelato."/admin/options.php?error=1&des=".$conf->merror);
42 
+            header("Location: ".$conf->urlSorbet."/admin/options.php?error=1&des=".$conf->merror);
46 43 
             die();
47 44 
         }
48 
-
45 
+
49 46 
         if (!$tumble->saveOption($_POST["shorten_links"], "shorten_links")) {
50 
-            header("Location: ".$conf->urlGelato."/admin/options.php?error=1&des=".$conf->merror);
47 
+            header("Location: ".$conf->urlSorbet."/admin/options.php?error=1&des=".$conf->merror);
51 48 
             die();
52 49 
         }
53 
-
50 
+
54 51 
         if (!$tumble->saveOption($_POST["rss_import_frec"], "rss_import_frec")) {
55 
-            header("Location: ".$conf->urlGelato."/admin/options.php?error=1&des=".$conf->merror);
52 
+            header("Location: ".$conf->urlSorbet."/admin/options.php?error=1&des=".$conf->merror);
56 53 
             die();
57 54 
         }
58 
-
55 
+
59 56 
         if (!$tumble->saveOption($_POST["check_version"], "check_version")) {
60 
-            header("Location: ".$conf->urlGelato."/admin/options.php?error=1&des=".$conf->merror);
57 
+            header("Location: ".$conf->urlSorbet."/admin/options.php?error=1&des=".$conf->merror);
61 58 
             die();
62 59 
         }
63 60
64 
-        header("Location: ".$conf->urlGelato."/admin/options.php?modified=true");
61 
+        header("Location: ".$conf->urlSorbet."/admin/options.php?modified=true");
65 62 
         die();
66 63 
     } else {
67 64 
         ?>
68 65 
 	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
69 66 
 	<html xmlns="http://www.w3.org/1999/xhtml">
70 67 
 	<head>
71 
-		<title>gelato :: <?php echo __("options")?></title>
68 
+		<title>sorbet :: <?php echo __("options")?></title>
72 69 
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
73 
-		<meta name="generator" content="gelato cms <?php echo util::version(); ?>" />
74 
-		<link rel="shortcut icon" href="<?php echo $conf->urlGelato; ?>/images/favicon.ico" />
75 
-		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato; ?>/admin/scripts/jquery.js"></script>
70 
+		<meta name="generator" content="sorbet cms <?php echo util::version(); ?>" />
71 
+		<link rel="shortcut icon" href="<?php echo $conf->urlSorbet; ?>/images/favicon.ico" />
72 
+		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlSorbet; ?>/admin/scripts/jquery.js"></script>
76 73 
 		<script type="text/javascript">
77 74 
 		$(document).ready(function(){
78 75 
 			$("#divMessages").fadeOut(5000,function(){
79 76 
 				$("#divMessages").css({display:"none"});
80 77 
 			});
81 78 
 		});
82 
-		</script>
83 
-		<style type="text/css" media="screen">
84 
-			@import "<?php echo $conf->urlGelato; ?>/admin/css/style.css";
79 
+		</script>
80 
+		<style type="text/css" media="screen">
81 
+			@import "<?php echo $conf->urlSorbet; ?>/admin/css/style.css";
85 82 
 		</style>
86 83 
 	</head>
87 
-
84 
+
88 85 
 	<body>
89 86 
 		<div id="div-process" style="display:none;"><?php echo __("Processing request&hellip;")?></div>
90 87 
 		<div id="cont">
91 88 
 			<div id="head">
92 
-				<h1><a href="<?php echo $conf->urlGelato; ?>/admin/index.php" title="gelato :: <?php echo __("home")?>">gelato cms</a></h1>
89 
+				<h1><a href="<?php echo $conf->urlSorbet; ?>/admin/index.php" title="sorbet :: <?php echo __("home")?>">sorbet cms</a></h1>
93 90 
 				<ul id="nav">
94 
-					<li><a href="<?php echo $conf->urlGelato; ?>/" title="<?php echo __("Take me to the tumblelog")?>"><?php echo __("Back to the Tumblelog")?></a></li>
91 
+					<li><a href="<?php echo $conf->urlSorbet; ?>/" title="<?php echo __("Take me to the tumblelog")?>"><?php echo __("Back to the Tumblelog")?></a></li>
95 92 
 			  	</ul>
96 93 
 			</div>
97 
-			<div id="main">
98 
-
94 
+			<div id="main">
95 
+
99 96 
 				<div class="box">
100 97 
 					<ul class="menu manage">
101 98 
 					<h3><?php echo __("Tumblelog options")?></h3>
102 
-					<li><a href="<?php echo $conf->urlGelato; ?>/admin/index.php"><?php echo __("Post")?></a></li>
103 
-					<li><a href="<?php echo $conf->urlGelato; ?>/admin/admin.php"><?php echo __("Users")?></a></li>
104 
-					<li><a href="<?php echo $conf->urlGelato; ?>/admin/plugins.php"><?php echo __("Plugins")?></a></li>
105 
-					<li><a href="<?php echo $conf->urlGelato; ?>/admin/settings.php"><?php echo __("Settings")?></a></li>
99 
+					<li><a href="<?php echo $conf->urlSorbet; ?>/admin/index.php"><?php echo __("Post")?></a></li>
100 
+					<li><a href="<?php echo $conf->urlSorbet; ?>/admin/admin.php"><?php echo __("Users")?></a></li>
101 
+					<li><a href="<?php echo $conf->urlSorbet; ?>/admin/plugins.php"><?php echo __("Plugins")?></a></li>
102 
+					<li><a href="<?php echo $conf->urlSorbet; ?>/admin/settings.php"><?php echo __("Settings")?></a></li>
106 103 
 					<li class="selected"><a><?php echo __("Options")?></a></li>
107 104 
 					</ul>
108 105 
 <?php
 
@@ -118,9 +115,9 @@ if ($user->isAdmin()) {
118 115 
         } ?>
119 116 
 					<div class="tabla">
120 117
121 
-						<form action="options.php" method="post" id="options_form" autocomplete="off" class="newpost">
122 
-							<fieldset>
123 
-								<ul>
118 
+						<form action="options.php" method="post" id="options_form" autocomplete="off" class="newpost">
119 
+							<fieldset>
120 
+								<ul>
124 121 
 									<li class="select"><label for="rich_text"><?php echo __("Rich text editor:")?></label>
125 122 
 										<select name="rich_text" id="rich_text">
126 123 
 											<option value="1" <?php if ($conf->richText) {
 
@@ -278,21 +275,21 @@ if ($user->isAdmin()) {
278 275 
 										</select>
279 276 
 									</li>
280 277 
 <?php
281 
-                                    $trigger->call('add_options_panel'); ?>
278 
+                                    $trigger->call('add_options_panel'); ?>
282 279 
 								</ul>
283 280 
 							</fieldset>
284 281 
 							<p>
285 282 
 								<input type="submit" name="btnsubmit" id="btnsubmit" value="<?php echo __("Modify")?>" class="submit"/>
286 283 
 							</p>
287 
-						</form>
288 
-
284 
+						</form>
285 
+
289 286 
 					</div>
290 287
291 288 
 					<div class="footer-box">&nbsp;</div>
292 289 
 				</div>
293 290 
 			</div>
294 291 
 			<div id="foot">
295 
-				<a href="http://www.gelatocms.com/" title="gelato CMS">gelato CMS</a> :: PHP/MySQL Tumblelog Content Management System.
292 
+				Sorbet CMS :: PHP Tumblelog Content Management System.
296 293 
 			</div>
297 294 
 		</div>
298 295 
 	</body>

@@ -301,6 +298,6 @@ if ($user->isAdmin()) {
301 298
302 299 
     }
303 300 
 } else {
304 
-    header("Location: ".$conf->urlGelato."/login.php");
301 
+    header("Location: ".$conf->urlSorbet."/login.php");
305 302 
 }
306 
-?>
303 
+?>

+ 32 - 35
admin/plugins.php View File 

@@ -4,17 +4,14 @@ if (!defined('entry')) {
4 4 
 }
5 5 
 /* ===========================
6 6
7 
-  gelato CMS - A PHP based tumblelog CMS
8 
-  development version
9 
-  http://www.gelatocms.com/
7 
+  Sorbet CMS - A PHP based tumblelog CMS forked from Gelato CMS
10 8
11 
-  gelato CMS is a free software licensed under the GPL 2.0
12 
-  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
9 
+  Sorbet CMS is a free software licensed under the GPL 3.0
13 10
14 11 
   =========================== */
15 12 
 ?>
16 13 
 <?php
17 
-require_once('../entry.php');
14 
+require_once '../entry.php';
18 15 
 global $user, $conf, $tumble;
19 16
20 17 
 
@@ -28,11 +25,11 @@ if ($user->isAdmin()) {
28 25 
         }
29 26 
         closedir($handle);
30 27 
     }
31 
-
28 
+
32 29 
     $actives = json_decode($conf->active_plugins, 1);
33 
-
30 
+
34 31 
     $actives = $actives[1];
35 
-
32 
+
36 33 
     if (isset($_POST["btnsubmit"])) {
37 34 
         $actives = array();
38 35 
         foreach ($_POST['plugins'] as $plugin => $val) {
 
@@ -41,47 +38,47 @@ if ($user->isAdmin()) {
41 38 
                 $actives[$plugin] = $file;
42 39 
             }
43 40 
         }
44 
-
41 
+
45 42 
         if (!$tumble->saveOption(json_encode(array(array('total'=>count($actives)),$actives)), "active_plugins")) {
46 
-            header("Location: ".$conf->urlGelato."/admin/plugins.php?error=1&desc=".$conf->merror);
43 
+            header("Location: ".$conf->urlSorbet."/admin/plugins.php?error=1&desc=".$conf->merror);
47 44 
             die();
48 45 
         }
49 
-        header("Location: ".$conf->urlGelato."/admin/plugins.php?modified=true");
46 
+        header("Location: ".$conf->urlSorbet."/admin/plugins.php?modified=true");
50 47 
         die();
51 48 
     } else {
52 49 
         ?>
53 50 
 	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
54 51 
 	<html xmlns="http://www.w3.org/1999/xhtml">
55 52 
 	<head>
56 
-		<title>gelato :: <?php echo __("Plugins")?></title>
53 
+		<title>sorbet :: <?php echo __("Plugins")?></title>
57 54 
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
58 
-		<meta name="generator" content="gelato cms <?php echo util::version(); ?>" />
59 
-		<link rel="shortcut icon" href="<?php echo $conf->urlGelato; ?>/images/favicon.ico" />
60 
-		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato; ?>/admin/scripts/jquery.js"></script>
61 
-		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato; ?>/admin/scripts/tools.js"></script>
55 
+		<meta name="generator" content="sorbet cms <?php echo util::version(); ?>" />
56 
+		<link rel="shortcut icon" href="<?php echo $conf->urlSorbet; ?>/images/favicon.ico" />
57 
+		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlSorbet; ?>/admin/scripts/jquery.js"></script>
58 
+		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlSorbet; ?>/admin/scripts/tools.js"></script>
62 59 
 		<script type="text/javascript">
63 60 
 		$(document).ready(function(){
64 61 
 			$("#divMessages").fadeOut(5000,function(){
65 62 
 				$("#divMessages").css({display:"none"});
66 63 
 			});
67 64 
 		});
68 
-		</script>
69 
-		<style type="text/css" media="screen">
70 
-			@import "<?php echo $conf->urlGelato; ?>/admin/css/style.css";
65 
+		</script>
66 
+		<style type="text/css" media="screen">
67 
+			@import "<?php echo $conf->urlSorbet; ?>/admin/css/style.css";
71 68 
 		</style>
72 69 
 	</head>
73 
-
70 
+
74 71 
 	<body>
75 72 
 		<div id="div-process" style="display:none;"><?php echo __("Processing request&hellip;")?></div>
76 73 
 		<div id="cont">
77 74 
 			<div id="head">
78 
-				<h1><a href="<?php echo $conf->urlGelato; ?>/admin/index.php" title="gelato :: <?php echo __("home")?>">gelato cms</a></h1>
75 
+				<h1><a href="<?php echo $conf->urlSorbet; ?>/admin/index.php" title="sorbet :: <?php echo __("home")?>">sorbet cms</a></h1>
79 76 
 				<ul id="nav">
80 
-					<li><a href="<?php echo $conf->urlGelato; ?>/" title="<?php echo __("Take me to the tumblelog")?>"><?php echo __("Back to the Tumblelog")?></a></li>
77 
+					<li><a href="<?php echo $conf->urlSorbet; ?>/" title="<?php echo __("Take me to the tumblelog")?>"><?php echo __("Back to the Tumblelog")?></a></li>
81 78 
 			  	</ul>
82 79 
 			</div>
83 
-			<div id="main">
84 
-
80 
+			<div id="main">
81 
+
85 82 
 				<div class="box">
86 83 
 					<ul class="menu manage">
87 84 
 					<h3><?php echo __("Tumblelog options")?></h3>

@@ -104,14 +101,14 @@ if ($user->isAdmin()) {
104 101 
         } ?>
105 102 
 					<div class="tabla">
106 103
107 
-						<form action="plugins.php" method="post" id="options_form" autocomplete="off" class="newpost">
104 
+						<form action="plugins.php" method="post" id="options_form" autocomplete="off" class="newpost">
108 105 
 							<fieldset>
109 106 
 								<?php
110 107 
                                     if (count($plugins) == 0) {
111 
-                                        echo __('You dont have any plugin installed, get some <a href="http://www.gelatocms.com/">here</a>');
108 
+                                        echo __('You dont have any plugin installed');
112 109 
                                     } else {
113 110 
                                         foreach ($plugins as $key => $plugin) {
114 
-
111 
+
115 112 
                                             //FIXME terminar esto asi se lee la info desde el archivo 'a la' WP
116 113 
                                             /*
117 114 
                                             $plugin_data = implode( '', file( Absolute_Path."plugins/".$plugin.'.php' ));
 
@@ -129,8 +126,8 @@ if ($user->isAdmin()) {
129 126 
                                             $plugin_data = array('Name' => trim($plugin_name[1]), 'URI' => trim($plugin_uri[1]), 'Description' => trim($description[1]), 'Author' => trim($author_name[1]), 'Author_uri' => trim($author_uri[1]), 'Version' => $version);
130 127 
 */
131 128 
                                             $desc = __("There is no info for this plugin jet");
132 
-                                            $activated = array_key_exists($plugin, $actives); ?>
133 
-								<ul>
129 
+                                            $activated = array_key_exists($plugin, $actives); ?>
130 
+								<ul>
134 131 
 									<li class="select">
135 132 
 										<label for="<?php echo $key; ?>" title="<?php echo $desc; ?>" class="help"><?php echo $plugin; ?></label>
136 133 
 										<select name="plugins[<?php echo $plugin; ?>]" id="<?php echo $key; ?>">

@@ -153,15 +150,15 @@ if ($user->isAdmin()) {
153 150 
 							<p>
154 151 
 								<input type="submit" name="btnsubmit" id="btnsubmit" value="<?php echo __("Modify")?>" class="submit"/>
155 152 
 							</p>
156 
-						</form>
157 
-
153 
+						</form>
154 
+
158 155 
 					</div>
159 156
160 157 
 					<div class="footer-box">&nbsp;</div>
161 158 
 				</div>
162 159 
 			</div>
163 160 
 			<div id="foot">
164 
-				<a href="http://www.gelatocms.com/" title="gelato CMS">gelato CMS</a> :: PHP/MySQL Tumblelog Content Management System.
161 
+				Sorbet CMS :: PHP Tumblelog Content Management System.
165 162 
 			</div>
166 163 
 		</div>
167 164 
 	</body>

@@ -170,6 +167,6 @@ if ($user->isAdmin()) {
170 167
171 168 
     }
172 169 
 } else {
173 
-    header("Location: ".$conf->urlGelato."/login.php");
170 
+    header("Location: ".$conf->urlSorbet."/login.php");
174 171 
 }
175 
-?>
172 
+?>

File diff suppressed because it is too large
+ 1 - 35
admin/scripts/markitup/sets/html/set.js


File diff suppressed because it is too large
+ 1 - 39
admin/scripts/markitup/sets/html/style.css


File diff suppressed because it is too large
+ 1 - 131
admin/scripts/markitup/skins/simple/style.css


+ 30 - 33
admin/settings.php View File 

@@ -4,16 +4,13 @@ if (!defined('entry')) {
4 4 
 }
5 5 
 /* ===========================
6 6
7 
-  gelato CMS - A PHP based tumblelog CMS
8 
-  development version
9 
-  http://www.gelatocms.com/
7 
+  Sorbet CMS - A PHP based tumblelog CMS forked from Gelato CMS
10 8
11 
-  gelato CMS is a free software licensed under the GPL 2.0
12 
-  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
9 
+  Sorbet CMS is a free software licensed under the GPL 3.0
13 10
14 11 
   =========================== */
15 12
16 
-require_once('../entry.php');
13 
+require_once '../entry.php';
17 14 
 global $user, $conf, $tumble;
18 15
19 16 
 if ($user->isAdmin()) {
 
@@ -26,41 +23,41 @@ if ($user->isAdmin()) {
26 23 
 	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
27 24 
 	<html xmlns="http://www.w3.org/1999/xhtml">
28 25 
 	<head>
29 
-		<title>gelato :: <?php echo __("settings")?></title>
26 
+		<title>sorbet :: <?php echo __("settings")?></title>
30 27 
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
31 
-		<meta name="generator" content="gelato cms <?php echo util::version(); ?>" />
32 
-		<link rel="shortcut icon" href="<?php echo $conf->urlGelato; ?>/images/favicon.ico" />
33 
-		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato; ?>/admin/scripts/jquery.js"></script>
28 
+		<meta name="generator" content="sorbet cms <?php echo util::version(); ?>" />
29 
+		<link rel="shortcut icon" href="<?php echo $conf->urlSorbet; ?>/images/favicon.ico" />
30 
+		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlSorbet; ?>/admin/scripts/jquery.js"></script>
34 31 
 		<script type="text/javascript">
35 32 
 		$(document).ready(function(){
36 33 
 			$("#divMessages").fadeOut(5000,function(){
37 34 
 				$("#divMessages").css({display:"none"});
38 35 
 			});
39 36 
 		});
40 
-		</script>
41 
-		<style type="text/css" media="screen">
42 
-			@import "<?php echo $conf->urlGelato; ?>/admin/css/style.css";
37 
+		</script>
38 
+		<style type="text/css" media="screen">
39 
+			@import "<?php echo $conf->urlSorbet; ?>/admin/css/style.css";
43 40 
 		</style>
44 41 
 	</head>
45 
-
42 
+
46 43 
 	<body>
47 44 
 		<div id="div-process" style="display:none;"><?php echo __("Processing request&hellip;")?></div>
48 45 
 		<div id="cont">
49 46 
 			<div id="head">
50 
-				<h1><a href="<?php echo $conf->urlGelato; ?>/admin/index.php" title="gelato :: <?php echo __("home")?>">gelato cms</a></h1>
47 
+				<h1><a href="<?php echo $conf->urlSorbet; ?>/admin/index.php" title="sorbet :: <?php echo __("home")?>">sorbet cms</a></h1>
51 48 
 				<ul id="nav">
52 
-					<li><a href="<?php echo $conf->urlGelato; ?>/" title="<?php echo __("Take me to the tumblelog")?>"><?php echo __("Back to the Tumblelog")?></a></li>
49 
+					<li><a href="<?php echo $conf->urlSorbet; ?>/" title="<?php echo __("Take me to the tumblelog")?>"><?php echo __("Back to the Tumblelog")?></a></li>
53 50 
 			  	</ul>
54 51 
 			</div>
55 
-			<div id="main">
56 
-
52 
+			<div id="main">
53 
+
57 54 
 				<div class="box">
58 55 
 					<ul class="menu manage">
59 56 
 					<h3><?php echo __("Tumblelog configuration")?></h3>
60 
-					<li><a href="<?php echo $conf->urlGelato; ?>/admin/index.php"><?php echo __("Post")?></a></li>
61 
-					<li><a href="<?php echo $conf->urlGelato; ?>/admin/admin.php"><?php echo __("Users")?></a></li>
62 
-					<li><a href="<?php echo $conf->urlGelato; ?>/admin/plugins.php"><?php echo __("Plugins")?></a></li>
63 
-					<li><a href="<?php echo $conf->urlGelato; ?>/admin/options.php"><?php echo __("Options")?></a></li>
57 
+					<li><a href="<?php echo $conf->urlSorbet; ?>/admin/index.php"><?php echo __("Post")?></a></li>
58 
+					<li><a href="<?php echo $conf->urlSorbet; ?>/admin/admin.php"><?php echo __("Users")?></a></li>
59 
+					<li><a href="<?php echo $conf->urlSorbet; ?>/admin/plugins.php"><?php echo __("Plugins")?></a></li>
60 
+					<li><a href="<?php echo $conf->urlSorbet; ?>/admin/options.php"><?php echo __("Options")?></a></li>
64 61 
 					<li class="selected"><a><?php echo __("Settings")?></a></li>
65 62 
 					</ul>
66 63 
 <?php
 
@@ -76,20 +73,20 @@ if ($user->isAdmin()) {
76 73 
         } ?>
77 74 
 					<div class="tabla">
78 75
79 
-						<form action="settings.php" method="post" id="settings_form" autocomplete="off" class="newpost">
80 
-							<fieldset>
81 
-								<ul>
76 
+						<form action="settings.php" method="post" id="settings_form" autocomplete="off" class="newpost">
77 
+							<fieldset>
78 
+								<ul>
82 79 
 									<li><label for="title"><?php echo __("Title:")?></label>
83 80 
 										<input type="text" name="title" id="title" value="<?php echo $conf->title; ?>" class="txt"/></li>
84 81 
 									<li><label for="description"><?php echo __("Description:")?></label>
85 82 
 										<input type="text" name="description" id="description" value="<?php echo $conf->description; ?>" class="txt"/></li>
86 83 
 									<li><label for="url_installation"><?php echo __("Installation URL")?></label>
87 
-										<input type="text" name="url_installation" id="url_installation" value="<?php echo $conf->urlGelato; ?>" class="txt"/></li>
84 
+										<input type="text" name="url_installation" id="url_installation" value="<?php echo $conf->urlSorbet; ?>" class="txt"/></li>
88 85 
 									<li><label for="posts_limit"><?php echo __("Post limit:")?></label>
89 86 
 										<input type="text" name="posts_limit" id="posts_limit" value="<?php echo $conf->postLimit; ?>" class="txt"/></li>
90 87 
 									<li><label for="lang"><?php echo __("Language:")?></label>
91 88 
 										<select id="lang" name="lang">
92 
-<?php
89 
+<?php
93 90 
                                         $langs = util::getLangs();
94 91 
         foreach ($langs as $key=>$lang) {
95 92 
             $active = ($conf->lang==$key) ? "selected" : "";
 
@@ -107,22 +104,22 @@ if ($user->isAdmin()) {
107 104 
         } ?>
108 105 
 										</select>
109 106 
 									</li>
110 
-<?php
107 
+<?php
111 108 
                                     $trigger->call('add_settings_panel'); ?>
112 109 
 								</ul>
113 110 
 							</fieldset>
114 111 
 							<p>
115 112 
 								<input type="submit" name="btnsubmit" id="btnsubmit" value="<?php echo __("Modify")?>" class="submit"/>
116 113 
 							</p>
117 
-						</form>
118 
-
114 
+						</form>
115 
+
119 116 
 					</div>
120 117
121 118 
 					<div class="footer-box">&nbsp;</div>
122 119 
 				</div>
123 120 
 			</div>
124 121 
 			<div id="foot">
125 
-				<a href="http://www.gelatocms.com/" title="gelato CMS">gelato CMS</a> :: PHP/MySQL Tumblelog Content Management System.
122 
+				Sorbet CMS :: PHP Tumblelog Content Management System.
126 123 
 			</div>
127 124 
 		</div>
128 125 
 	</body>

@@ -131,6 +128,6 @@ if ($user->isAdmin()) {
131 128
132 129 
     }
133 130 
 } else {
134 
-    header("Location: ".$conf->urlGelato."/login.php");
131 
+    header("Location: ".$conf->urlSorbet."/login.php");
135 132 
 }
136 
-?>
133 
+?>

+ 5 - 5
admin/themes/admin/api.xml View File 

@@ -1,6 +1,6 @@
1 1 
 {header Content-type: text/xml; charset=utf-8}
2 2 
 <?xml version="1.0" encoding="UTF-8"?>
3 
-	<gelato version="1.0">
3 
+	<sorbet version="1.0">
4 4 
 		<tumblelog name="{username}" timezone="{conf.offsetCity}" title="{conf.title}">
5 5 
 			{conf.description}
6 6 
 			<feeds>
 
@@ -8,7 +8,7 @@
8 8 
 				<feed id="{$feed.id_feed}" url="{$feed.url}" import-type="{$feed.type}" next-update-in-seconds="{$feed.getNextUpdate}" title="{$feed.title}" error-text="{$feed.error_text}" />
9 9 
 			{/block}
10 10 
 			</feeds>
11 
-		</tumblelog>
11 
+		</tumblelog>
12 12 
 		{if $totalRegistros}
13 13 
 		<posts start="{start}" total="{total}">
14 14 
 		{block $posts as $post}
 
@@ -42,15 +42,15 @@
42 42 
 			<post id="{$post.id_post}" url="{$post.url}" type="video" date="{$post.formatedDate}">
43 43 
 				<video-caption>{$post.tit}</video-caption>
44 44 
 				<video-source>{$post.url}</video-source>
45 
-				<video-player>{$post.desc}</video-player>
45 
+				<video-player>{$post.desc}</video-player>
46 46 
 			</post>
47 47 
 			{elseif $post.type=='mp3'}
48 48 
 			<post id="{$post.id_post}" url="{$post.url}" type="audio" date="{$post.formatedDate}">
49 49 
 				<audio-caption>{$post.tit}</audio-caption>
50 
-				<audio-player>{$post.desc}</audio-player>
50 
+				<audio-player>{$post.desc}</audio-player>
51 51 
 			</post>
52 52 
 			{/if}
53 53 
 		{/block}
54 54 
 		</posts>
55 55 
 		{/if}
56 
-	</gelato>
56 
+	</sorbet>

File diff suppressed because it is too large
+ 34 - 34
admin/themes/admin/index.htm


+ 5 - 5
admin/themes/admin/install.htm View File 

@@ -2,8 +2,8 @@
2 2 
 <html xmlns="http://www.w3.org/1999/xhtml">
3 3 
 <head>
4 4 
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
5 
-	<meta name="generator" content="gelato cms {version}" />
6 
-	<title>gelato :: installation</title>
5 
+	<meta name="generator" content="sorbet cms {version}" />
6 
+	<title>sorbet :: installation</title>
7 7 
 	<link rel="shortcut icon" href="images/favicon.ico" />
8 8 
 	<style type="text/css" media="screen">
9 9 
 		@import "admin/css/style.css";
 
@@ -12,14 +12,14 @@
12 12 
 <body>
13 13 
 <div id="cont">
14 14 
 	<div id="head">
15 
-		<h1><a href="index.php" title="gelato :: home">gelato cms</a></h1>
15 
+		<h1><a href="index.php" title="sorbet :: home">sorbet cms</a></h1>
16 16 
 	</div>
17 17
18 18 
 	<div id="main">
19 19 
 	{if $showForm}
20 20 
 		<div class="box">
21 21 
 			<ul class="menu manage">
22 
-			<h3>gelato :: installation</h3>
22 
+			<h3>sorbet :: installation</h3>
23 23
24 24 
 			<li class="selected"><a>Install</a></li>
25 25 
 			</ul>
 
@@ -162,7 +162,7 @@
162 162 
 	{/if}
163 163 
 	</div>
164 164 
 	<div id="foot">
165 
-		<a href="http://www.gelatocms.com/" title="gelato CMS">gelato CMS</a> :: PHP/MySQL Tumblelog Content Management System.
165 
+		Sorbet CMS :: PHP Tumblelog Content Management System.
166 166 
 	</div>
167 167 
 </div>
168 168 
 </body>

+ 19 - 19
admin/themes/admin/login.htm View File 

@@ -1,52 +1,52 @@
1 1 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
2 2 
 	<html xmlns="http://www.w3.org/1999/xhtml">
3 3 
 	<head>
4 
-		<title>gelato :: {__("login screen")}</title>
4 
+		<title>sorbet :: {__("login screen")}</title>
5 5 
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
6 
-		<meta name="generator" content="gelato cms {version}" />
7 
-		<link rel="shortcut icon" href="{conf.urlGelato}/images/favicon.ico" />
8 
-		<script language="javascript" type="text/javascript" src="{conf.urlGelato}/admin/scripts/jquery.js"></script>
9 
-		<script language="javascript" type="text/javascript" src="{conf.urlGelato}/admin/scripts/jquery.validate.min.js"></script>
6 
+		<meta name="generator" content="sorbet cms {version}" />
7 
+		<link rel="shortcut icon" href="{conf.urlSorbet}/images/favicon.ico" />
8 
+		<script language="javascript" type="text/javascript" src="{conf.urlSorbet}/admin/scripts/jquery.js"></script>
9 
+		<script language="javascript" type="text/javascript" src="{conf.urlSorbet}/admin/scripts/jquery.validate.min.js"></script>
10 10
11 11 
 		<script type="text/javascript">
12 12 
 		$(document).ready(function(){
13 
-
13 
+
14 14 
 			$("#valida").validate({
15 15 
 				rules: {
16 16 
 					login: "required",
17 17 
 					pass: "required"
18 18 
 				},
19 19 
 				errorElement: "span",
20 
-				errorClass: "validate_span",
21 
-				errorPlacement: function(label, element) {
20 
+				errorClass: "validate_span",
21 
+				errorPlacement: function(label, element) {
22 22 
 					label.prependTo(element.prev())
23 
-				}
23 
+				}
24 24 
 			});
25 25
26 26 
 		});
27 27 
 		</script>
28 
-		<style type="text/css" media="screen">
29 
-			@import "{conf.urlGelato}/admin/css/style.css";
28 
+		<style type="text/css" media="screen">
29 
+			@import "{conf.urlSorbet}/admin/css/style.css";
30 30 
 		</style>
31 31 
 	</head>
32 
-
32 
+
33 33 
 	<body>
34 34 
 		<div id="div-process" style="display:none;">{__("Processing request&hellip;")}</div>
35 35 
 		<div id="cont">
36 36 
 			<div id="head">
37 
-				<h1><a href="{conf.urlGelato}/" title="gelato :: {__("home")}">gelato cms</a></h1>
37 
+				<h1><a href="{conf.urlSorbet}/" title="sorbet :: {__("home")}">sorbet cms</a></h1>
38 38 
 				<ul id="nav">
39 
-					<li><a href="{conf.urlGelato}/" title="{__("Take me to the tumblelog")}">{__("Back to the Tumblelog")}</a></li>
39 
+					<li><a href="{conf.urlSorbet}/" title="{__("Take me to the tumblelog")}">{__("Back to the Tumblelog")}</a></li>
40 40 
 			  	</ul>
41 41 
 			</div>
42 
-			<div id="main">
43 
-
42 
+			<div id="main">
43 
+
44 44 
 				<div class="box">
45 45 
 					<ul class="menu manage">
46 46 
 					<h3>{__("Start session")}</h3>
47 47 
 					<li class="selected"><a>{__("Login")}</a></li>
48 48 
 					</ul>
49 
-
49 
+
50 50 
 					<div class="tabla">
51 51
52 52 
 								<form action="login.php" method="post" id="valida" autocomplete="off" class="newpost">
 
@@ -69,7 +69,7 @@
69 69
70 70 
 								{if $error==1}
71 71 
 								<div class="error">
72 
-									{__("&nbsp;You must be registered to use gelato.")}
72 
+									{__("&nbsp;You must be registered to use Sorbet CMS.")}
73 73 
 								</div>
74 74 
 								{elseif $error==2}
75 75 
 								<div class="error">

@@ -82,7 +82,7 @@
82 82 
 				</div>
83 83 
 			</div>
84 84 
 			<div id="foot">
85 
-				<a href="http://www.gelatocms.com/" title="gelato CMS">gelato CMS</a> :: PHP/MySQL Tumblelog Content Management System.
85 
+				Sorbet CMS :: PHP Tumblelog Content Management System.
86 86 
 			</div>
87 87 
 		</div>
88 88 
 	</body>

+ 7 - 7
admin/themes/admin/template_bm.htm View File 

@@ -3,7 +3,7 @@
3 3 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
4 4 
     <head>
5 5 
     	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
6 
-    	<title>gelato bookmarklet</title>
6 
+    	<title>sorbet bookmarklet</title>
7 7 
     	<style type="text/css">
8 8 
     	    body {
9 9 
     	        background-color: #e1e1e1;

@@ -11,7 +11,7 @@
11 11 
     	        font:             Normal 15px 'Trebuchet MS',Verdana,Helvetica,sans-serif;
12 12 
     	        text-align:       center;
13 13 
     	    }
14 
-
14 
+
15 15 
     	    div#content {
16 16 
     	        margin:           137px 30px 0px 30px;
17 17 
     	        padding:          15px;

@@ -23,17 +23,17 @@
23 23 
 			    countdown--;
24 24 
 			    el = document.getElementById('countdown');
25 25 
 			    if (countdown == 1) {
26 
-			        el.firstChild.nodeValue =
26 
+			        el.firstChild.nodeValue =
27 27 
 			            prefix + countdown + ' second.';
28 28 
 			    } else if (countdown > 0) {
29 
-			        el.firstChild.nodeValue =
29 
+			        el.firstChild.nodeValue =
30 30 
 			            prefix + countdown + ' seconds.';
31 31 
 			    } else {
32 32 
                     self.close();
33 33 
 			    }
34 34 
 			    if (countdown > 0) setTimeout('countdown_func()', 1000);
35 35 
 			}
36 
-
36 
+
37 37 
           	var countdown = 3;
38 38 
         </script>
39 39 
     </head>

@@ -44,7 +44,7 @@
44 44
45 45 
             <a href="#" onclick="javascript:self.close(); return false;"
46 46 
             style="color:#777;">Close this window</a>
47 
-
47 
+
48 48 
             <span id="countdown" style="color:#777;">
49 49 
                 or wait 3 seconds.
50 50 
             </span>

@@ -54,4 +54,4 @@
54 54 
             setTimeout('countdown_func()', 1000);
55 55 
         </script>
56 56 
     </body>
57 
-</html>
57 
+</html>

+ 26 - 29
admin/user.php View File 

@@ -2,19 +2,16 @@
2 2 
 if (!defined('entry')) {
3 3 
     define('entry', true);
4 4 
 }
5 
- /* ===========================
5 
+/* ===========================
6 6
7 
-  gelato CMS - A PHP based tumblelog CMS
8 
-  development version
9 
-  http://www.gelatocms.com/
7 
+  Sorbet CMS - A PHP based tumblelog CMS forked from Gelato CMS
10 8
11 
-  gelato CMS is a free software licensed under the GPL 2.0
12 
-  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
9 
+  Sorbet CMS is a free software licensed under the GPL 3.0
13 10
14 11 
   =========================== */
15 12 
 ?>
16 13 
 <?php
17 
-require('../entry.php');
14 
+require '../entry.php';
18 15 
 global $user, $conf, $tumble;
19 16
20 17 
 $isEdition = isset($_GET["edit"]);
 
@@ -25,7 +22,7 @@ if ($user->isAdmin()) {
25 22 
         header("Location: admin.php?delete=true");
26 23 
         die();
27 24 
     }
28 
-
25 
+
29 26 
     if (isset($_POST["btnAdd"])) {
30 27 
         unset($_POST["btnAdd"]);
31 28 
         if (isset($_POST["repass"])) {
 
@@ -46,28 +43,28 @@ if ($user->isAdmin()) {
46 43 
 	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
47 44 
 	<html xmlns="http://www.w3.org/1999/xhtml">
48 45 
 	<head>
49 
-		<title>gelato :: <?php echo __("add user")?></title>
46 
+		<title>sorbet :: <?php echo __("add user")?></title>
50 47 
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
51 
-		<meta name="generator" content="gelato cms <?php echo util::version(); ?>" />
52 
-		<link rel="shortcut icon" href="<?php echo $conf->urlGelato; ?>/images/favicon.ico" />
53 
-		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato; ?>/admin/scripts/jquery.js"></script>
54 
-		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato; ?>/admin/scripts/tools.js"></script>
55 
-		<style type="text/css" media="screen">
56 
-			@import "<?php echo $conf->urlGelato; ?>/admin/css/style.css";
48 
+		<meta name="generator" content="sorbet cms <?php echo util::version(); ?>" />
49 
+		<link rel="shortcut icon" href="<?php echo $conf->urlSorbet; ?>/images/favicon.ico" />
50 
+		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlSorbet; ?>/admin/scripts/jquery.js"></script>
51 
+		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlSorbet; ?>/admin/scripts/tools.js"></script>
52 
+		<style type="text/css" media="screen">
53 
+			@import "<?php echo $conf->urlSorbet; ?>/admin/css/style.css";
57 54 
 		</style>
58 55 
 	</head>
59 
-
56 
+
60 57 
 	<body>
61 58 
 		<div id="div-process" style="display:none;"><?php echo __("Processing request&hellip;"); ?></div>
62 59 
 		<div id="cont">
63 60 
 			<div id="head">
64 
-				<h1><a href="<?php echo $conf->urlGelato; ?>/admin/index.php" title="gelato :: <?php echo __("home")?>">gelato cms</a></h1>
61 
+				<h1><a href="<?php echo $conf->urlSorbet; ?>/admin/index.php" title="sorbet :: <?php echo __("home")?>">sorbet cms</a></h1>
65 62 
 				<ul id="nav">
66 
-					<li><a href="<?php echo $conf->urlGelato; ?>/" title="<?php echo __("Take me to the tumblelog")?>"><?php echo __("Back to the Tumblelog")?></a></li>
63 
+					<li><a href="<?php echo $conf->urlSorbet; ?>/" title="<?php echo __("Take me to the tumblelog")?>"><?php echo __("Back to the Tumblelog")?></a></li>
67 64 
 			  	</ul>
68 65 
 			</div>
69 
-			<div id="main">
70 
-
66 
+			<div id="main">
67 
+
71 68 
 				<div class="box">
72 69 
 					<ul class="menu manage">
73 70 
 					<h3><?php echo __("Start session")?></h3>

@@ -75,7 +72,7 @@ if ($user->isAdmin()) {
75 72 
 					<li><a href="admin.php"><?php echo __("Users")?></a></li>
76 73 
 					<li class="selected"><a><?php echo ($isEdition) ? __("Edit") : __("Add"); ?></a></li>
77 74 
 					</ul>
78 
-
75 
+
79 76 
 					<div class="tabla">
80 77
81 78 
 						<form action="user.php" method="post" onSubmit="return validateFrmAddUser();" name="frm_add" class="newpost">

@@ -95,7 +92,7 @@ if ($user->isAdmin()) {
95 92 
                             if (!$isEdition) {
96 93 
                                 ?>
97 94 
 								<br /><input class='submit_normal_azul' name='btnVerifyUser' id='btnVerifyUser' type='button' value='Check availability' onclick='verifyExistingUser()' />
98 
-
95 
+
99 96 
 <?php
100 97
101 98 
                             } ?>

@@ -122,25 +119,25 @@ if ($user->isAdmin()) {
122 119 
 							<li>
123 120 
 								<label for="website"><?php echo __("website:")?></label>
124 121 
 									<input class="txt" name="website" id="website" type="text" value="<?php echo isset($register["website"])?$register["website"]:""; ?>" />
125 
-							</li>
122 
+							</li>
126 123 
 							<li>
127 124 
 								<label for="about"><?php echo __("about:")?></label><br />
128 
-									<textarea rows="5" cols="50" name="about" id="about" tabindex="7"><?php echo isset($register["about"])?$register["about"]:""; ?></textarea>
129 
-							</li>
125 
+									<textarea rows="5" cols="50" name="about" id="about" tabindex="7"><?php echo isset($register["about"])?$register["about"]:""; ?></textarea>
126 
+							</li>
130 127 
 							<li>
131 128 
 								<input name="btnAdd" type="submit" value="<?php echo ($isEdition) ? __("Modify") : __("Add"); ?> user" />
132 129 
 							</li>
133 130 
 						</ul>
134 131 
 						</fieldset>
135 132 
 						</form>
136 
-
133 
+
137 134 
 					</div>
138 135
139 136 
 					<div class="footer-box">&nbsp;</div>
140 137 
 				</div>
141 138 
 			</div>
142 139 
 			<div id="foot">
143 
-				<a href="http://www.gelatocms.com/" title="gelato CMS">gelato CMS</a> :: PHP/MySQL Tumblelog Content Management System.
140 
+				Sorbet CMS :: PHP Tumblelog Content Management System.
144 141 
 			</div>
145 142 
 		</div>
146 143 
 	</body>

@@ -149,6 +146,6 @@ if ($user->isAdmin()) {
149 146
150 147 
     }
151 148 
 } else {
152 
-    header("Location: ".$conf->urlGelato."/login.php");
149 
+    header("Location: ".$conf->urlSorbet."/login.php");
153 150 
 }
154 
-?>
151 
+?>

+ 5 - 8
api.php View File 

@@ -4,12 +4,9 @@ if (!defined('entry')) {
4 4 
 }
5 5 
 /* ===========================
6 6
7 
-  gelato CMS - A PHP based tumblelog CMS
8 
-  development version
9 
-  http://www.gelatocms.com/
7 
+  Sorbet CMS - A PHP based tumblelog CMS forked from Gelato CMS
10 8
11 
-  gelato CMS is a free software licensed under the GPL 2.0
12 
-  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
9 
+  Sorbet CMS is a free software licensed under the GPL 3.0
13 10
14 11 
   =========================== */
15 12 
 ?>

@@ -43,7 +40,7 @@ if (!defined('entry')) {
43 40 
         }
44 41 
         $user = new user();
45 42 
         $userData = $user->getUserByID(1);
46 
-        $username = ($userData["name"] == "") ? "gelato" : $userData["name"];
43 
+        $username = ($userData["name"] == "") ? "sorbet" : $userData["name"];
47 44
48 45 
         $theme->set("username", $username);
49 46 
         $theme->set("conf", array(
 
@@ -81,7 +78,7 @@ if (!defined('entry')) {
81 78 
             while ($post = $rs->fetch()) {
82 79 
                 $post['desc'] = util::trimString($post["description"]);
83 80 
                 $strEnd = ($conf->urlFriendly) ? "/" : "";
84 
-                $post['url'] = $conf->urlGelato.($conf->urlFriendly ? "/post/" : "/index.php?post=").$post["id_post"].$strEnd;
81 
+                $post['url'] = $conf->urlSorbet.($conf->urlFriendly ? "/post/" : "/index.php?post=").$post["id_post"].$strEnd;
85 82 
                 $post['formatedDate'] = gmdate("D, d M Y H:i:s", strtotime($post["date"]) + util::transform_offset($conf->offsetTime));
86 83
87 84 
                 $post["type"] = util::type2Text($post["type"]);
 
@@ -91,7 +88,7 @@ if (!defined('entry')) {
91 88 
                         $post['tit'] = (empty($post["title"])) ? $post['desc'] : strip_tags($post["title"]);
92 89 
                         break;
93 90 
                     case "photo":
94 
-                        $post['photoPath'] = str_replace("../", $conf->urlGelato."/", $post["url"]);
91 
+                        $post['photoPath'] = str_replace("../", $conf->urlSorbet."/", $post["url"]);
95 92 
                         $post['tit'] = stripslashes(((empty($post["description"])) ? "Photo" : $post['desc']));
96 93 
                         break;
97 94 
                     case "quote":

+ 11 - 14
archive.php View File 

@@ -2,14 +2,11 @@
2 2 
 if (!defined('entry')) {
3 3 
     define('entry', true);
4 4 
 }
5 
- /* ===========================
5 
+/* ===========================
6 6
7 
-  gelato CMS - A PHP based tumblelog CMS
8 
-  development version
9 
-  http://www.gelatocms.com/
7 
+  Sorbet CMS - A PHP based tumblelog CMS forked from Gelato CMS
10 8
11 
-  gelato CMS is a free software licensed under the GPL 2.0
12 
-  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
9 
+  Sorbet CMS is a free software licensed under the GPL 3.0
13 10
14 11 
   =========================== */
15 12 
 ?>

@@ -98,9 +95,9 @@ function handleNode($node)
98 95 
                 $fileName = "uploads/".$util_class->getFileName($node["url"]);
99 96 
                 $x = @getimagesize($fileName);
100 97 
                 if ($x[0] > 500) {
101 
-                    $photoPath = $conf->urlGelato."/classes/imgsize.php?w=500&img=".$node["url"];
98 
+                    $photoPath = $conf->urlSorbet."/classes/imgsize.php?w=500&img=".$node["url"];
102 99 
                 } else {
103 
-                    $photoPath = str_replace("../", $conf->urlGelato."/", $node["url"]);
100 
+                    $photoPath = str_replace("../", $conf->urlSorbet."/", $node["url"]);
104 101 
                 }
105 102 
                 $output['caption'] = $node["description"];
106 103 
                 $output['photo'] = $photoPath;
 
@@ -129,13 +126,13 @@ function handleNode($node)
129 126
130 127 
 	<head>
131 128 
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
132 
-		<meta name="generator" content="gelato <?php echo $util_class->codeName()." (".$util_class->version().")"; ?>" />
133 
-		<link rel="shortcut icon" href="<?php echo $conf->urlGelato;?>/images/favicon.ico" />
134 
-		<link rel="alternate" type="application/rss+xml" title="RSS" href="<?php echo $conf->urlGelato.($conf->urlFriendly ? "/rss/" : "/rss.php"); ?>"/>
129 
+		<meta name="generator" content="sorbet <?php echo $util_class->codeName()." (".$util_class->version().")"; ?>" />
130 
+		<link rel="shortcut icon" href="<?php echo $conf->urlSorbet;?>/images/favicon.ico" />
131 
+		<link rel="alternate" type="application/rss+xml" title="RSS" href="<?php echo $conf->urlSorbet.($conf->urlFriendly ? "/rss/" : "/rss.php"); ?>"/>
135 132 
 		<title><?php echo $conf->title." &raquo; ".__(" archive"); ?></title>
136 
-		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/jquery.js"></script>
137 
-		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/jquery.scrollTo-min.js"></script>
138 
-		<link href="<?php echo $conf->urlGelato;?>/admin/css/archive.css" type="text/css" rel="stylesheet">
133 
+		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlSorbet;?>/admin/scripts/jquery.js"></script>
134 
+		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlSorbet;?>/admin/scripts/jquery.scrollTo-min.js"></script>
135 
+		<link href="<?php echo $conf->urlSorbet;?>/admin/css/archive.css" type="text/css" rel="stylesheet">
139 136 
 		<script type='text/javascript'>
140 137 
 			function select(object) {
141 138 
 				var sel_id = object.id;

+ 5 - 8
classes/comments.class.php View File 

@@ -4,12 +4,9 @@ if (!defined('entry') || !entry) {
4 4 
 }
5 5 
 /* ===========================
6 6
7 
-  gelato CMS - A PHP based tumblelog CMS
8 
-  development version
9 
-  http://www.gelatocms.com/
7 
+  Sorbet CMS - A PHP based tumblelog CMS forked from Gelato CMS
10 8
11 
-  gelato CMS is a free software licensed under the GPL 2.0
12 
-  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
9 
+  Sorbet CMS is a free software licensed under the GPL 3.0
13 10
14 11 
   =========================== */
15 12 
 
@@ -39,9 +36,9 @@ class comments
39 36 
     public function generateCookie($fieldsArray)
40 37 
     {
41 38 
         $path = dirname(dirname($_SERVER['SCRIPT_NAME']."../"));
42 
-        setcookie("cookie_gel_user", $fieldsArray["username"], time() + 30000000, $path);
43 
-        setcookie("cookie_gel_email", $fieldsArray["email"], time() + 30000000, $path);
44 
-        setcookie("cookie_gel_web", $fieldsArray["web"], time() + 30000000, $path);
39 
+        setcookie("cookie_sor_user", $fieldsArray["username"], time() + 30000000, $path);
40 
+        setcookie("cookie_sor_email", $fieldsArray["email"], time() + 30000000, $path);
41 
+        setcookie("cookie_sor_web", $fieldsArray["web"], time() + 30000000, $path);
45 42 
     }
46 43
47 44 
     public function isSpam($fieldsArray)

+ 4 - 7
classes/configuration.class.php View File 

@@ -4,19 +4,16 @@ if (!defined('entry') || !entry) {
4 4 
 }
5 5 
 /* ===========================
6 6
7 
-  gelato CMS - A PHP based tumblelog CMS
8 
-  development version
9 
-  http://www.gelatocms.com/
7 
+  Sorbet CMS - A PHP based tumblelog CMS forked from Gelato CMS
10 8
11 
-  gelato CMS is a free software licensed under the GPL 2.0
12 
-  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
9 
+  Sorbet CMS is a free software licensed under the GPL 3.0
13 10
14 11 
   =========================== */
15 12 
 ?>
16 13 
 <?php
17 14 
 class configuration
18 15 
 {
19 
-    public $urlGelato;
16 
+    public $urlSorbet;
20 17 
     public $tablePrefix;
21 18 
     public $idUser;
22 19 
     public $postLimit;
 
@@ -41,7 +38,7 @@ class configuration
41 38 
         if ($db->ejecutarConsulta("SELECT * FROM ".Table_prefix."config")) {
42 39 
             $row=$db->obtenerRegistro();
43 40 
             $this->tablePrefix = Table_prefix;
44 
-            $this->urlGelato = $row['url_installation'];
41 
+            $this->urlSorbet = $row['url_installation'];
45 42 
             $this->postLimit = $row['posts_limit'];
46 43 
             $this->title = $row['title'];
47 44 
             $this->description = $row['description'];

+ 2 - 5
classes/feeds.class.php View File 

@@ -4,12 +4,9 @@ if (!defined('entry') || !entry) {
4 4 
 }
5 5 
 /* ===========================
6 6
7 
-  gelato CMS - A PHP based tumblelog CMS
8 
-  development version
9 
-  http://www.gelatocms.com/
7 
+  Sorbet CMS - A PHP based tumblelog CMS forked from Gelato CMS
10 8
11 
-  gelato CMS is a free software licensed under the GPL 2.0
12 
-  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
9 
+  Sorbet CMS is a free software licensed under the GPL 3.0
13 10
14 11 
   =========================== */
15 12 
 ?>

+ 2 - 2
classes/install.class.php View File 

@@ -137,7 +137,7 @@ class Install
137 137 
         }
138 138 
     }
139 139
140 
-    public function is_gelato_installed()
140 
+    public function is_sorbet_installed()
141 141 
     {
142 142 
         if (file_exists(Absolute_Path.'config.php')) {
143 143 
             include_once(Absolute_Path."config.php");
 
@@ -190,7 +190,7 @@ class Install
190 190 
             $action=$this->data['action'];
191 191 
         }
192 192
193 
-        if (!$this->is_gelato_installed()) {
193 
+        if (!$this->is_sorbet_installed()) {
194 194 
             $this->showForm = true;
195 195
196 196 
             if ($action=="config") {

+ 2 - 5
classes/lang.functions.php View File 

@@ -4,12 +4,9 @@ if (!defined('entry') || !entry) {
4 4 
 }
5 5 
 /* ===========================
6 6
7 
-  gelato CMS - A PHP based tumblelog CMS
8 
-  development version
9 
-  http://www.gelatocms.com/
7 
+  Sorbet CMS - A PHP based tumblelog CMS forked from Gelato CMS
10 8
11 
-  gelato CMS is a free software licensed under the GPL 2.0
12 
-  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
9 
+  Sorbet CMS is a free software licensed under the GPL 3.0
13 10
14 11 
   =========================== */
15 12 
 ?>

+ 8 - 11
classes/plugin.class.php View File 

@@ -4,12 +4,9 @@ if (!defined('entry') || !entry) {
4 4 
 }
5 5 
 /* ===========================
6 6
7 
-  gelato CMS - A PHP based tumblelog CMS
8 
-  development version
9 
-  http://www.gelatocms.com/
7 
+  Sorbet CMS - A PHP based tumblelog CMS forked from Gelato CMS
10 8
11 
-  gelato CMS is a free software licensed under the GPL 2.0
12 
-  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
9 
+  Sorbet CMS is a free software licensed under the GPL 3.0
13 10
14 11 
   =========================== */
15 12 
 ?>

@@ -18,15 +15,15 @@ if (!defined('entry') || !entry) {
18 15 
     {
19 16 
         public $actions = array();
20 17 
         public $exists = array();
21 
-
18 
+
22 19 
         public function call($name)
23 20 
         {
24 21 
             if (!$this->exists($name)) {
25 22 
                 return false;
26 23 
             }
27 
-
24 
+
28 25 
             $index = 0;
29 
-
26 
+
30 27 
             foreach ($GLOBALS['plugins::$instances'] as $plugin) {
31 28 
                 if (array_key_exists($index, $this->actions[$name])) {
32 29 
                     $action = $this->actions[$name][$index][1];
 
@@ -37,13 +34,13 @@ if (!defined('entry') || !entry) {
37 34 
                 }
38 35 
             }
39 36 
         }
40 
-
37 
+
41 38 
         public function exists($name)
42 39 
         {
43 40 
             if (isset($this->exists[$name])) {
44 41 
                 return $this->exists[$name];
45 42 
             }
46 
-
43 
+
47 44 
             foreach ($GLOBALS['plugins::$instances'] as $plugin) {
48 45 
                 if (array_key_exists($name, $this->actions)) {
49 46 
                     if (is_callable(array($plugin, $this->actions[$name][0][1]))) {
 
@@ -54,7 +51,7 @@ if (!defined('entry') || !entry) {
54 51
55 52 
             return $this->exists[$name] = false;
56 53 
         }
57 
-
54 
+
58 55 
         //I really hate you PHP4's OOP implementation
59 56 
         public function &instance()
60 57 
         {

+ 3 - 6
classes/plugins.class.php View File 

@@ -4,19 +4,16 @@ if (!defined('entry') || !entry) {
4 4 
 }
5 5 
 /* ===========================
6 6
7 
-  gelato CMS - A PHP based tumblelog CMS
8 
-  development version
9 
-  http://www.gelatocms.com/
7 
+  Sorbet CMS - A PHP based tumblelog CMS forked from Gelato CMS
10 8
11 
-  gelato CMS is a free software licensed under the GPL 2.0
12 
-  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
9 
+  Sorbet CMS is a free software licensed under the GPL 3.0
13 10
14 11 
   =========================== */
15 12 
 ?>
16 13 
 <?php
17 14 
     /* Simulating a class static property */
18 15 
     $GLOBALS['plugins::$instances'] = array();
19 
-
16 
+
20 17 
     class plugins
21 18 
     {
22 19 
         public function addAction($name, $function)

classes/gelato.class.php → classes/sorbet.class.php View File 

@@ -4,16 +4,13 @@ if (!defined('entry') || !entry) {
4 4 
 }
5 5 
 /* ===========================
6 6
7 
-  gelato CMS - A PHP based tumblelog CMS
8 
-  development version
9 
-  http://www.gelatocms.com/
7 
+  Sorbet CMS - A PHP based tumblelog CMS forked from Gelato CMS
10 8
11 
-  gelato CMS is a free software licensed under the GPL 2.0
12 
-  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
9 
+  Sorbet CMS is a free software licensed under the GPL 3.0
13 10
14 11 
   =========================== */
15 12 
 $util_class = new util();
16 
-class gelato
13 
+class sorbet
17 14 
 {
18 15 
     public $db;
19 16 
     public $conf;
 
@@ -30,10 +27,10 @@ class gelato
30 27 
     public function saveSettings($fieldsArray)
31 28 
     {
32 29 
         if ($this->db->modificarDeFormulario($this->conf->tablePrefix."config", $fieldsArray)) {
33 
-            header("Location: ".$this->conf->urlGelato."/admin/settings.php?modified=true");
30 
+            header("Location: ".$this->conf->urlSorbet."/admin/settings.php?modified=true");
34 31 
             die();
35 32 
         } else {
36 
-            header("Location: ".$this->conf->urlGelato."/admin/settings.php?error=1&des=".$this->db->merror);
33 
+            header("Location: ".$this->conf->urlSorbet."/admin/settings.php?error=1&des=".$this->db->merror);
37 34 
             die();
38 35 
         }
39 36 
     }
 
@@ -60,10 +57,10 @@ class gelato
60 57 
     public function modifyPost($fieldsArray, $id_post)
61 58 
     {
62 59 
         if ($this->db->modificarDeFormulario($this->conf->tablePrefix."data", $fieldsArray, "id_post=$id_post")) {
63 
-            header("Location: ".$this->conf->urlGelato."/admin/index.php?modified=true");
60 
+            header("Location: ".$this->conf->urlSorbet."/admin/index.php?modified=true");
64 61 
             die();
65 62 
         } else {
66 
-            header("Location: ".$this->conf->urlGelato."/admin/index.php?error=2&des=".$this->db->merror);
63 
+            header("Location: ".$this->conf->urlSorbet."/admin/index.php?error=2&des=".$this->db->merror);
67 64 
             die();
68 65 
         }
69 66 
     }
 
@@ -205,7 +202,7 @@ class gelato
205 202 
     public function getMp3Player($url)
206 203 
     {
207 204 
         if ($util_class->isMP3($url)) {
208 
-            $playerUrl = $conf->urlGelato."/admin/scripts/player.swf?soundFile=".$url;
205 
+            $playerUrl = $conf->urlSorbet."/admin/scripts/player.swf?soundFile=".$url;
209 206 
             return "\t\t\t<object type=\"application/x-shockwave-flash\" data=\"" . $playerUrl . "\" width=\"290\" height=\"24\"><param name=\"movie\" value=\"" . $playerUrl . "\" /><param name=\"quality\" value=\"high\" /><param name=\"menu\" value=\"false\" /><param name=\"wmode\" value=\"transparent\" /></object>\n";
210 207 
         } elseif ($util_class->isGoEar($url)) {
211 208 
             return "\t\t\t<object type=\"application/x-shockwave-flash\" data=\"http://www.goear.com/files/external.swf\" width=\"366\" height=\"130\"><param name=\"movie\" value=\"http://www.goear.com/files/external.swf\" /><param name=\"quality\" value=\"high\" /><param name=\"FlashVars\" value=\"file=".$util_class->getGoEarCode($url)."\" /><param name=\"wmode\" value=\"transparent\" /></object>\n";
 
@@ -219,7 +216,7 @@ class gelato
219 216 
     public function getPermalink($post_id)
220 217 
     {
221 218 
         $strEnd = ($this->conf->urlFriendly) ? "/" : "";
222 
-        $out = $this->conf->urlGelato;
219 
+        $out = $this->conf->urlSorbet;
223 220 
         $out .= ($this->conf->urlFriendly) ? "/post/" : "/index.php?post=";
224 221 
         $out .= $post_id.$strEnd;
225 222 
         return $out;

+ 2 - 5
classes/templates.class.php View File 

@@ -4,12 +4,9 @@ if (!defined('entry') || !entry) {
4 4 
 }
5 5 
 /* ===========================
6 6
7 
-  gelato CMS - A PHP based tumblelog CMS
8 
-  development version
9 
-  http://www.gelatocms.com/
7 
+  Sorbet CMS - A PHP based tumblelog CMS forked from Gelato CMS
10 8
11 
-  gelato CMS is a free software licensed under the GPL 2.0
12 
-  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
9 
+  Sorbet CMS is a free software licensed under the GPL 3.0
13 10
14 11 
   =========================== */
15 12

+ 10 - 13
classes/user.class.php View File 

@@ -4,12 +4,9 @@ if (!defined('entry') || !entry) {
4 4 
 }
5 5 
 /* ===========================
6 6
7 
-  gelato CMS - A PHP based tumblelog CMS
8 
-  development version
9 
-  http://www.gelatocms.com/
7 
+  Sorbet CMS - A PHP based tumblelog CMS forked from Gelato CMS
10 8
11 
-  gelato CMS is a free software licensed under the GPL 2.0
12 
-  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
9 
+  Sorbet CMS is a free software licensed under the GPL 3.0
13 10
14 11 
   =========================== */
15 12 
 ?>

@@ -101,14 +98,14 @@ class user
101 98 
                 $fieldsArray["password"] = md5($fieldsArray["password"]);
102 99 
                 if ($this->db->insertarDeFormulario($this->conf->tablePrefix."users", $fieldsArray)) {
103 100 
                     $this->confirmationEmail($fieldsArray['email'], $fieldsArray['login'], $realPassword);
104 
-                    header("Location: ".$this->conf->urlGelato."/admin/admin.php?added=true");
101 
+                    header("Location: ".$this->conf->urlSorbet."/admin/admin.php?added=true");
105 102 
                     die();
106 103 
                 } else {
107 
-                    header("Location: ".$this->conf->urlGelato."/admin/admin.php?error=2&des=".$this->merror);
104 
+                    header("Location: ".$this->conf->urlSorbet."/admin/admin.php?error=2&des=".$this->merror);
108 105 
                     die();
109 106 
                 }
110 107 
             } else {
111 
-                header("Location: ".$this->conf->urlGelato."/admin/admin.php?error=1");
108 
+                header("Location: ".$this->conf->urlSorbet."/admin/admin.php?error=1");
112 109 
                 die();
113 110 
             }
114 111 
         }
 
@@ -118,10 +115,10 @@ class user
118 115 
     {
119 116 
         $fieldsArray["password"] = md5($fieldsArray["password"]);
120 117 
         if ($this->db->modificarDeFormulario($this->conf->tablePrefix."users", $fieldsArray, "id_user=$id_user")) {
121 
-            header("Location: ".$this->conf->urlGelato."/admin/admin.php?modified=true");
118 
+            header("Location: ".$this->conf->urlSorbet."/admin/admin.php?modified=true");
122 119 
             die();
123 120 
         } else {
124 
-            header("Location: ".$this->conf->urlGelato."/admin/admin.php?error=2&des=".$this->merror);
121 
+            header("Location: ".$this->conf->urlSorbet."/admin/admin.php?error=2&des=".$this->merror);
125 122 
             die();
126 123 
         }
127 124 
     }
 
@@ -151,13 +148,13 @@ class user
151 148
152 149 
     public function confirmationEmail($email="", $user="", $password="")
153 150 
     {
154 
-        $msg =  "<font face=verdana><em><font size=2>Account information on <strong>gelato CMS</strong></font></em><br/><br/>";
155 
-        $msg .=    "Visit the <a href=\"".$this->conf->urlGelato."/admin/\">tumblelog panel</a> <br/><br/>";
151 
+        $msg =  "<font face=verdana><em><font size=2>Account information on <strong>Sorbet CMS</strong></font></em><br/><br/>";
152 
+        $msg .=    "Visit the <a href=\"".$this->conf->urlSorbet."/admin/\">tumblelog panel</a> <br/><br/>";
156 153 
         $msg .=    "<font size=1>Username: <strong>".$user."</strong><br/><br/>";
157 154 
         $msg .=    "Password: <strong>".$password."</strong><br/><br/>";
158 155 
         $msg .=    "<em>Don't tell your password to anybody!!</em><br/><br/></font>";
159 156
160 
-        sendMail($email, "Register confirmation on gelato CMS", $msg, "no-reply@gelatocms.com");
157 
+        sendMail($email, "Register confirmation on Sorbet CMS", $msg, "no-reply@sorbetcms.net");
161 158 
     }
162 159 
 }
163 160 
 ?>

+ 5 - 8
classes/util.class.php View File 

@@ -4,12 +4,9 @@ if (!defined('entry') || !entry) {
4 4 
 }
5 5 
 /* ===========================
6 6
7 
-  gelato CMS - A PHP based tumblelog CMS
8 
-  development version
9 
-  http://www.gelatocms.com/
7 
+  Sorbet CMS - A PHP based tumblelog CMS forked from Gelato CMS
10 8
11 
-  gelato CMS is a free software licensed under the GPL 2.0
12 
-  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
9 
+  Sorbet CMS is a free software licensed under the GPL 3.0
13 10
14 11 
   =========================== */
15 12 
 ?>

@@ -301,8 +298,8 @@ class util
301 298 
     public function sendMail($to, $title, $body, $from)
302 299 
     {
303 300 
         $rp     = trim($from);
304 
-        $org    = "gelato CMS";
305 
-        $mailer = "gelato CMS Mailer";
301 
+        $org    = "Sorbet CMS";
302 
+        $mailer = "Sorbet CMS Mailer";
306 303
307 304 
         $head  = '';
308 305 
         $head  .= "Content-Type: text/html \r\n";
 
@@ -397,7 +394,7 @@ class util
397 394 
                 $q = "GET " . $data['path'] . (isset($data['query'])?'?'.$data['query']:'') . " HTTP/1.1\r\n";
398 395 
                 $q .= "Host: " . $data['host'] . "\r\n";
399 396 
                 $q .= "Connection: close\r\n";
400 
-                $q .= "Referer: http://www.gelatocms.com/\r\n\r\n";
397 
+                $q .= "Referer: //www.sorbetcms.net/\r\n\r\n";
401 398
402 399 
                 $recv = "";
403 400 
                 fwrite($f, $q);

+ 3 - 6
config.php View File 

@@ -4,13 +4,10 @@ if (!defined('entry') || !entry) {
4 4 
 }
5 5 
 /* ===========================
6 6
7 
-  gelato CMS - A PHP based tumblelog CMS
8 
-  development version
9 
-  http://www.gelatocms.com/
7 
+  Sorbet CMS - A PHP based tumblelog CMS forked from Gelato CMS
10 8
11 
-  gelato CMS is a free software licensed under the GPL 2.0
12 
-  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
9 
+  Sorbet CMS is a free software licensed under the GPL 3.0
13 10
14 11 
   =========================== */
15 12
16 
-define('Table_prefix', 'gel_');
13 
+define('Table_prefix', 'sor_');

BIN
db/gelato_db.erwin View File


BIN
db/sorbet_db.erwin View File


db/gelato_db.sql → db/sorbet_db.sql View File 

@@ -1,6 +1,6 @@
1 
+-- DB Sorbet CMS v0.95
1 2
2 
-CREATE TABLE `gel_data` (
3 
+CREATE TABLE `sor_data` (
3 4 
   `id_post` int(11) NOT NULL auto_increment,
4 5 
   `title` text NULL,
5 6 
   `url` varchar(250)  default NULL,

@@ -11,7 +11,7 @@ CREATE TABLE `gel_data` (
11 11 
   PRIMARY KEY  (`id_post`)
12 12 
 ) ENGINE = MYISAM ;
13 13
14 
-CREATE TABLE `gel_users` (
14 
+CREATE TABLE `sor_users` (
15 15 
   `id_user` int(10) unsigned NOT NULL auto_increment,
16 16 
   `name` varchar(100) default NULL,
17 17 
   `login` varchar(100) NOT NULL default '',

@@ -22,7 +22,7 @@ CREATE TABLE `gel_users` (
22 22 
   PRIMARY KEY  (`id_user`)
23 23 
 ) ENGINE = MYISAM ;
24 24
25 
-CREATE TABLE `gel_config` (
25 
+CREATE TABLE `sor_config` (
26 26 
   `posts_limit` int(3) NOT NULL,
27 27 
   `title` varchar(250) NOT NULL,
28 28 
   `description` text NOT NULL,

@@ -32,13 +32,13 @@ CREATE TABLE `gel_config` (
32 32 
   PRIMARY KEY  (`title`)
33 33 
 ) ENGINE = MYISAM ;
34 34
35 
-CREATE TABLE `gel_options` (
35 
+CREATE TABLE `sor_options` (
36 36 
   `name` varchar(100) NOT NULL,
37 37 
   `val` varchar(255) NOT NULL,
38 38 
   PRIMARY KEY  (`name`)
39 39 
 ) ENGINE = MYISAM ;
40 40
41 
-CREATE TABLE `gel_comments` (
41 
+CREATE TABLE `sor_comments` (
42 42 
   `id_comment` int(11) NOT NULL auto_increment,
43 43 
   `id_post` int(11) NOT NULL,
44 44 
   `username` varchar(50) NOT NULL,

@@ -51,7 +51,7 @@ CREATE TABLE `gel_comments` (
51 51 
   PRIMARY KEY  (`id_comment`)
52 52 
 ) ENGINE = MYISAM ;
53 53
54 
-CREATE TABLE `gel_feeds` (
54 
+CREATE TABLE `sor_feeds` (
55 55 
 	`id_feed` int(11) NOT NULL auto_increment,
56 56 
 	`url` varchar(255) NOT NULL,
57 57 
 	`title` varchar(255) NOT NULL,

@@ -65,22 +65,22 @@ CREATE TABLE `gel_feeds` (
65 65 
 ) ENGINE=MyISAM ;
66 66
67 67
68 
+-- Example data for table `sor_config`
68 69
69 
-INSERT INTO `gel_config` VALUES (10, 'Tumble title', 'tumble description', 'en', 'tumblr', 'http://localhost/gelato');
70 
+INSERT INTO `sor_config` VALUES (10, 'Tumble title', 'tumble description', 'en', 'tumblr', 'http://localhost/sorbet');
70 71
72 
+-- Example data for table `sor_users`
71 73 
 --  The password is "demo" without the "
72 74
73 
-INSERT INTO `gel_users` VALUES (1, 'System administrator', 'admin', 'fe01ce2a7fbac8fafaed7c982a04e229', 'correo@correo.com', 'page', 'about');
75 
+INSERT INTO `sor_users` VALUES (1, 'System administrator', 'admin', 'fe01ce2a7fbac8fafaed7c982a04e229', 'correo@correo.com', 'page', 'about');
74 76
77 
+-- Example data for table `sor_options`
75 78
76 
-INSERT INTO `gel_options` VALUES ('url_friendly', '1');
77 
-INSERT INTO `gel_options` VALUES ('rich_text', '0');
78 
-INSERT INTO `gel_options` VALUES ('allow_comments', '0');
79 
-INSERT INTO `gel_options` VALUES ('offset_city', 'Mexico/General');
80 
-INSERT INTO `gel_options` VALUES ('offset_time', '-6');
81 
-INSERT INTO `gel_options` VALUES ('shorten_links', '0');
82 
-INSERT INTO `gel_options` VALUES ('rss_import_frec', '5 minutes');
83 
-INSERT INTO `gel_options` VALUES ('active_plugins', '[{"total":0},[]]');
79 
+INSERT INTO `sor_options` VALUES ('url_friendly', '1');
80 
+INSERT INTO `sor_options` VALUES ('rich_text', '0');
81 
+INSERT INTO `sor_options` VALUES ('allow_comments', '0');
82 
+INSERT INTO `sor_options` VALUES ('offset_city', 'Mexico/General');
83 
+INSERT INTO `sor_options` VALUES ('offset_time', '-6');
84 
+INSERT INTO `sor_options` VALUES ('shorten_links', '0');
85 
+INSERT INTO `sor_options` VALUES ('rss_import_frec', '5 minutes');
86 
+INSERT INTO `sor_options` VALUES ('active_plugins', '[{"total":0},[]]');

+ 11 - 11
entry.php View File 

@@ -7,7 +7,7 @@ if (!defined('entry') || !entry) {
7 7 
 error_reporting(E_ALL);
8 8 
 ini_set('display_errors', '1');
9 9
10 
-// PHP settings specific to Gelato
10 
+// PHP settings specific to Sorbet
11 11 
 ini_set('pcre.backtrack_limit', '10000');
12 12
13 13 
 define('Absolute_Path', dirname(__FILE__).DIRECTORY_SEPARATOR);
 
@@ -22,7 +22,7 @@ if (!file_exists($configFile) and basename($_SERVER['PHP_SELF'])!='install.php')
22 22 
 } else {
23 23 
     include_once(Absolute_Path.'classes/install.class.php');
24 24 
     $install = new Install();
25 
-    if (!$install->is_gelato_installed()) {
25 
+    if (!$install->is_sorbet_installed()) {
26 26 
         if (basename($_SERVER['PHP_SELF'])!='install.php') {
27 27 
             header("Location: {$dir}install.php");
28 28 
             exit;
 
@@ -38,12 +38,12 @@ if ($installed) {
38 38 
 if (!extension_loaded('json')) {
39 39 
     require_once(Absolute_Path.'classes'.DIRECTORY_SEPARATOR.'JSON.php');
40 40 
     $GLOBALS['JSON_OBJECT'] = new Services_JSON();
41 
-
41 
+
42 42 
     function json_encode($value)
43 43 
     {
44 44 
         return $GLOBALS['JSON_OBJECT']->encode($value);
45 45 
     }
46 
-
46 
+
47 47 
     function json_decode($value, $none)
48 48 
     {
49 49 
         return $GLOBALS['JSON_OBJECT']->decode($value);
 
@@ -52,7 +52,7 @@ if (!extension_loaded('json')) {
52 52
53 53 
 require_once(Absolute_Path.'classes'.DIRECTORY_SEPARATOR.'configuration.class.php');
54 54 
 require_once(Absolute_Path.'classes'.DIRECTORY_SEPARATOR.'util.class.php');
55 
-require_once(Absolute_Path.'classes'.DIRECTORY_SEPARATOR.'gelato.class.php');
55 
+require_once(Absolute_Path.'classes'.DIRECTORY_SEPARATOR.'sorbet.class.php');
56 56 
 require_once(Absolute_Path.'classes'.DIRECTORY_SEPARATOR.'templates.class.php');
57 57 
 require_once(Absolute_Path.'classes'.DIRECTORY_SEPARATOR.'themes.class.php');
58 58 
 require_once(Absolute_Path.'classes'.DIRECTORY_SEPARATOR.'pagination.class.php');
 
@@ -71,19 +71,19 @@ if ($installed) {
71 71 
     // Globals to be used throughout the application
72 72 
     $db = new Conexion_Mysql(DB_name, DB_Server, DB_User, DB_Password);
73 73 
     $conf = new configuration();
74 
-    $tumble = new gelato();
74 
+    $tumble = new sorbet();
75 75 
     $user = new user();
76 
-
76 
+
77 77 
     session_start();
78 
-
78 
+
79 79 
     $util_init_plugins = new util();
80 80 
     $util_init_plugins -> init_plugins();
81 81
82 82 
     $plugin_instance = new plugin();
83 
-
83 
+
84 84 
     $trigger =& $plugin_instance -> instance(); //DO NOT remove the & after the =
85 
-
86 
-    $trigger->call('gelato_init');
85 
+
86 
+    $trigger->call('sorbet_init');
87 87
88 88 
     $feeds = new feeds();
89 89 
     $feeds->updateFeeds();

+ 6 - 6
gettext.bat View File 

@@ -1,17 +1,17 @@
1 1 
 dir /a /b /-p /s /o:gen *.php > sources_php.txt
2 
-
2 
+
3 3 
 PATH C:\Program Files\poEdit\bin
4 4 
 PATH C:\Archivos de programa\poEdit\bin
5 5
6 6 
 for /f %%a in ('dir /b languages') do call :add_strings "%%a"
7 
-
7 
+
8 8 
 del sources_php.txt
9 
-
9 
+
10 10 
 goto :eof
11 
-
11 
+
12 12 
 :add_strings
13 
-xgettext --keyword=__ --language=PHP --package-name=gelatocms --package-version=1.0 --no-location --no-wrap --files-from=sources_php.txt -j --from-code=UTF-8 -d languages/%1/messages
13 
+xgettext --keyword=__ --language=PHP --package-name=sorbetcms --package-version=1.0 --no-location --no-wrap --files-from=sources_php.txt -j --from-code=UTF-8 -d languages/%1/messages
14 14
15 15 
 cd languages/%1
16 16 
 msgfmt messages.po
17 
-cd ../..
17 
+cd ../..

BIN
images/favicon.ico View File


+ 23 - 26
index.php View File 

@@ -2,14 +2,11 @@
2 2 
 if (!defined('entry')) {
3 3 
     define('entry', true);
4 4 
 }
5 
- /* ===========================
5 
+/* ===========================
6 6
7 
-  gelato CMS - A PHP based tumblelog CMS
8 
-  development version
9 
-  http://www.gelatocms.com/
7 
+  Sorbet CMS - A PHP based tumblelog CMS forked from Gelato CMS
10 8
11 
-  gelato CMS is a free software licensed under the GPL 2.0
12 
-  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
9 
+  Sorbet CMS is a free software licensed under the GPL 3.0
13 10
14 11 
   =========================== */
15 12 
 ?>

@@ -54,12 +51,12 @@ $util_class = new util();
54 51 
             }
55 52 
         }
56 53
57 
-        $feed_url = $conf->urlGelato.($conf->urlFriendly?"/rss/":"/rss.php");
54 
+        $feed_url = $conf->urlSorbet.($conf->urlFriendly?"/rss/":"/rss.php");
58 55
59 56
60 57
61 
-        $gelato_includes = "<meta name=\"generator\" content=\"gelato ".$util_class -> codeName()." (".$util_class -> version().")\" />\n";
62 
-        $gelato_includes .= "\t<link rel=\"shortcut icon\" href=\"".$conf->urlGelato."/images/favicon.ico\" />";
58 
+        $sorbet_includes = "<meta name=\"generator\" content=\"sorbet ".$util_class -> codeName()." (".$util_class -> version().")\" />\n";
59 
+        $sorbet_includes .= "\t<link rel=\"shortcut icon\" href=\"".$conf->urlSorbet."/images/favicon.ico\" />";
63 60
64 61 
         $page_title = $conf->title;
65 62 
         $page_title_divisor = " &raquo; "; // it should be set in configuration
 
@@ -80,20 +77,20 @@ $util_class = new util();
80 77 
             }
81 78 
         }
82 79
83 
-        $trigger->call('gelato_includes');
80 
+        $trigger->call('sorbet_includes');
84 81 
         $theme->set('rssFeed', $feed_url);
85 
-        $theme->set('Gelato_includes', $gelato_includes);
82 
+        $theme->set('Sorbet_includes', $sorbet_includes);
86 83 
         $theme->set('Title', $conf->title);
87 84 
         $theme->set('Page_Title', $page_title);
88 85 
         $theme->set('Description', $conf->description);
89 
-        $theme->set('URL_Tumble', $conf->urlGelato);
86 
+        $theme->set('URL_Tumble', $conf->urlSorbet);
90 87 
         $theme->set('Template_name', $conf->template);
91 88 
         $theme->set('allowComments', $conf->allowComments);
92 89
93 90 
         $theme->set('isAuthenticated', $user->isAuthenticated());
94 91 
         if ($user->isAuthenticated()) {
95 92 
             $theme->set('User', $_SESSION["user_login"]);
96 
-            $theme->set('URL_Tumble', $conf->urlGelato);
93 
+            $theme->set('URL_Tumble', $conf->urlSorbet);
97 94 
         }
98 95
99 96 
         $rows = array();
 
@@ -138,12 +135,12 @@ $util_class = new util();
138 135 
                                             $fileName = "uploads/".$util_class->getFileName($register["url"]);
139 136 
                                             $x = @getimagesize($fileName);
140 137 
                                                 if ($x[0] > 500) {
141 
-                                                    $photoPath = $conf->urlGelato."/classes/imgsize.php?w=500&img=".$register["url"];
138 
+                                                    $photoPath = $conf->urlSorbet."/classes/imgsize.php?w=500&img=".$register["url"];
142 139 
                                                 } else {
143 
-                                                    $photoPath = str_replace("../", $conf->urlGelato."/", $register["url"]);
140 
+                                                    $photoPath = str_replace("../", $conf->urlSorbet."/", $register["url"]);
144 141 
                                                 }
145 142
146 
-                                                $effect = " href=\"".str_replace("../", $conf->urlGelato."/", $register["url"])."\" rel=\"lightbox\"";
143 
+                                                $effect = " href=\"".str_replace("../", $conf->urlSorbet."/", $register["url"])."\" rel=\"lightbox\"";
147 144
148 145 
                                                 $row['PhotoURL'] = $photoPath;
149 146 
                                                 $row['PhotoAlt'] = strip_tags($register["description"]);
 
@@ -198,9 +195,9 @@ $util_class = new util();
198 195 
                 $p->limit($limit);
199 196 
                 if ($conf->urlFriendly) {
200 197 
                     $p->urlFriendly('[...]');
201 
-                    $p->target($conf->urlGelato."/page/[...]");
198 
+                    $p->target($conf->urlSorbet."/page/[...]");
202 199 
                 } else {
203 
-                    $p->target($conf->urlGelato);
200 
+                    $p->target($conf->urlSorbet);
204 201 
                 }
205 202
206 203 
                 $p->currentPage(isset($page_num) ? $page_num : 1);
 
@@ -235,12 +232,12 @@ $util_class = new util();
235 232
236 233 
                                 $x = @getimagesize($fileName);
237 234 
                                 if ($x[0] > 500) {
238 
-                                    $photoPath = $conf->urlGelato."/classes/imgsize.php?w=500&img=".$register["url"];
235 
+                                    $photoPath = $conf->urlSorbet."/classes/imgsize.php?w=500&img=".$register["url"];
239 236 
                                 } else {
240 
-                                    $photoPath = str_replace("../", $conf->urlGelato."/", $register["url"]);
237 
+                                    $photoPath = str_replace("../", $conf->urlSorbet."/", $register["url"]);
241 238 
                                 }
242 239
243 
-                                $effect = " href=\"".str_replace("../", $conf->urlGelato."/", $register["url"])."\" rel=\"lightbox\"";
240 
+                                $effect = " href=\"".str_replace("../", $conf->urlSorbet."/", $register["url"])."\" rel=\"lightbox\"";
244 241
245 242 
                                 $row['PhotoURL'] = $photoPath;
246 243 
                                 $row['PhotoAlt'] = strip_tags($register["description"]);
 
@@ -308,13 +305,13 @@ $util_class = new util();
308 305 
                 }
309 306 
                 $theme->set('comments', $comments);
310 307
311 
-                $whois['User_Cookie'] = isset($_COOKIE['cookie_gel_user'])?$_COOKIE['cookie_gel_user']:'';
312 
-                $whois['Email_Cookie'] = isset($_COOKIE['cookie_gel_email'])?$_COOKIE['cookie_gel_email']:'';
313 
-                $whois['Web_Cookie'] = isset($_COOKIE['cookie_gel_web'])?$_COOKIE['cookie_gel_web']:'';
308 
+                $whois['User_Cookie'] = isset($_COOKIE['cookie_sor_user'])?$_COOKIE['cookie_sor_user']:'';
309 
+                $whois['Email_Cookie'] = isset($_COOKIE['cookie_sor_email'])?$_COOKIE['cookie_sor_email']:'';
310 
+                $whois['Web_Cookie'] = isset($_COOKIE['cookie_sor_web'])?$_COOKIE['cookie_sor_web']:'';
314 311 
                 $whois['Id_Post'] = $register["id_post"];
315 312
316 313 
                 $theme->set('Date_Added', gmmktime());
317 
-                $theme->set('Form_Action', $conf->urlGelato."/admin/comments.php");
314 
+                $theme->set('Form_Action', $conf->urlSorbet."/admin/comments.php");
318 315 
                 $theme->set('whois', $whois);
319 316 
             }
320 317 
 
@@ -324,6 +321,6 @@ $util_class = new util();
324 321 
             $theme->set('rows', $rows);
325 322 
         }
326 323
327 
-        $theme->set('URL_Tumble', $conf->urlGelato);
324 
+        $theme->set('URL_Tumble', $conf->urlSorbet);
328 325 
         $theme->display(Absolute_Path.'themes/'.$conf->template.'/index.htm');
329 326 
 ?>

+ 3 - 6
install.php View File 

@@ -4,12 +4,9 @@ if (!defined('entry') || !entry) {
4 4 
 }
5 5 
 /* ===========================
6 6
7 
-  gelato CMS - A PHP based tumblelog CMS
8 
-  development version
9 
-  http://www.gelatocms.com/
7 
+  Sorbet CMS - A PHP based tumblelog CMS forked from Gelato CMS
10 8
11 
-  gelato CMS is a free software licensed under the GPL 2.0
12 
-  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
9 
+  Sorbet CMS is a free software licensed under the GPL 3.0
13 10
14 11 
   =========================== */
15 12 
 
@@ -25,7 +22,7 @@ if (file_exists($configFile)) {
25 22
26 23 
 global $user, $conf, $tumble;
27 24 
 $install = new Install();
28 
-if ($install->is_gelato_installed()) {
25 
+if ($install->is_sorbet_installed()) {
29 26 
     header("location: index.php");
30 27 
     exit;
31 28 
 }

BIN
languages/ca/messages.mo View File


+ 7 - 8
languages/ca/messages.po View File 

@@ -5,7 +5,7 @@
5 5 
 #
6 6 
 msgid ""
7 7 
 msgstr ""
8 
-"Project-Id-Version: gelato cms 0.95\n"
8 
+"Project-Id-Version: SorbetCMS 0.95\n"
9 9 
 "Report-Msgid-Bugs-To: \n"
10 10 
 "POT-Creation-Date: 2007-11-06 12:46-0600\n"
11 11 
 "PO-Revision-Date: 2007-11-25 13:29-0600\n"
 
@@ -329,8 +329,8 @@ msgstr "Text"
329 329
330 330 
 #: index.php:167
331 331 
 #: index.php:145
332 
-msgid "A new gelato version has been released and is ready <a href=\"http://www.gelatocms.com/\">for download</a>."
333 
-msgstr "Es troba disponible una versió més recent de Gelato i està llesta <a href=\"http://www.gelatocms.com/\">per a descarregar</a>."
332 
+msgid "A new version has been released and is ready for download."
333 
+msgstr "Es troba disponible una versió més recent de Sorbet CMS i està llesta per a descarregar."
334 334
335 335 
 #: index.php:172
336 336 
 #: index.php:150
 
@@ -592,8 +592,8 @@ msgid "Remember me:"
592 592 
 msgstr "recorda'm:"
593 593
594 594 
 #: login.php:101
595 
-msgid "&nbsp;You must be registered to use gelato."
596 
-msgstr "&nbsp;Per usar gelato has d'estar registrat com a usuari."
595 
+msgid "&nbsp;You must be registered to use Sorbet CMS."
596 
+msgstr "&nbsp;Per usar Sorbet CMS has d'estar registrat com a usuari."
597 597
598 598 
 #: login.php:108
599 599 
 msgid "&nbsp;You must be logged on the system."
 
@@ -686,8 +686,8 @@ msgid "Importing"
686 686 
 msgstr "Important"
687 687
688 688 
 #: index.php:287
689 
-msgid "add to gelato"
690 
-msgstr "afegir a gelato"
689 
+msgid "add to sorbet"
690 
+msgstr "afegir a sorbet"
691 691
692 692 
 #: options.php:204
693 693 
 msgid "Shorten long URLs:"
 
@@ -717,4 +717,3 @@ msgstr "hora"
717 717 
 #: options.php:224
718 718 
 msgid "hours"
719 719 
 msgstr "hores"
720 
-

BIN
languages/de/messages.mo View File


+ 7 - 8
languages/de/messages.po View File 

@@ -5,7 +5,7 @@
5 5 
 #
6 6 
 msgid ""
7 7 
 msgstr ""
8 
-"Project-Id-Version: gelato cms 0.95\n"
8 
+"Project-Id-Version: Sorbet cms 0.95\n"
9 9 
 "Report-Msgid-Bugs-To: \n"
10 10 
 "POT-Creation-Date: 2007-11-06 12:46-0600\n"
11 11 
 "PO-Revision-Date: 2007-11-25 13:29-0600\n"
 
@@ -329,8 +329,8 @@ msgstr "Regulär"
329 329
330 330 
 #: index.php:167
331 331 
 #: index.php:145
332 
-msgid "A new gelato version has been released and is ready <a href=\"http://www.gelatocms.com/\">for download</a>."
333 
-msgstr "Eine neue Gelato Version wurde veröffentlicht und steht <a href=\"http://www.gelatocms.com/\">zum Download</a> bereit."
332 
+msgid "A new version has been released and is ready for download."
333 
+msgstr "Eine neue Version wurde veröffentlicht und steht zum Download bereit."
334 334
335 335 
 #: index.php:172
336 336 
 #: index.php:150
 
@@ -592,8 +592,8 @@ msgid "Remember me:"
592 592 
 msgstr "Erinnere dich an mich:"
593 593
594 594 
 #: login.php:101
595 
-msgid "&nbsp;You must be registered to use gelato."
596 
-msgstr "&nbsp;Du musst registriert sein um Gelato zu verwenden."
595 
+msgid "&nbsp;You must be registered to use Sorbet CMS."
596 
+msgstr "&nbsp;Du musst registriert sein um Sorbet CMS zu verwenden."
597 597
598 598 
 #: login.php:108
599 599 
 msgid "&nbsp;You must be logged on the system."
 
@@ -686,8 +686,8 @@ msgid "Importing"
686 686 
 msgstr "Importiere"
687 687
688 688 
 #: index.php:287
689 
-msgid "add to gelato"
690 
-msgstr "Zu Gelato hinzufügen"
689 
+msgid "add to sorbet"
690 
+msgstr "Zu Sorbet hinzufügen"
691 691
692 692 
 #: options.php:204
693 693 
 msgid "Shorten long URLs:"
 
@@ -717,4 +717,3 @@ msgstr "Stunde"
717 717 
 #: options.php:224
718 718 
 msgid "hours"
719 719 
 msgstr "Stunden"
720 
-

BIN
languages/en/messages.mo View File


+ 7 - 8
languages/en/messages.po View File 

@@ -5,7 +5,7 @@
5 5 
 #
6 6 
 msgid ""
7 7 
 msgstr ""
8 
-"Project-Id-Version: gelato cms 0.95\n"
8 
+"Project-Id-Version: SorbetCMS 0.95\n"
9 9 
 "Report-Msgid-Bugs-To: \n"
10 10 
 "POT-Creation-Date: 2007-11-06 12:46-0600\n"
11 11 
 "PO-Revision-Date: 2007-11-25 13:29-0600\n"
 
@@ -329,8 +329,8 @@ msgstr "Regular"
329 329
330 330 
 #: index.php:167
331 331 
 #: index.php:145
332 
-msgid "A new gelato version has been released and is ready <a href=\"http://www.gelatocms.com/\">for download</a>."
333 
-msgstr "A new gelato version has been released and is ready <a href=\"http://www.gelatocms.com/\">for download</a>."
332 
+msgid "A new version has been released and is ready for download."
333 
+msgstr "A new version has been released and is ready for download."
334 334
335 335 
 #: index.php:172
336 336 
 #: index.php:150
 
@@ -592,8 +592,8 @@ msgid "Remember me:"
592 592 
 msgstr "Remember me:"
593 593
594 594 
 #: login.php:101
595 
-msgid "&nbsp;You must be registered to use gelato."
596 
-msgstr "&nbsp;You must be registered to use gelato."
595 
+msgid "&nbsp;You must be registered to use sorbet."
596 
+msgstr "&nbsp;You must be registered to use sorbet."
597 597
598 598 
 #: login.php:108
599 599 
 msgid "&nbsp;You must be logged on the system."
 
@@ -686,8 +686,8 @@ msgid "Importing"
686 686 
 msgstr "Importing"
687 687
688 688 
 #: index.php:287
689 
-msgid "add to gelato"
690 
-msgstr "add to gelato"
689 
+msgid "add to sorbet"
690 
+msgstr "add to sorbet"
691 691
692 692 
 #: options.php:204
693 693 
 msgid "Shorten long URLs:"
 
@@ -717,4 +717,3 @@ msgstr "hour"
717 717 
 #: options.php:224
718 718 
 msgid "hours"
719 719 
 msgstr "hours"
720 
-

BIN
languages/es-AR/messages.mo View File


+ 7 - 8
languages/es-AR/messages.po View File 

@@ -5,7 +5,7 @@
5 5 
 #
6 6 
 msgid ""
7 7 
 msgstr ""
8 
-"Project-Id-Version: gelato cms 0.95\n"
8 
+"Project-Id-Version: SorbetCMS 0.95\n"
9 9 
 "Report-Msgid-Bugs-To: \n"
10 10 
 "POT-Creation-Date: 2007-11-06 12:46-0600\n"
11 11 
 "PO-Revision-Date: 2007-11-25 13:30-0600\n"
 
@@ -329,8 +329,8 @@ msgstr "Texto"
329 329
330 330 
 #: index.php:167
331 331 
 #: index.php:145
332 
-msgid "A new gelato version has been released and is ready <a href=\"http://www.gelatocms.com/\">for download</a>."
333 
-msgstr "Se encuentra disponible una versión más reciente de Gelato y está lista <a href=\"http://www.gelatocms.com/\">para descargar</a>."
332 
+msgid "A new version has been released and is ready for download."
333 
+msgstr "Se encuentra disponible una versión más reciente y está lista para descargar."
334 334
335 335 
 #: index.php:172
336 336 
 #: index.php:150
 
@@ -592,8 +592,8 @@ msgid "Remember me:"
592 592 
 msgstr "Recordarme:"
593 593
594 594 
 #: login.php:101
595 
-msgid "&nbsp;You must be registered to use gelato."
596 
-msgstr "&nbsp;Debes estar registrado para usar gelato."
595 
+msgid "&nbsp;You must be registered to use sorbet."
596 
+msgstr "&nbsp;Debes estar registrado para usar sorbet."
597 597
598 598 
 #: login.php:108
599 599 
 msgid "&nbsp;You must be logged on the system."
 
@@ -686,8 +686,8 @@ msgid "Importing"
686 686 
 msgstr "Importando"
687 687
688 688 
 #: index.php:287
689 
-msgid "add to gelato"
690 
-msgstr "añadir a gelato"
689 
+msgid "add to sorbet"
690 
+msgstr "añadir a sorbet"
691 691
692 692 
 #: options.php:204
693 693 
 msgid "Shorten long URLs:"
 
@@ -717,4 +717,3 @@ msgstr "hora"
717 717 
 #: options.php:224
718 718 
 msgid "hours"
719 719 
 msgstr "horas"
720 
-

BIN
languages/es-ES/messages.mo View File


+ 7 - 8
languages/es-ES/messages.po View File 

@@ -5,7 +5,7 @@
5 5 
 #
6 6 
 msgid ""
7 7 
 msgstr ""
8 
-"Project-Id-Version: gelato cms 0.95\n"
8 
+"Project-Id-Version: Sorbet CMS 0.95\n"
9 9 
 "Report-Msgid-Bugs-To: \n"
10 10 
 "POT-Creation-Date: 2007-11-06 12:46-0600\n"
11 11 
 "PO-Revision-Date: 2007-11-25 13:30-0600\n"
 
@@ -329,8 +329,8 @@ msgstr "Texto"
329 329
330 330 
 #: index.php:167
331 331 
 #: index.php:145
332 
-msgid "A new gelato version has been released and is ready <a href=\"http://www.gelatocms.com/\">for download</a>."
333 
-msgstr "Se encuentra disponible una versión más reciente de Gelato y está lista <a href=\"http://www.gelatocms.com/\">para descargar</a>."
332 
+msgid "A new version has been released and is ready for download."
333 
+msgstr "Se encuentra disponible una versión más reciente y está lista para descargar."
334 334
335 335 
 #: index.php:172
336 336 
 #: index.php:150
 
@@ -592,8 +592,8 @@ msgid "Remember me:"
592 592 
 msgstr "Recuérdame:"
593 593
594 594 
 #: login.php:101
595 
-msgid "&nbsp;You must be registered to use gelato."
596 
-msgstr "&nbsp;Para usar gelato has de estar registrado como usuario."
595 
+msgid "&nbsp;You must be registered to use sorbet."
596 
+msgstr "&nbsp;Para usar sorbet has de estar registrado como usuario."
597 597
598 598 
 #: login.php:108
599 599 
 msgid "&nbsp;You must be logged on the system."
 
@@ -686,8 +686,8 @@ msgid "Importing"
686 686 
 msgstr "Importando"
687 687
688 688 
 #: index.php:287
689 
-msgid "add to gelato"
690 
-msgstr "añadir a gelato"
689 
+msgid "add to sorbet"
690 
+msgstr "añadir a sorbet"
691 691
692 692 
 #: options.php:204
693 693 
 msgid "Shorten long URLs:"
 
@@ -717,4 +717,3 @@ msgstr "hora"
717 717 
 #: options.php:224
718 718 
 msgid "hours"
719 719 
 msgstr "horas"
720 
-

BIN
languages/es-MX/messages.mo View File


+ 7 - 8
languages/es-MX/messages.po View File 

@@ -5,7 +5,7 @@
5 5 
 #
6 6 
 msgid ""
7 7 
 msgstr ""
8 
-"Project-Id-Version: gelato cms 0.95\n"
8 
+"Project-Id-Version: sorbet cms 0.95\n"
9 9 
 "Report-Msgid-Bugs-To: \n"
10 10 
 "POT-Creation-Date: 2007-11-06 12:46-0600\n"
11 11 
 "PO-Revision-Date: 2007-11-25 13:30-0600\n"
 
@@ -329,8 +329,8 @@ msgstr "Regular"
329 329
330 330 
 #: index.php:167
331 331 
 #: index.php:145
332 
-msgid "A new gelato version has been released and is ready <a href=\"http://www.gelatocms.com/\">for download</a>."
333 
-msgstr "Se ha liberado una nueva versión de gelato y esta lista para <a href=\"http://www.gelatocms.com/\">descargar</a>."
332 
+msgid "A new version has been released and is ready for download."
333 
+msgstr "Se ha liberado una nueva versión y esta lista para descargar."
334 334
335 335 
 #: index.php:172
336 336 
 #: index.php:150
 
@@ -592,8 +592,8 @@ msgid "Remember me:"
592 592 
 msgstr "Recordarme:"
593 593
594 594 
 #: login.php:101
595 
-msgid "&nbsp;You must be registered to use gelato."
596 
-msgstr "&nbsp;Debes estar registrado para usar gelato."
595 
+msgid "&nbsp;You must be registered to use Sorbet CMS."
596 
+msgstr "&nbsp;Debes estar registrado para usar Sorbet CMS."
597 597
598 598 
 #: login.php:108
599 599 
 msgid "&nbsp;You must be logged on the system."
 
@@ -686,8 +686,8 @@ msgid "Importing"
686 686 
 msgstr "Importando"
687 687
688 688 
 #: index.php:287
689 
-msgid "add to gelato"
690 
-msgstr "agregar a gelato"
689 
+msgid "add to sorbet"
690 
+msgstr "agregar a sorbet"
691 691
692 692 
 #: options.php:204
693 693 
 msgid "Shorten long URLs:"
 
@@ -717,4 +717,3 @@ msgstr "hora"
717 717 
 #: options.php:224
718 718 
 msgid "hours"
719 719 
 msgstr "horas"
720 
-

BIN
languages/fr/messages.mo View File


+ 5 - 6
languages/fr/messages.po View File 

@@ -5,7 +5,7 @@
5 5 
 #
6 6 
 msgid ""
7 7 
 msgstr ""
8 
-"Project-Id-Version: gelato cms 0.95\n"
8 
+"Project-Id-Version: SorbetCMS 0.95\n"
9 9 
 "Report-Msgid-Bugs-To: \n"
10 10 
 "POT-Creation-Date: 2007-11-06 12:46-0600\n"
11 11 
 "PO-Revision-Date: 2007-11-25 13:30-0600\n"
 
@@ -329,8 +329,8 @@ msgstr "Normal"
329 329
330 330 
 #: index.php:167
331 331 
 #: index.php:145
332 
-msgid "A new gelato version has been released and is ready <a href=\"http://www.gelatocms.com/\">for download</a>."
333 
-msgstr "Une nouvelle version de gelato est disponible au <a href=\"http://www.gelatocms.com/\">téléchargement</a>."
332 
+msgid "A new version has been released and is ready for download."
333 
+msgstr "Une nouvelle version est disponible au téléchargement."
334 334
335 335 
 #: index.php:172
336 336 
 #: index.php:150
 
@@ -592,7 +592,7 @@ msgid "Remember me:"
592 592 
 msgstr ""
593 593
594 594 
 #: login.php:101
595 
-msgid "&nbsp;You must be registered to use gelato."
595 
+msgid "&nbsp;You must be registered to use Sorbet CMS."
596 596 
 msgstr ""
597 597
598 598 
 #: login.php:108
 
@@ -686,7 +686,7 @@ msgid "Importing"
686 686 
 msgstr ""
687 687
688 688 
 #: index.php:287
689 
-msgid "add to gelato"
689 
+msgid "add to sorbet"
690 690 
 msgstr ""
691 691
692 692 
 #: options.php:204
 
@@ -717,4 +717,3 @@ msgstr ""
717 717 
 #: options.php:224
718 718 
 msgid "hours"
719 719 
 msgstr ""
720 
-

BIN
languages/it/messages.mo View File


+ 7 - 8
languages/it/messages.po View File 

@@ -5,7 +5,7 @@
5 5 
 #
6 6 
 msgid ""
7 7 
 msgstr ""
8 
-"Project-Id-Version: gelato cms 0.95\n"
8 
+"Project-Id-Version: sorbet cms 0.95\n"
9 9 
 "Report-Msgid-Bugs-To: \n"
10 10 
 "POT-Creation-Date: 2007-11-06 12:46-0600\n"
11 11 
 "PO-Revision-Date: 2007-11-25 13:31-0600\n"
 
@@ -330,8 +330,8 @@ msgstr "Testo"
330 330
331 331 
 #: index.php:167
332 332 
 #: index.php:145
333 
-msgid "A new gelato version has been released and is ready <a href=\"http://www.gelatocms.com/\">for download</a>."
334 
-msgstr "Una nuova versione di gelato &egrave; stata rilasciata ed &egrave; pronta <a href=\"http://www.gelatocms.com/\">per lo scaricamento</a>."
333 
+msgid "A new version has been released and is ready for download."
334 
+msgstr "Una nuova versione &egrave; stata rilasciata ed &egrave; pronta per lo scaricamento."
335 335
336 336 
 #: index.php:172
337 337 
 #: index.php:150
 
@@ -594,8 +594,8 @@ msgid "Remember me:"
594 594 
 msgstr "Ricordami:"
595 595
596 596 
 #: login.php:101
597 
-msgid "&nbsp;You must be registered to use gelato."
598 
-msgstr "&nbsp;Devi essere registrato per usare gelato."
597 
+msgid "&nbsp;You must be registered to use sorbet."
598 
+msgstr "&nbsp;Devi essere registrato per usare sorbet."
599 599
600 600 
 #: login.php:108
601 601 
 msgid "&nbsp;You must be logged on the system."
 
@@ -688,8 +688,8 @@ msgid "Importing"
688 688 
 msgstr "Importando"
689 689
690 690 
 #: index.php:287
691 
-msgid "add to gelato"
692 
-msgstr "aggiungi a gelato"
691 
+msgid "add to sorbet"
692 
+msgstr "aggiungi a sorbet"
693 693
694 694 
 #: options.php:204
695 695 
 msgid "Shorten long URLs:"
 
@@ -719,4 +719,3 @@ msgstr "ora"
719 719 
 #: options.php:224
720 720 
 msgid "hours"
721 721 
 msgstr "ore"
722 
-

BIN
languages/nl/messages.mo View File


+ 7 - 8
languages/nl/messages.po View File 

@@ -5,7 +5,7 @@
5 5 
 #
6 6 
 msgid ""
7 7 
 msgstr ""
8 
-"Project-Id-Version: gelato cms 0.95\n"
8 
+"Project-Id-Version: Sorbet CMS 0.95\n"
9 9 
 "Report-Msgid-Bugs-To: \n"
10 10 
 "POT-Creation-Date: 2007-11-06 12:46-0600\n"
11 11 
 "PO-Revision-Date: 2007-11-25 13:31-0600\n"
 
@@ -329,8 +329,8 @@ msgstr "Standaard tekst"
329 329
330 330 
 #: index.php:167
331 331 
 #: index.php:145
332 
-msgid "A new gelato version has been released and is ready <a href=\"http://www.gelatocms.com/\">for download</a>."
333 
-msgstr "Een nieuwe gelato versie is uigebracht en is <a href=\"http://www.gelatocms.com/\">hier</a> te downloaden."
332 
+msgid "A new version has been released and is ready for download."
333 
+msgstr "Een nieuwe versie is uigebracht en is hier te downloaden."
334 334
335 335 
 #: index.php:172
336 336 
 #: index.php:150
 
@@ -592,8 +592,8 @@ msgid "Remember me:"
592 592 
 msgstr "Onthoudt mij:"
593 593
594 594 
 #: login.php:101
595 
-msgid "&nbsp;You must be registered to use gelato."
596 
-msgstr "&nbsp;Je moet gerigistreerd zijn om gelato te gebruiken"
595 
+msgid "&nbsp;You must be registered to use sorbet."
596 
+msgstr "&nbsp;Je moet gerigistreerd zijn om sorbet te gebruiken"
597 597
598 598 
 #: login.php:108
599 599 
 msgid "&nbsp;You must be logged on the system."
 
@@ -686,8 +686,8 @@ msgid "Importing"
686 686 
 msgstr "Importeren"
687 687
688 688 
 #: index.php:287
689 
-msgid "add to gelato"
690 
-msgstr "voeg aan gelato toe"
689 
+msgid "add to sorbet"
690 
+msgstr "voeg aan sorbet toe"
691 691
692 692 
 #: options.php:204
693 693 
 msgid "Shorten long URLs:"
 
@@ -717,4 +717,3 @@ msgstr "uur"
717 717 
 #: options.php:224
718 718 
 msgid "hours"
719 719 
 msgstr "uren"
720 
-

BIN
languages/no/messages.mo View File


+ 7 - 8
languages/no/messages.po View File 

@@ -5,7 +5,7 @@
5 5 
 #
6 6 
 msgid ""
7 7 
 msgstr ""
8 
-"Project-Id-Version: gelato cms 0.95\n"
8 
+"Project-Id-Version: sorbet cms 0.95\n"
9 9 
 "Report-Msgid-Bugs-To: \n"
10 10 
 "POT-Creation-Date: 2007-11-06 12:46-0600\n"
11 11 
 "PO-Revision-Date: 2007-11-25 13:31-0600\n"
 
@@ -329,8 +329,8 @@ msgstr "Vanlig"
329 329
330 330 
 #: index.php:167
331 331 
 #: index.php:145
332 
-msgid "A new gelato version has been released and is ready <a href=\"http://www.gelatocms.com/\">for download</a>."
333 
-msgstr "En ny gelato versjon er klar og kan <a href=\"http://www.gelatocms.com/\">lastes ned</a>."
332 
+msgid "A new version has been released and is ready for download."
333 
+msgstr "En ny versjon er klar og kan lastes ned."
334 334
335 335 
 #: index.php:172
336 336 
 #: index.php:150
 
@@ -592,8 +592,8 @@ msgid "Remember me:"
592 592 
 msgstr "Husk meg:"
593 593
594 594 
 #: login.php:101
595 
-msgid "&nbsp;You must be registered to use gelato."
596 
-msgstr "&nbsp;Du må være registrert for å bruke Gelato"
595 
+msgid "&nbsp;You must be registered to use sorbet."
596 
+msgstr "&nbsp;Du må være registrert for å bruke Sorbet"
597 597
598 598 
 #: login.php:108
599 599 
 msgid "&nbsp;You must be logged on the system."
 
@@ -688,8 +688,8 @@ msgid "Importing"
688 688 
 msgstr "Importerer"
689 689
690 690 
 #: index.php:287
691 
-msgid "add to gelato"
692 
-msgstr "Legg til i gelato"
691 
+msgid "add to sorbet"
692 
+msgstr "Legg til i sorbet"
693 693
694 694 
 #: options.php:204
695 695 
 msgid "Shorten long URLs:"
 
@@ -719,4 +719,3 @@ msgstr "time"
719 719 
 #: options.php:224
720 720 
 msgid "hours"
721 721 
 msgstr "timer"
722 
-

BIN
languages/pl/messages.mo View File


+ 5 - 6
languages/pl/messages.po View File 

@@ -5,7 +5,7 @@
5 5 
 #
6 6 
 msgid ""
7 7 
 msgstr ""
8 
-"Project-Id-Version: gelato cms 0.95\n"
8 
+"Project-Id-Version: sorbet cms 0.95\n"
9 9 
 "Report-Msgid-Bugs-To: \n"
10 10 
 "POT-Creation-Date: 2007-11-06 12:46-0600\n"
11 11 
 "PO-Revision-Date: 2007-11-25 13:32-0600\n"
 
@@ -329,8 +329,8 @@ msgstr "Normalny"
329 329
330 330 
 #: index.php:167
331 331 
 #: index.php:145
332 
-msgid "A new gelato version has been released and is ready <a href=\"http://www.gelatocms.com/\">for download</a>."
333 
-msgstr "Nowa wersja gelato jest dostępna, <a href=\"http://www.gelatocms.com/\">kliknij tutaj, aby kontynuować.</a>."
332 
+msgid "A new version has been released and is ready for download."
333 
+msgstr "Nowa wersja jest dostępna, kliknij tutaj, aby kontynuować.."
334 334
335 335 
 #: index.php:172
336 336 
 #: index.php:150
 
@@ -592,7 +592,7 @@ msgid "Remember me:"
592 592 
 msgstr ""
593 593
594 594 
 #: login.php:101
595 
-msgid "&nbsp;You must be registered to use gelato."
595 
+msgid "&nbsp;You must be registered to use sorbet."
596 596 
 msgstr ""
597 597
598 598 
 #: login.php:108
 
@@ -686,7 +686,7 @@ msgid "Importing"
686 686 
 msgstr ""
687 687
688 688 
 #: index.php:287
689 
-msgid "add to gelato"
689 
+msgid "add to sorbet"
690 690 
 msgstr ""
691 691
692 692 
 #: options.php:204
 
@@ -717,4 +717,3 @@ msgstr ""
717 717 
 #: options.php:224
718 718 
 msgid "hours"
719 719 
 msgstr ""
720 
-

BIN
languages/pt-BR/messages.mo View File


+ 7 - 8
languages/pt-BR/messages.po View File 

@@ -5,7 +5,7 @@
5 5 
 #
6 6 
 msgid ""
7 7 
 msgstr ""
8 
-"Project-Id-Version: gelato cms 0.95\n"
8 
+"Project-Id-Version: sorbet cms 0.95\n"
9 9 
 "Report-Msgid-Bugs-To: \n"
10 10 
 "POT-Creation-Date: 2007-11-06 12:46-0600\n"
11 11 
 "PO-Revision-Date: 2007-11-25 13:32-0600\n"
 
@@ -329,8 +329,8 @@ msgstr "Regular"
329 329
330 330 
 #: index.php:167
331 331 
 #: index.php:145
332 
-msgid "A new gelato version has been released and is ready <a href=\"http://www.gelatocms.com/\">for download</a>."
333 
-msgstr "Uma nova versão do gelato foi lançada e está disponível <a href=\"http://www.gelatocms.com/\">para download</a>."
332 
+msgid "A new version has been released and is ready for download."
333 
+msgstr "Uma nova versão foi lançada e está disponível para download."
334 334
335 335 
 #: index.php:172
336 336 
 #: index.php:150
 
@@ -592,8 +592,8 @@ msgid "Remember me:"
592 592 
 msgstr "Lembrar de mim: "
593 593
594 594 
 #: login.php:101
595 
-msgid "&nbsp;You must be registered to use gelato."
596 
-msgstr "&nbsp; Você deve ser um usuário registrado para usar o gelato."
595 
+msgid "&nbsp;You must be registered to use sorbet."
596 
+msgstr "&nbsp; Você deve ser um usuário registrado para usar o sorbet."
597 597
598 598 
 #: login.php:108
599 599 
 msgid "&nbsp;You must be logged on the system."
 
@@ -686,8 +686,8 @@ msgid "Importing"
686 686 
 msgstr "Importando"
687 687
688 688 
 #: index.php:287
689 
-msgid "add to gelato"
690 
-msgstr "adicionar ao gelato"
689 
+msgid "add to sorbet"
690 
+msgstr "adicionar ao sorbet"
691 691
692 692 
 #: options.php:204
693 693 
 msgid "Shorten long URLs:"
 
@@ -717,4 +717,3 @@ msgstr "hora"
717 717 
 #: options.php:224
718 718 
 msgid "hours"
719 719 
 msgstr "horas"
720 
-

BIN
languages/ru/messages.mo View File


+ 6 - 7
languages/ru/messages.po View File 

@@ -5,7 +5,7 @@
5 5 
 #
6 6 
 msgid ""
7 7 
 msgstr ""
8 
-"Project-Id-Version: GelatoCMS v0.95\n"
8 
+"Project-Id-Version: SorbetCMS v0.95\n"
9 9 
 "Report-Msgid-Bugs-To: \n"
10 10 
 "POT-Creation-Date: 2007-11-06 12:46-0600\n"
11 11 
 "PO-Revision-Date: 2007-11-25 13:32-0600\n"
 
@@ -328,8 +328,8 @@ msgstr "Текст"
328 328
329 329 
 #: index.php:167
330 330 
 #: index.php:145
331 
-msgid "A new gelato version has been released and is ready <a href=\"http://www.gelatocms.com/\">for download</a>."
332 
-msgstr "Новая верия GelatoCMS <a href=\"http://www.gelatocms.com/\">доступна для скачивания</a>!"
331 
+msgid "A new version has been released and is ready for download."
332 
+msgstr "Новая верия SorbetCMS доступна для скачивания!"
333 333
334 334 
 #: index.php:172
335 335 
 #: index.php:150
 
@@ -591,7 +591,7 @@ msgid "Remember me:"
591 591 
 msgstr "Запомнить меня:"
592 592
593 593 
 #: login.php:101
594 
-msgid "&nbsp;You must be registered to use gelato."
594 
+msgid "&nbsp;You must be registered to use Sorbet CMS."
595 595 
 msgstr "&nbsp;Вы должны быть зарегистрированы."
596 596
597 597 
 #: login.php:108
 
@@ -685,8 +685,8 @@ msgid "Importing"
685 685 
 msgstr "Импортирование"
686 686
687 687 
 #: index.php:287
688 
-msgid "add to gelato"
689 
-msgstr "добавить в gelato"
688 
+msgid "add to sorbet"
689 
+msgstr "добавить в sorbet"
690 690
691 691 
 #: options.php:204
692 692 
 msgid "Shorten long URLs:"
 
@@ -716,4 +716,3 @@ msgstr "час"
716 716 
 #: options.php:224
717 717 
 msgid "hours"
718 718 
 msgstr "часов"
719 
-

BIN
languages/zh-CN/messages.mo View File


+ 7 - 8
languages/zh-CN/messages.po View File 

@@ -5,7 +5,7 @@
5 5 
 #
6 6 
 msgid ""
7 7 
 msgstr ""
8 
-"Project-Id-Version: chinese for gelato\n"
8 
+"Project-Id-Version: chinese for sorbet\n"
9 9 
 "Report-Msgid-Bugs-To: \n"
10 10 
 "POT-Creation-Date: 2007-11-06 12:46-0600\n"
11 11 
 "PO-Revision-Date: 2007-11-25 13:32-0600\n"
 
@@ -329,8 +329,8 @@ msgstr "规则"
329 329
330 330 
 #: index.php:167
331 331 
 #: index.php:145
332 
-msgid "A new gelato version has been released and is ready <a href=\"http://www.gelatocms.com/\">for download</a>."
333 
-msgstr "新版本发布，请<a href=\"http://www.gelatocms.com/\">下载</a>."
332 
+msgid "A new version has been released and is ready for download."
333 
+msgstr "新版本发布，请下载."
334 334
335 335 
 #: index.php:172
336 336 
 #: index.php:150
 
@@ -592,8 +592,8 @@ msgid "Remember me:"
592 592 
 msgstr "记住我"
593 593
594 594 
 #: login.php:101
595 
-msgid "&nbsp;You must be registered to use gelato."
596 
-msgstr "&nbsp;您需要注册才能使用gelato"
595 
+msgid "&nbsp;You must be registered to use sorbet."
596 
+msgstr "&nbsp;您需要注册才能使用sorbet"
597 597
598 598 
 #: login.php:108
599 599 
 msgid "&nbsp;You must be logged on the system."
 
@@ -686,8 +686,8 @@ msgid "Importing"
686 686 
 msgstr "导入"
687 687
688 688 
 #: index.php:287
689 
-msgid "add to gelato"
690 
-msgstr "添加到gelato"
689 
+msgid "add to sorbet"
690 
+msgstr "添加到sorbet"
691 691
692 692 
 #: options.php:204
693 693 
 msgid "Shorten long URLs:"
 
@@ -717,4 +717,3 @@ msgstr "小时"
717 717 
 #: options.php:224
718 718 
 msgid "hours"
719 719 
 msgstr "小时"
720 
-

BIN
languages/zh-TW/messages.mo View File


+ 8 - 9
languages/zh-TW/messages.po View File 

@@ -1,11 +1,11 @@
1 
-# SOME DESCRIPTIVE TITLE.
1 
+# SOME DESCRIPTIVE TITLE.
2 2 
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3 3 
 # This file is distributed under the same license as the PACKAGE package.
4 4 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5 5 
 #
6 6 
 msgid ""
7 7 
 msgstr ""
8 
-"Project-Id-Version: chinese for gelato\n"
8 
+"Project-Id-Version: chinese for sorbet\n"
9 9 
 "Report-Msgid-Bugs-To: \n"
10 10 
 "POT-Creation-Date: 2007-11-06 12:46-0600\n"
11 11 
 "PO-Revision-Date: 2007-11-25 13:32-0600\n"
 
@@ -329,8 +329,8 @@ msgstr "規則"
329 329
330 330 
 #: index.php:167
331 331 
 #: index.php:145
332 
-msgid "A new gelato version has been released and is ready <a href=\"http://www.gelatocms.com/\">for download</a>."
333 
-msgstr "新版本發布，請<a href=\"http://www.gelatocms.com/\">下載</a>."
332 
+msgid "A new version has been released and is ready for download."
333 
+msgstr "新版本發布，請下載."
334 334
335 335 
 #: index.php:172
336 336 
 #: index.php:150
 
@@ -592,8 +592,8 @@ msgid "Remember me:"
592 592 
 msgstr "記住我"
593 593
594 594 
 #: login.php:101
595 
-msgid "&nbsp;You must be registered to use gelato."
596 
-msgstr "&nbsp;您需要註冊才能使用gelato"
595 
+msgid "&nbsp;You must be registered to use Sorbet CMS."
596 
+msgstr "&nbsp;您需要註冊才能使用Sorbet CMS"
597 597
598 598 
 #: login.php:108
599 599 
 msgid "&nbsp;You must be logged on the system."
 
@@ -686,8 +686,8 @@ msgid "Importing"
686 686 
 msgstr "導入"
687 687
688 688 
 #: index.php:287
689 
-msgid "add to gelato"
690 
-msgstr "添加到gelato"
689 
+msgid "add to sorbet"
690 
+msgstr "添加到sorbet"
691 691
692 692 
 #: options.php:204
693 693 
 msgid "Shorten long URLs:"
 
@@ -717,4 +717,3 @@ msgstr "小時"
717 717 
 #: options.php:224
718 718 
 msgid "hours"
719 719 
 msgstr "小時"
720 
-

+ 7 - 10
login.php View File 

@@ -4,12 +4,9 @@ if (!defined('entry')) {
4 4 
 }
5 5 
 /* ===========================
6 6
7 
-  gelato CMS - A PHP based tumblelog CMS
8 
-  development version
9 
-  http://www.gelatocms.com/
7 
+  Sorbet CMS - A PHP based tumblelog CMS forked from Gelato CMS
10 8
11 
-  gelato CMS is a free software licensed under the GPL 2.0
12 
-  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
9 
+  Sorbet CMS is a free software licensed under the GPL 3.0
13 10
14 11 
   =========================== */
15 12 
 ?>

@@ -20,19 +17,19 @@ require_once('entry.php');
20 17 
 global $user, $conf;
21 18
22 19 
 if ($user->isAuthenticated()) {
23 
-    header("Location: ".$conf->urlGelato."/admin/index.php");
20 
+    header("Location: ".$conf->urlSorbet."/admin/index.php");
24 21 
 } else {
25 22 
     if (isset($_POST["pass"]) && isset($_POST["login"])) {
26 23 
         if ($user->validateUser($_POST['login'], md5($_POST['pass']))) {
27 24 
             if (isset($_POST["url_redirect"])) {
28 
-                header("Location: ".$conf->urlGelato."/admin/bm.php?url=".$_POST["url_redirect"]."&sel=".$_POST["sel"]);
25 
+                header("Location: ".$conf->urlSorbet."/admin/bm.php?url=".$_POST["url_redirect"]."&sel=".$_POST["sel"]);
29 26 
                 exit();
30 27 
             } else {
31 
-                header("Location: ".$conf->urlGelato."/admin/index.php");
28 
+                header("Location: ".$conf->urlSorbet."/admin/index.php");
32 29 
                 exit();
33 30 
             }
34 31 
         } else {
35 
-            header("Location: ".$conf->urlGelato."/login.php?error=1");
32 
+            header("Location: ".$conf->urlSorbet."/login.php?error=1");
36 33 
             exit();
37 34 
         }
38 35 
     } else {
 
@@ -43,7 +40,7 @@ if ($user->isAuthenticated()) {
43 40 
         $theme->set('sel', (isset($_GET['sel'])?$_GET['sel']:''));
44 41 
         $theme->set('error', (isset($_GET['error'])?$_GET['error']:''));
45 42 
         $theme->set('conf', array(
46 
-            "urlGelato"=>$conf->urlGelato
43 
+            "urlSorbet"=>$conf->urlSorbet
47 44 
         ));
48 45 
         $theme->display(Absolute_Path.'admin/themes/admin/login.htm');
49 46 
     }

+ 16 - 17
plugins/feedreplacement.php View File 

@@ -1,8 +1,7 @@
1 1 
 <?php
2 2 
 /*
3 3 
 Plugin Name: FeedReplacement
4 
-Plugin URI:  http://plugins.gelatocms.com/feedreplacement/
5 
-Description:
4 
+Description:
6 5 
 Author: Victor Bracco
7 6 
 Author URI: http://www.vbracco.com.ar/
8 7 
 Version: 0.3
 
@@ -12,40 +11,40 @@ class feedreplacement extends plugins
12 11 
     public function feedreplacement()
13 12 
     {
14 13 
         global $user, $conf, $tumble;
15 
-
14 
+
16 15 
         //agregar al los panel de options un input mas
17 16 
         $this->addAction('add_options_panel', 'feedreplacement_setOptionsPanel');
18 
-
17 
+
19 18 
         //crea o verifica que la opcion que usa de la tabla de opciones esta creada
20 
-        $this->addAction('gelato_init', 'feedreplacement_check');
21 
-
22 
-        //reemplaza el link del feed de gelato por el link de feedburner
19 
+        $this->addAction('sorbet_init', 'feedreplacement_check');
20 
+
21 
+        //reemplaza el link del feed de sorbet por el link de feedburner
23 22 
         //$this->addAction('add_post', 'dameCinco');
24 
-
23 
+
25 24 
         //lo mismo pero con el que esta en el header
26 
-        $this->addAction('gelato_includes', 'feedreplacement_includeFeed');
27 
-
25 
+        $this->addAction('sorbet_includes', 'feedreplacement_includeFeed');
26 
+
28 27 
         //redirecting all trafic
29 28 
         $this->addAction('feed_header', 'feedreplacement_redirect');
30 
-
29 
+
31 30 
         //guarda la opcion si viene por POST
32 31 
         if ($user->isAdmin()) {
33 32 
             if (isset($_POST["feedreplacement_url"])) {
34 33 
                 if (!$tumble->saveOption($_POST["feedreplacement_url"], "feedreplacement_url")) {
35 
-                    header("Location: ".$conf->urlGelato."/admin/options.php?error=1&des=".$conf->merror);
34 
+                    header("Location: ".$conf->urlSorbet."/admin/options.php?error=1&des=".$conf->merror);
36 35 
                     die();
37 36 
                 }
38 37 
             }
39 38 
         }
40 39 
     }
41 
-
40 
+
42 41 
     public function feedreplacement_setOptionsPanel()
43 42 
     {
44 43 
         global $conf;
45 44 
         echo '<li><label class="help" for="feedreplacement_url">'.__("Replacement Feed:").'</label>
46 45 
 		<input type="text" name="feedreplacement_url" id="feedreplacement_url" value="'.$conf->get_option('feedreplacement_url').'" class="txt help" title="'.__("Introduce your new feed url into this input").'"/></li>';
47 46 
     }
48 
-
47 
+
49 48 
     public function feedreplacement_check()
50 49 
     {
51 50 
         global $db,$conf;
 
@@ -58,16 +57,16 @@ class feedreplacement extends plugins
58 57 
             }
59 58 
         }
60 59 
     }
61 
-
60 
+
62 61 
     public function feedreplacement_includeFeed()
63 62 
     {
64 
-        global $conf,$gelato_includes,$feed_url;
63 
+        global $conf,$sorbet_includes,$feed_url;
65 64 
         $feedreplacement_url = $conf->get_option('feedreplacement_url');
66 65 
         if ($feedreplacement_url!="") {
67 66 
             $feed_url = $feedreplacement_url;
68 67 
         }
69 68 
     }
70 
-
69 
+
71 70 
     public function feedreplacement_redirect()
72 71 
     {
73 72 
         global $conf;

+ 2 - 3
plugins/kodrs.php View File 

@@ -9,13 +9,12 @@ class kodrs extends plugins
9 9 
         }
10 10 
         $this->addAction('post_content', 'source_code_beautifier');
11 11 
     }
12 
-
12 
+
13 13 
     public function info()
14 14 
     {
15 15 
         return array(
16 16 
             'name' => 'kodrs',
17 17 
             'version' => '0.1',
18 
-            'url' => 'http://plugins.gelatocms.com/kodrs/',
19 18 
             'author' => 'Pedro Santana',
20 19 
             'authorurl' => 'http://www.pecesama.net/',
21 20 
             'license' => 'MIT License',
 
@@ -39,7 +38,7 @@ class kodrs extends plugins
39 38 
             }
40 39 
         }
41 40 
     }
42 
-
41 
+
43 42 
     public function replace_with_geshi($matches)
44 43 
     {
45 44 
         $lang = strtolower($matches[1])    ;

+ 2 - 3
plugins/post_confirmation.php View File 

@@ -1,7 +1,6 @@
1 1 
 <?php
2 2 
 /*
3 3 
 Plugin Name: PostConfirmation
4 
-Plugin URI: http://www.gelatocms.com/plugins/postconfirmation/
5 4 
 Description: Add a confirmation dialog when submit the Create-post button.
6 5 
 Author: Victor Bracco
7 6 
 Author URI: http://www.vbracco.com.ar/
 
@@ -14,13 +13,13 @@ class post_confirmation extends plugins
14 13 
     {
15 14 
         $this->addAction('admin_includes', 'post_confirmation_script');
16 15 
     }
17 
-
16 
+
18 17 
     public function post_confirmation_script()
19 18 
     {
20 19 
         global $admin_includes,$isEdition;
21 20 
         if (!$isEdition) {
22 21 
             $admin_includes .= "
23 
-			<script type=\"text/javascript\">
22 
+			<script type=\"text/javascript\">
24 23 
 			$(document).ready(function(){
25 24 
 				$('#publish').click( function(){
26 25 
 					return (confirm('".__("Do you realy want to publish this?")."'));

+ 7 - 13
readme.txt View File 

@@ -1,16 +1,10 @@
1 
-PLEASE DO NOT USE AS PRODUCTION TUMBLELOG, ONLY FOR TESTING PURPOSES
1 
+We don't recommand to use this CMS in production, as it is still in development.
2 2
3 
-This beta version is not ready to replace your actual gelato tumblelog, there is not an update script, only fresh installs for TESTING purposes.
3 
+==== How to install Sorbet CMS =====
4 4
5 
-==== How to install gelato CMS =====
5 
+1) Download and extract the package to your web server
6 
+2) Make sure the file "config.php" and the folder "uploads" are writable by the webserver
7 
+3) Access your installation, you should be redirected to /install.php
8 
+4) Fill out the form, click "Install"
6 9
7 
-1) Download and unzip the gelato package, if you haven't already.
8 
-2) Place the gelato files in the desired location on your web server.
9 
-3) Rename the file config-sample.php to config.php and edit it with your server info.
10 
-4) Run the gelato installation script by accessing install.php in your favorite web browser.
11 
-	* If you installed gelato in the root directory, you should visit: http://example.com/install.php
12 
-    * If you installed gelato in its own subdirectory called tumblelog, for example, you should visit: http://example.com/tumblelog/install.php
13 
-5) Set CHMOD / permission ( Chmod 777 ) to the folder 'uploads' and the folder 'uploads/CACHE'
14 
-6) REMOVE the install.php file.
15 
-
16 
-That's it! gelato should now be installed.
10 
+That's it! Sorbet should now be installed.

+ 7 - 10
rss.php View File 

@@ -4,12 +4,9 @@ if (!defined('entry')) {
4 4 
 }
5 5 
 /* ===========================
6 6
7 
-  gelato CMS - A PHP based tumblelog CMS
8 
-  development version
9 
-  http://www.gelatocms.com/
7 
+  Sorbet CMS - A PHP based tumblelog CMS forked from Gelato CMS
10 8
11 
-  gelato CMS is a free software licensed under the GPL 2.0
12 
-  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
9 
+  Sorbet CMS is a free software licensed under the GPL 3.0
13 10
14 11 
   =========================== */
15 12 
 ?>

@@ -29,13 +26,13 @@ if (!defined('entry')) {
29 26 
 	<rss version="2.0">
30 27 
 	<channel>
31 28 
 		<title><?php echo htmlspecialchars($conf->title);?></title>
32 
-		<link><?php echo $conf->urlGelato;?></link>
29 
+		<link><?php echo $conf->urlSorbet;?></link>
33 30 
 		<description><?php echo htmlspecialchars($conf->description);?></description>
34 
-		<generator>gelato CMS <?php echo $util_class->codeName()." (".$util_class->version().")"; ?></generator>
31 
+		<generator>Sorbet CMS <?php echo $util_class->codeName()." (".$util_class->version().")"; ?></generator>
35 32 
 		<image>
36 
-			<url><?php echo $conf->urlGelato;?>/images/information.png</url>
33 
+			<url><?php echo $conf->urlSorbet;?>/images/information.png</url>
37 34 
 			<title><?php echo htmlspecialchars($conf->description);?></title>
38 
-			<link><?php echo $conf->urlGelato;?></link>
35 
+			<link><?php echo $conf->urlSorbet;?></link>
39 36 
 		</image>
40 37 
 <?php
41 38 
     $rs = $tumble->getPosts("20");
 
@@ -49,7 +46,7 @@ if (!defined('entry')) {
49 46 
                     $desc = $register["description"];
50 47 
                     break;
51 48 
                 case "2":
52 
-                    $photoPath = str_replace("../", $conf->urlGelato."/", $register["url"]);
49 
+                    $photoPath = str_replace("../", $conf->urlSorbet."/", $register["url"]);
53 50 
                     $tit = ($register["description"]=="") ? "Photo" : $register["description"];
54 51 
                     $desc = "<img src=\"".$photoPath."\"/>";
55 52 
                     break;

+ 5 - 8
sitemap.php View File 

@@ -4,12 +4,9 @@ if (!defined('entry')) {
4 4 
 }
5 5 
 /* ===========================
6 6
7 
-  gelato CMS - A PHP based tumblelog CMS
8 
-  development version
9 
-  http://www.gelatocms.com/
7 
+  Sorbet CMS - A PHP based tumblelog CMS forked from Gelato CMS
10 8
11 
-  gelato CMS is a free software licensed under the GPL 2.0
12 
-  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
9 
+  Sorbet CMS is a free software licensed under the GPL 3.0
13 10
14 11 
   =========================== */
15 12 
 ?>

@@ -22,14 +19,14 @@ if (!defined('entry')) {
22 19 
     $isFeed = true;
23 20
24 21 
     echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
25 
-    echo "<?xml-stylesheet type=\"text/xsl\" href=\"".$conf->urlGelato."/sitemap.xsl\"?>\n";
22 
+    echo "<?xml-stylesheet type=\"text/xsl\" href=\"".$conf->urlSorbet."/sitemap.xsl\"?>\n";
26 23
27 24 
     $rs = $tumble->getPosts(1);
28 25 
 ?>
29 
-<!-- generator="gelato CMS" -->
26 
+<!-- generator="Sorbet CMS" -->
30 27 
 <urlset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd" xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
31 28 
 	<url>
32 
-		<loc><?php echo $conf->urlGelato;?></loc>
29 
+		<loc><?php echo $conf->urlSorbet;?></loc>
33 30 
 <?php
34 31 
         if ($db->contarRegistros()>0) {
35 32 
             $register = $rs->fetch();

+ 11 - 11
sitemap.xsl View File 

@@ -11,43 +11,43 @@
11 11 
 						font-family:"Lucida Grande","Lucida Sans Unicode",Tahoma,Verdana;
12 12 
 						font-size:13px;
13 13 
 					}
14 
-
14 
+
15 15 
 					#intro {
16 16 
 						background-color:#CFEBF7;
17 17 
 						border:1px #2580B2 solid;
18 18 
 						padding:5px 13px 5px 13px;
19 19 
 						margin:10px;
20 20 
 					}
21 
-
21 
+
22 22 
 					#intro p {
23 23 
 						line-height:	16.8667px;
24 24 
 					}
25 
-
25 
+
26 26 
 					td {
27 27 
 						font-size:11px;
28 28 
 					}
29 
-
29 
+
30 30 
 					th {
31 31 
 						text-align:left;
32 32 
 						padding-right:30px;
33 33 
 						font-size:11px;
34 34 
 					}
35 
-
35 
+
36 36 
 					tr.high {
37 37 
 						background-color:whitesmoke;
38 38 
 					}
39 
-
39 
+
40 40 
 					#footer {
41 41 
 						padding:2px;
42 42 
 						margin:10px;
43 43 
 						font-size:8pt;
44 44 
 						color:gray;
45 45 
 					}
46 
-
46 
+
47 47 
 					#footer a {
48 48 
 						color:gray;
49 49 
 					}
50 
-
50 
+
51 51 
 					a {
52 52 
 						color:black;
53 53 
 					}

@@ -58,7 +58,7 @@
58 58 
 				<div id="intro">
59 59 
 					<p>
60 60 
 						This is a XML Sitemap which is supposed to be processed by search engines like <a href="http://www.google.com/">Google</a>, <a href="http://search.msn.com/">MSN Search</a> and <a href="http://www.yahoo.com/">YAHOO</a>.<br/>
61 
-						It was generated using the Tumblelogging-Software <a href="http://www.gelatocms.com/">Gelato CMS</a>.<br/>
61 
+						It was generated using the Tumblelogging-Software Sorbet CMS.<br/>
62 62 
 						You can find more information about XML sitemaps on <a href="http://sitemaps.org/">sitemaps.org</a> and Google's <a href="http://code.google.com/sm_thirdparty.html">list of sitemap programs</a>.
63 63 
 					</p>
64 64 
 				</div>

@@ -99,9 +99,9 @@
99 99 
 					</table>
100 100 
 				</div>
101 101 
 				<div id="footer">
102 
-					gelato CMS :: PHP/MySQL Tumblelog Content Management System.
102 
+					Sorbet CMS :: PHP/MySQL Tumblelog Content Management System.
103 103 
 				</div>
104 104 
 			</body>
105 105 
 		</html>
106 106 
 	</xsl:template>
107 
-</xsl:stylesheet>
107 
+</xsl:stylesheet>

+ 2 - 2
themes/Dreamscape/index.htm View File 

@@ -1,6 +1,6 @@
1 1 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
2 2 
 <html xml:lang="en" xmlns="http://www.w3.org/1999/xhtml" lang="en"><head>
3 
-		{Gelato_includes}
3 
+		{Sorbet_includes}
4 4 
 		<link rel="stylesheet" type="text/css" href="{URL_Tumble}/themes/{Template_name}/style.css"/>
5 5 
 		<script language="javascript" type="text/javascript" src="{URL_Tumble}/admin/scripts/jquery.js"></script>
6 6 
 		<script language="javascript" type="text/javascript" src="{URL_Tumble}/admin/scripts/lightbox.js"></script>

@@ -180,7 +180,7 @@
180 180 
                 <p class="tiny">
181 181 
                 	<a href="{URL_Tumble}/archive.php">{__("archive")}</a> &nbsp;/&nbsp;
182 182 
                 	{__("subscribe via")} <a href="{URL_Tumble}/rss.php">rss</a> &nbsp;/&nbsp;
183 
-					{__("powered by")} <a href="http://www.gelatocms.com/">gelato cms</a>
183 
+					{__("powered by")} sorbet cms
184 184 
                 </p>
185 185 
             </div>
186 186 
         </div>

File diff suppressed because it is too large
+ 1 - 378
themes/Dreamscape/style.css


+ 2 - 2
themes/tumblr/index.htm View File 

@@ -3,7 +3,7 @@
3 3 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
4 4 
 <head>
5 5 
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
6 
-	{Gelato_includes}
6 
+	{Sorbet_includes}
7 7 
 	<link rel="stylesheet" type="text/css" href="{URL_Tumble}/themes/{Template_name}/style.css"/>
8 8 
 	<script language="javascript" type="text/javascript" src="{URL_Tumble}/admin/scripts/jquery.js"></script>
9 9 
 	<script language="javascript" type="text/javascript" src="{URL_Tumble}/admin/scripts/lightbox.js"></script>

@@ -167,7 +167,7 @@
167 167 
 	<div id="footer">
168 168 
     	<a href="{URL_Tumble}/archive.php">{__("archive")}</a> &nbsp;/&nbsp;
169 169 
 		{__("subscribe via")} <a href="{URL_Tumble}/rss.php">rss</a> &nbsp;/&nbsp;
170 
-		{__("powered by")} <a href="http://www.gelatocms.com/">gelato cms</a>
170 
+		{__("powered by")} sorbet cms
171 171 
 	</div>
172 172 
 </body>
173 173 
 </html>

File diff suppressed because it is too large
+ 1 - 308
themes/tumblr/style.css


+ 5 - 7
uploads/index.php View File 

@@ -1,17 +1,15 @@
1 1 
 <?php
2 2 
 if (!defined('entry') || !entry) {
3 3 
     die('Not a valid page');
4 
-} /* ===========================
4 
+}
5 
+/* ===========================
5 6
6 
-  gelato CMS - A PHP based tumblelog CMS
7 
-  development version
8 
-  http://www.gelatocms.com/
7 
+  Sorbet CMS - A PHP based tumblelog CMS forked from Gelato CMS
9 8
10 
-  gelato CMS is a free software licensed under the GPL 2.0
11 
-  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
9 
+  Sorbet CMS is a free software licensed under the GPL 3.0
12 10
13 11 
   =========================== */
14 12 
 ?>
15 13 
 <?php
16 14 
 // Nothing here
17 
-?>
15 
+?>