Fix php 5.3 support and prepare languages

diff --git a/file.php b/file.php
index 32c097f768b47ea7a9a5293adadab144909e66c7..0a6e32cb98cc5cd2955834fe19585099dadfbb26 100644 (file)
--- a/file.php
+++ b/file.php
@@ -19,9 +19,10 @@
  */
 define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
 
-require (JIRAFEAU_ROOT.'lib/config.php');
-require (JIRAFEAU_ROOT.'lib/settings.php');
-require (JIRAFEAU_ROOT.'lib/functions.php');
+require (JIRAFEAU_ROOT . 'lib/lang.php');
+require (JIRAFEAU_ROOT . 'lib/config.php');
+require (JIRAFEAU_ROOT . 'lib/settings.php');
+require (JIRAFEAU_ROOT . 'lib/functions.php');
 
 if (isset ($_GET['h']) && !empty ($_GET['h']))
 {
@@ -31,7 +32,7 @@ if (isset ($_GET['h']) && !empty ($_GET['h']))
     if (isset ($_GET['d']) && !empty ($_GET['d']))
         $delete_code = $_GET['d'];
 
-    if (!ereg ('[0-9a-f]{32}$', $link_name))
+    if (!preg_match ('/[0-9a-f]{32}$/', $link_name))
     {
         header ("HTTP/1.0 404 Not Found");
 

diff --git a/index.php b/index.php
index eb8d577fc67074278c2c17e44b12fd8b5911f961..8a3166541bd34a3ee060da5981355fe7525e82f2 100644 (file)
--- a/index.php
+++ b/index.php
@@ -20,6 +20,7 @@
 define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
 define ('DEBUG', true);
 
+require (JIRAFEAU_ROOT . 'lib/lang.php');
 require (JIRAFEAU_ROOT . 'lib/config.php');
 require (JIRAFEAU_ROOT . 'lib/settings.php');
 require (JIRAFEAU_ROOT . 'lib/functions.php');
@@ -61,6 +62,13 @@ if ($writable && isset ($_POST['jirafeau']))
                          $key, $time, $cfg, $_SERVER['REMOTE_ADDR']);
 }
 
+if (file_exists (JIRAFEAU_ROOT . 'install.php')
+    && !file_exists (JIRAFEAU_ROOT.'lib/config.local.php'))
+{
+    header('Location: install.php'); 
+    exit;
+}
+
 require (JIRAFEAU_ROOT.'lib/template/header.php');
 
 /* Checking for errors. */

diff --git a/install.php b/install.php
old mode 100644 (file)
new mode 100755 (executable)
index 8a34477..1d052c1
--- a/install.php
+++ b/install.php
@@ -23,6 +23,7 @@ define ('QUOTE', "'");
 define ('JIRAFEAU_CFG', JIRAFEAU_ROOT.'lib/config.local.php');
 define ('JIRAFEAU_VAR_RAND_LENGTH', 15);
 
+require (JIRAFEAU_ROOT . 'lib/lang.php');
 require (JIRAFEAU_ROOT . 'lib/config.php');
 
 function

diff --git a/lib/config.php b/lib/config.php
index 25926e1b96f2b1902a869803f898def3e3505d23..a4b443a78085c5b729f2a6ea267e555a5c1c262e 100644 (file)
--- a/lib/config.php
+++ b/lib/config.php
@@ -20,17 +20,12 @@
  * default configuration
  * if you want to change this, overwrite in a config.local.php file
  */
-// don't forget the ending '/'
-    $cfg['web_root'] = '';
-
+/* don't forget the ending '/' */
+$cfg['web_root'] = '';
 $cfg['var_root'] = '';
-
 $cfg['lang'] = '';
-
 $cfg['style'] = 'default';
-
 $cfg['rewrite'] = false;
-
 $cfg['password'] = '';
 
 if ((basename (__FILE__) != 'config.local.php')

diff --git a/lib/lang.php b/lib/lang.php
new file mode 100755 (executable)
index 0000000..fd67e2d
--- /dev/null
+++ b/lib/lang.php
@@ -0,0 +1,26 @@
+<?php\r
+/*\r
+ *  Jirafeau, your web file repository\r
+ *  Copyright (C) 2012  Jerome Jutteau <j.jutteau@gmail.com>\r
+ *\r
+ *  This program is free software: you can redistribute it and/or modify\r
+ *  it under the terms of the GNU Affero General Public License as\r
+ *  published by the Free Software Foundation, either version 3 of the\r
+ *  License, or (at your option) any later version.\r
+ *\r
+ *  This program is distributed in the hope that it will be useful,\r
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+ *  GNU Affero General Public License for more details.\r
+ *\r
+ *  You should have received a copy of the GNU Affero General Public License\r
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
+ */\r
+\r
+// Translation (TODO)\r
+function _($text)\r
+{\r
+    return ("$text");\r
+}\r
+\r
+?>
\ No newline at end of file

diff --git a/lib/settings.php b/lib/settings.php
index afd16c8c810237ed759b935dd6dae24128920754..7d9db2fb879246ede04deb1d126e7d7331ecfff2 100644 (file)
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -25,20 +25,9 @@ define ('JIRAFEAU_VERSION', '0.4');
 define ('VAR_FILES', $cfg['var_root'] . 'files/');
 define ('VAR_LINKS', $cfg['var_root'] . 'links/');
 
-// i18n
-
-setlocale (LC_ALL, $cfg['lang']);
-
-bindtextdomain (JIRAFEAU_PACKAGE, JIRAFEAU_ROOT.'lib/locale');
-textdomain (JIRAFEAU_PACKAGE);
-
-
 // useful constants
-
 if (!defined ('NL'))
-{
     define ('NL', "\n");
-}
 
 define ('JIRAFEAU_INFINITY', -1);
 define ('JIRAFEAU_MINUTE', 60); // 60