Browse Source

Fixed the error500 and headers changed

pecesama 17 years ago
parent
commit
6becfa8cd8

+ 2 - 1
admin/admin.php View File

@@ -5,7 +5,8 @@
5 5
   development version
6 6
   http://www.gelatocms.com/
7 7
 
8
-  gelato CMS is a free software licensed under GPL (General public license)
8
+  gelato CMS is a free software licensed under the GPL 2.0
9
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
9 10
 
10 11
   =========================== */
11 12
 ?>

+ 2 - 1
admin/ajax.php View File

@@ -5,7 +5,8 @@
5 5
   development version
6 6
   http://www.gelatocms.com/
7 7
 
8
-  gelato CMS is a free software licensed under GPL (General public license)
8
+  gelato CMS is a free software licensed under the GPL 2.0
9
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
9 10
 
10 11
   =========================== */
11 12
 ?>

+ 2 - 1
admin/close.php View File

@@ -5,7 +5,8 @@
5 5
   development version
6 6
   http://www.gelatocms.com/
7 7
 
8
-  gelato CMS is a free software licensed under GPL (General public license)
8
+  gelato CMS is a free software licensed under the GPL 2.0
9
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
9 10
 
10 11
   =========================== */
11 12
 ?>

+ 2 - 1
admin/css/style.css View File

@@ -4,7 +4,8 @@
4 4
   development version
5 5
   http://www.gelatocms.com/
6 6
 
7
-  gelato CMS is a free software licensed under GPL (General public license)
7
+  gelato CMS is a free software licensed under the GPL 2.0
8
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
8 9
 
9 10
   =========================== */
10 11
 

+ 6 - 5
admin/index.php View File

@@ -5,7 +5,8 @@
5 5
   development version
6 6
   http://www.gelatocms.com/
7 7
 
8
-  gelato CMS is a free software licensed under GPL (General public license)
8
+  gelato CMS is a free software licensed under the GPL 2.0
9
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
9 10
 
10 11
   =========================== */
11 12
 ?>
@@ -24,7 +25,7 @@ $tumble = new gelato();
24 25
 $conf = new configuration();
25 26
 $template = new plantillas("admin");
26 27
 
27
-$isEdition = isset($_GET["edit"]);
28
+$isEdition = (isset($_GET["edit"])) ? true : false;
28 29
 $postId = ($isEdition) ? $_GET["edit"] : NULL;
29 30
 
30 31
 if ($user->isAdmin()) {
@@ -46,11 +47,11 @@ if ($user->isAdmin()) {
46 47
 					header("Location: ".$conf->urlGelato."/admin/index.php?photo=false");
47 48
 					die();
48 49
 				}
49
-				$_POST["url"] = $conf->urlGelato."/uploads/".$photoName;
50
+				$_POST["url"] = "../uploads/".$photoName;
50 51
 			}
51 52
 			
52 53
 			if ( move_uploaded_file( $_FILES['photo']['tmp_name'], "../uploads/".sanitizeName($_FILES['photo']['name']) ) ) {
53
-				$_POST["url"] = $conf->urlGelato."/uploads/".sanitizeName($_FILES['photo']['name']);
54
+				$_POST["url"] = "../uploads/".sanitizeName($_FILES['photo']['name']);
54 55
 			}
55 56
 			
56 57
 			unset($_POST["photo"]);
@@ -303,7 +304,7 @@ if ($user->isAdmin()) {
303 304
 								<p>
304 305
 									<span style="color: rgb(136, 136, 136); margin-bottom: 10px; font-size: 10px;"><a href="http://hobix.com/textile/">Textile</a> syntax is supported.</span>
305 306
 								</p>
306
-								<p>									
307
+								<p>
307 308
 									<input class="btn" type="submit" name="btnAdd" value="<?php echo ($isEdition) ? "Modify" : "Create"; ?> post" />
308 309
 								</p>
309 310
 						</fieldset>

+ 2 - 1
admin/options.php View File

@@ -5,7 +5,8 @@
5 5
   development version
6 6
   http://www.gelatocms.com/
7 7
 
8
-  gelato CMS is a free software licensed under GPL (General public license)
8
+  gelato CMS is a free software licensed under the GPL 2.0
9
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
9 10
 
10 11
   =========================== */
11 12
 ?>

+ 2 - 1
admin/settings.php View File

@@ -5,7 +5,8 @@
5 5
   development version
6 6
   http://www.gelatocms.com/
7 7
 
8
-  gelato CMS is a free software licensed under GPL (General public license)
8
+  gelato CMS is a free software licensed under the GPL 2.0
9
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
9 10
 
10 11
   =========================== */
11 12
 ?>

+ 2 - 1
admin/user.php View File

@@ -5,7 +5,8 @@
5 5
   development version
6 6
   http://www.gelatocms.com/
7 7
 
8
-  gelato CMS is a free software licensed under GPL (General public license)
8
+  gelato CMS is a free software licensed under the GPL 2.0
9
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
9 10
 
10 11
   =========================== */
11 12
 ?>

+ 2 - 1
classes/configuration.class.php View File

@@ -5,7 +5,8 @@
5 5
   development version
6 6
   http://www.gelatocms.com/
7 7
 
8
-  gelato CMS is a free software licensed under GPL (General public license)
8
+  gelato CMS is a free software licensed under the GPL 2.0
9
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
9 10
 
10 11
   =========================== */
11 12
 ?>

+ 2 - 1
classes/functions.php View File

@@ -5,7 +5,8 @@
5 5
   development version
6 6
   http://www.gelatocms.com/
7 7
 
8
-  gelato CMS is a free software licensed under GPL (General public license)
8
+  gelato CMS is a free software licensed under the GPL 2.0
9
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
9 10
 
10 11
   =========================== */
11 12
 ?>

+ 2 - 1
classes/gelato.class.php View File

@@ -5,7 +5,8 @@
5 5
   development version
6 6
   http://www.gelatocms.com/
7 7
 
8
-  gelato CMS is a free software licensed under GPL (General public license)
8
+  gelato CMS is a free software licensed under the GPL 2.0
9
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
9 10
 
10 11
   =========================== */
11 12
 ?>

+ 2 - 0
classes/imgsize.php View File

@@ -1,5 +1,7 @@
1 1
 <?php
2 2
 header ("Content-type: image/jpeg");
3
+header('Cache-Control: max-age=172800, must-revalidate');
4
+header('Expires: ' . date('r', time()+120));
3 5
 /*
4 6
 JPEG / PNG Image Resizer
5 7
 Parameters (passed via URL):

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

@@ -12,6 +12,8 @@
12 12
  */
13 13
 ?>
14 14
 <?php
15
+require_once("functions.php");
16
+
15 17
 class plantillas {
16 18
 
17 19
 	var $plantilla;
@@ -46,8 +48,8 @@ class plantillas {
46 48
 				$this->plantilla_cargada = $salida_xhtml;
47 49
 			} 
48 50
 		}
49
-	}
50
-	
51
+	}	
52
+		
51 53
 	function precargarPlantillaConBloque($entrada, $salida, $plantilla_usar) {		
52 54
 		$plantilla_usar = "themes/".$this->plantilla."/".$plantilla_usar.".htm";
53 55
 		
@@ -71,6 +73,7 @@ class plantillas {
71 73
 		}
72 74
 	}
73 75
 	
76
+	
74 77
 	function cargarPlantillaConBloque($entrada, $salida, $plantilla_usar, $nombreBloque) {		
75 78
 		$plantilla_usar = "themes/".$this->plantilla."/".$plantilla_usar.".htm";
76 79
 		
@@ -92,6 +95,7 @@ class plantillas {
92 95
 		}
93 96
 	}
94 97
 	
98
+	
95 99
 	function procesaBloque($entrada, $salida, $bloque) {
96 100
 		for ($i = 0; $i < count($entrada); $i++) {
97 101
 			$bloque = str_replace($entrada[$i], $salida[$i], $bloque);

+ 2 - 1
classes/user.class.php View File

@@ -5,7 +5,8 @@
5 5
   development version
6 6
   http://www.gelatocms.com/
7 7
 
8
-  gelato CMS is a free software licensed under GPL (General public license)
8
+  gelato CMS is a free software licensed under the GPL 2.0
9
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
9 10
 
10 11
   =========================== */
11 12
 ?>

+ 2 - 1
config-sample.php View File

@@ -5,7 +5,8 @@
5 5
   development version
6 6
   http://www.gelatocms.com/
7 7
 
8
-  gelato CMS is a free software licensed under GPL (General public license)
8
+  gelato CMS is a free software licensed under the GPL 2.0
9
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
9 10
 
10 11
   =========================== */
11 12
 ?>

+ 2 - 1
index.php View File

@@ -5,7 +5,8 @@
5 5
   development version
6 6
   http://www.gelatocms.com/
7 7
 
8
-  gelato CMS is a free software licensed under GPL (General public license)
8
+  gelato CMS is a free software licensed under the GPL 2.0
9
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
9 10
 
10 11
   =========================== */
11 12
 ?>

+ 2 - 1
install.php View File

@@ -5,7 +5,8 @@
5 5
   development version
6 6
   http://www.gelatocms.com/
7 7
 
8
-  gelato CMS is a free software licensed under GPL (General public license)
8
+  gelato CMS is a free software licensed under the GPL 2.0
9
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
9 10
 
10 11
   =========================== */
11 12
 ?>

+ 2 - 1
login.php View File

@@ -5,7 +5,8 @@
5 5
   development version
6 6
   http://www.gelatocms.com/
7 7
 
8
-  gelato CMS is a free software licensed under GPL (General public license)
8
+  gelato CMS is a free software licensed under the GPL 2.0
9
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
9 10
 
10 11
   =========================== */
11 12
 ?>

+ 46 - 0
notice.txt View File

@@ -0,0 +1,46 @@
1
+== CREDITS= =
2
+Gelato developers and designers (in chronological order):
3
+
4
+Pedro Santana [ http://www.pecesama.net/weblog/ ]
5
+Jorge Condomí [ http://www.raven.com.ar/ ]
6
+Víctor de la Rocha [ http://blog.mis-algoritmos.com/ ]
7
+Victor Bracco [ http://www.vbracco.com.ar/blog/ ]
8
+
9
+= COPYRIGHT NOTICES =
10
+This product includes code and libraries developed by third parties, which are governed by different licenses.  These components, and their licenses, are listed below.
11
+
12
+= Mootools =
13
+Copyright (c) 2006 Valerio Proietti, http://mad4milk.net
14
+Mootools is available under MIT Style License.
15
+
16
+= Slimbox =
17
+Copyright (c) Christophe Beyls, http://www.digitalia.be
18
+Slimbox available under MIT Style License.
19
+
20
+= Sortable =
21
+Copyright (c) 1997-2006 Stuart Langridge, Joost de Valk, http://www.joostdevalk.nl/code/sortable-table/
22
+Sortable available under MIT license.
23
+
24
+= MP3 Audio Player =
25
+Copyright (c) 2005-2006  Martin Laine, http://www.1pixelout.net
26
+MP3 Audio Player available under GNU General Public License.
27
+
28
+= JPEG / PNG Image Resizer =
29
+Copyright (c) Michael John G. Lopez, http://www.sydel.net
30
+JPEG / PNG Image Resizer available under an Open License.
31
+
32
+= Clase Conexion_Mysql =
33
+Copyright (c) Pedro Santana, http://www.pecesama.net/weblog/
34
+Clase Conexion_Mysql available under MIT license.
35
+
36
+= Digg Style Paginator Class =
37
+Copyright (c) Victor De la Rocha, http://www.mis-algoritmos.com/
38
+Digg Style Paginator Class available under MIT license.
39
+
40
+= Clase plantillas =
41
+Copyright (c) Pedro Santana, http://www.pecesama.net/weblog/
42
+Clase plantillas available under MIT license.
43
+
44
+= Textile class =
45
+Copyright (c) Jim Riggs, http://jimandlissa.com/project/textilephp
46
+Textile class available under GNU General Public License.

+ 2 - 1
rss.php View File

@@ -5,7 +5,8 @@
5 5
   development version
6 6
   http://www.gelatocms.com/
7 7
 
8
-  gelato CMS is a free software licensed under GPL (General public license)
8
+  gelato CMS is a free software licensed under the GPL 2.0
9
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
9 10
 
10 11
   =========================== */
11 12
 ?>

+ 2 - 1
update.php View File

@@ -5,7 +5,8 @@
5 5
   development version
6 6
   http://www.gelatocms.com/
7 7
 
8
-  gelato CMS is a free software licensed under GPL (General public license)
8
+  gelato CMS is a free software licensed under the GPL 2.0
9
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
9 10
 
10 11
   =========================== */
11 12
 ?>

+ 13 - 1
uploads/index.php View File

@@ -1,3 +1,15 @@
1 1
 <?php
2
-// Silence is golden.
2
+/* ===========================
3
+
4
+  gelato CMS - A PHP based tumblelog CMS
5
+  development version
6
+  http://www.gelatocms.com/
7
+
8
+  gelato CMS is a free software licensed under the GPL 2.0
9
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
10
+
11
+  =========================== */
12
+?>
13
+<?php
14
+// Nothing here
3 15
 ?>