From d20a23d76296f25f94d98778a5e962f64eac515b Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Wed, 17 Feb 2010 14:05:48 -0200
Subject: Renaming defaults to config.dist.inc.php

---
 www/inc/config.dist.inc.php | 84 +++++++++++++++++++++++++++++++++++++++++++++
 www/inc/config.inc.php.dist | 84 ---------------------------------------------
 www/index.php               |  2 +-
 3 files changed, 85 insertions(+), 85 deletions(-)
 create mode 100644 www/inc/config.dist.inc.php
 delete mode 100644 www/inc/config.inc.php.dist

(limited to 'www')

diff --git a/www/inc/config.dist.inc.php b/www/inc/config.dist.inc.php
new file mode 100644
index 0000000..14e8ad8
--- /dev/null
+++ b/www/inc/config.dist.inc.php
@@ -0,0 +1,84 @@
+<?php
+#base dirname
+  $root = dirname(dirname(__FILE__) . "../");
+# ===========================================================================
+# dir index
+	 $sortinmonth = 0;// 1 - alphabetically
+	 								  // 0 - by date (reverse)
+
+# ===========================================================================
+# default languages
+# use UA's accept language
+require_once("$root/inc/l10nget.inc.php"); //get from UA
+if (isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) {
+	$sclang = get_lang_from_agent($_SERVER["HTTP_ACCEPT_LANGUAGE"]);
+} else {
+	$sclang = "en";
+}
+l10n::set("$root/l10n/".$GLOBALS['sclang']."/exif.lang");
+
+# ===========================================================================
+#Name to dsplay on the gallery
+$scnamegallery = "Photo Gallery Index";
+
+
+# ===========================================================================
+# albums to show
+   $yearsince = 1999;
+#images FIXME - this is stylesheet's job
+   $img["left"] = "left.png";
+   $img["right"] = "right.png";
+   $img["top"] = "top.png";
+# ===========================================================================
+#thumbnail behaviour
+   //keep this unset for dynamic thumbnail size
+   //$thumbsize = "fixed";
+   //How the previous and Next thumbnails should be scaled
+   // 1 is 1:1, >1 is smaller, <1 is bigger
+   $PNthumbScale = 1.5;
+# Photos Copyright
+#	CHANGE THIS! I am not trying to take over the world ;)
+	 $copy = "Copyright &copy; 1999-2005 Jakub Steiner";
+#app info
+   $app["name"] = "Original"; // opensource remote image gallery,
+                              // initialy not as lovely 
+   $app["url"] = "http://jimmac.musichall.cz/original.php3";
+   $app["version"] = "0.12pre";
+   $exif_show = array("DateTime"=>__("Time Taken"), 
+	 						"Make"=>__("Camera Manufacturer"), 
+	 						"Model"=>__("Camera Model"), 
+							"FocalLength"=>__("Real Focal Length"), 
+	 						"FocalLengthIn35mmFilm"=>__("Focal Length Relative to 35mm Film"),
+	 						"FNumber"=>__("F Stop"), 
+							"ExposureTime"=>__("Time of Exposure"), 
+							"ISOSpeedRatings"=>__("Film/Chip Sensitivity"),
+							"Flash"=>__("Flash"));
+# ===========================================================================
+## Gallery Directory
+# This is a path relative to the directory where original is installed
+# eg. it can be "../galleries" to use a galleries dir above the original dir.
+  $gallery_dir="galleries";
+
+#Enable this to access extended tracking functionality
+#depends on sqlite
+$have_sqlite = 0;
+
+# This controls wheather web visitors will be able to post
+# comments to images
+$comments = 1;
+
+# Access Log/Counter
+# $log_access = 0; // no access logging
+$log_access = 1; 
+
+#css styles
+   $themes = array(
+               "dark" => "inc/styles/dark/dark.css",
+               "classic" => "inc/styles/classic/classic.css",
+               "gorilla" => "inc/styles/gorilla/gorilla.css"
+   );
+
+
+
+
+?>
diff --git a/www/inc/config.inc.php.dist b/www/inc/config.inc.php.dist
deleted file mode 100644
index 14e8ad8..0000000
--- a/www/inc/config.inc.php.dist
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-#base dirname
-  $root = dirname(dirname(__FILE__) . "../");
-# ===========================================================================
-# dir index
-	 $sortinmonth = 0;// 1 - alphabetically
-	 								  // 0 - by date (reverse)
-
-# ===========================================================================
-# default languages
-# use UA's accept language
-require_once("$root/inc/l10nget.inc.php"); //get from UA
-if (isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) {
-	$sclang = get_lang_from_agent($_SERVER["HTTP_ACCEPT_LANGUAGE"]);
-} else {
-	$sclang = "en";
-}
-l10n::set("$root/l10n/".$GLOBALS['sclang']."/exif.lang");
-
-# ===========================================================================
-#Name to dsplay on the gallery
-$scnamegallery = "Photo Gallery Index";
-
-
-# ===========================================================================
-# albums to show
-   $yearsince = 1999;
-#images FIXME - this is stylesheet's job
-   $img["left"] = "left.png";
-   $img["right"] = "right.png";
-   $img["top"] = "top.png";
-# ===========================================================================
-#thumbnail behaviour
-   //keep this unset for dynamic thumbnail size
-   //$thumbsize = "fixed";
-   //How the previous and Next thumbnails should be scaled
-   // 1 is 1:1, >1 is smaller, <1 is bigger
-   $PNthumbScale = 1.5;
-# Photos Copyright
-#	CHANGE THIS! I am not trying to take over the world ;)
-	 $copy = "Copyright &copy; 1999-2005 Jakub Steiner";
-#app info
-   $app["name"] = "Original"; // opensource remote image gallery,
-                              // initialy not as lovely 
-   $app["url"] = "http://jimmac.musichall.cz/original.php3";
-   $app["version"] = "0.12pre";
-   $exif_show = array("DateTime"=>__("Time Taken"), 
-	 						"Make"=>__("Camera Manufacturer"), 
-	 						"Model"=>__("Camera Model"), 
-							"FocalLength"=>__("Real Focal Length"), 
-	 						"FocalLengthIn35mmFilm"=>__("Focal Length Relative to 35mm Film"),
-	 						"FNumber"=>__("F Stop"), 
-							"ExposureTime"=>__("Time of Exposure"), 
-							"ISOSpeedRatings"=>__("Film/Chip Sensitivity"),
-							"Flash"=>__("Flash"));
-# ===========================================================================
-## Gallery Directory
-# This is a path relative to the directory where original is installed
-# eg. it can be "../galleries" to use a galleries dir above the original dir.
-  $gallery_dir="galleries";
-
-#Enable this to access extended tracking functionality
-#depends on sqlite
-$have_sqlite = 0;
-
-# This controls wheather web visitors will be able to post
-# comments to images
-$comments = 1;
-
-# Access Log/Counter
-# $log_access = 0; // no access logging
-$log_access = 1; 
-
-#css styles
-   $themes = array(
-               "dark" => "inc/styles/dark/dark.css",
-               "classic" => "inc/styles/classic/classic.css",
-               "gorilla" => "inc/styles/gorilla/gorilla.css"
-   );
-
-
-
-
-?>
diff --git a/www/index.php b/www/index.php
index 915acb8..60447ca 100644
--- a/www/index.php
+++ b/www/index.php
@@ -9,7 +9,7 @@ if (file_exists("inc/config.inc.php") {
   require_once("inc/config.inc.php");
 } else {
   # Load fallback configuration
-  require_once("inc/config.inc.php.dist");
+  require_once("inc/config.dist.inc.php");
 }
 
 require_once("inc/www.class.inc.php");
-- 
cgit v1.2.3