Fix previous commit by adding forgotten files

diff --git a/file.php b/file.php
index 0a6e32cb98cc5cd2955834fe19585099dadfbb26..cc3f163c898820707dfab432fae5547b47e3ceca 100644 (file)
--- a/file.php
+++ b/file.php
@@ -37,7 +37,7 @@ if (isset ($_GET['h']) && !empty ($_GET['h']))
         header ("HTTP/1.0 404 Not Found");
 
         require (JIRAFEAU_ROOT.'lib/template/header.php');
         header ("HTTP/1.0 404 Not Found");
 
         require (JIRAFEAU_ROOT.'lib/template/header.php');

-        echo '<div class="error"><p>Error 404: Not Found</p></div>';
+        echo '<div class="error"><p>' . _('Error 404: Not Found') . '</p></div>';

         require (JIRAFEAU_ROOT.'lib/template/footer.php');
         exit;
     }
         require (JIRAFEAU_ROOT.'lib/template/footer.php');
         exit;
     }


@@ -80,8 +80,9 @@ if (isset ($_GET['h']) && !empty ($_GET['h']))
             jirafeau_delete ($link_name);
             require (JIRAFEAU_ROOT.'lib/template/header.php');
             echo '<div class="error"><p>'.
             jirafeau_delete ($link_name);
             require (JIRAFEAU_ROOT.'lib/template/header.php');
             echo '<div class="error"><p>'.

-                _('The time limit of this file has expired.' .
-                  'It has been deleted.') . '</p></div>';
+                _('The time limit of this file has expired.') . ' ' .
+                _('File has been deleted.') .
+                '</p></div>';

             require (JIRAFEAU_ROOT.'lib/template/footer.php');
             exit;
         }
             require (JIRAFEAU_ROOT.'lib/template/footer.php');
             exit;
         }


@@ -96,9 +97,9 @@ if (isset ($_GET['h']) && !empty ($_GET['h']))
                     "<?php echo $_SERVER['REQUEST_URI']; ?>" method =
                     "post"> <input type = "hidden" name = "jirafeau" value =
                     "<?php echo JIRAFEAU_VERSION; ?>" /><fieldset>
                     "<?php echo $_SERVER['REQUEST_URI']; ?>" method =
                     "post"> <input type = "hidden" name = "jirafeau" value =
                     "<?php echo JIRAFEAU_VERSION; ?>" /><fieldset>

-                    <legend><?php echo _('Key protection');
+                    <legend><?php echo _('Password protection');

                 ?></legend> <table> <tr>
                 ?></legend> <table> <tr>

-                    <td><?php echo _('Give the key of this file:');
+                    <td><?php echo _('Give the password of this file:');

                 ?><input type = "password" name =
                     "key" /></td> </tr> <tr> <td><input type =
                     "submit" value =
                 ?><input type = "password" name =
                     "key" /></td> </tr> <tr> <td><input type =
                     "submit" value =


@@ -114,7 +115,8 @@ if (isset ($_GET['h']) && !empty ($_GET['h']))
                     header ("HTTP/1.0 403 Forbidden");
 
                     require (JIRAFEAU_ROOT.'lib/template/header.php');
                     header ("HTTP/1.0 403 Forbidden");
 
                     require (JIRAFEAU_ROOT.'lib/template/header.php');

-                    echo '<div class="error"><p>Error 403: Forbidden</p></div>';
+                    echo '<div class="error"><p>' . _('Error 403: Forbidden') .
+                    '</p></div>';

                     require (JIRAFEAU_ROOT.'lib/template/footer.php');
                     exit;
                 }
                     require (JIRAFEAU_ROOT.'lib/template/footer.php');
                     exit;
                 }


@@ -139,7 +141,8 @@ if (isset ($_GET['h']) && !empty ($_GET['h']))
         header ("HTTP/1.0 404 Not Found");
 
         require (JIRAFEAU_ROOT.'lib/template/header.php');
         header ("HTTP/1.0 404 Not Found");
 
         require (JIRAFEAU_ROOT.'lib/template/header.php');

-        echo '<div class="error"><p>Error 404: Not Found</p></div>';
+        echo '<div class="error"><p>' . _('Error 404: Not Found') .
+        '</p></div>';

         require (JIRAFEAU_ROOT.'lib/template/footer.php');
         exit;
     }
         require (JIRAFEAU_ROOT.'lib/template/footer.php');
         exit;
     }

diff --git a/index.php b/index.php
index 8a3166541bd34a3ee060da5981355fe7525e82f2..912b1ef76c2adf7c9b77ae68603a35e8a9f8e0aa 100644 (file)
--- a/index.php
+++ b/index.php
@@ -20,10 +20,10 @@
 define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
 define ('DEBUG', true);
 
 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');
 require (JIRAFEAU_ROOT . 'lib/config.php');
 require (JIRAFEAU_ROOT . 'lib/settings.php');
 require (JIRAFEAU_ROOT . 'lib/functions.php');

+require (JIRAFEAU_ROOT . 'lib/lang.php');

 
 /* check if the destination dirs are writable */
 $writable = is_writable (VAR_FILES) && is_writable (VAR_LINKS);
 
 /* check if the destination dirs are writable */
 $writable = is_writable (VAR_FILES) && is_writable (VAR_LINKS);


@@ -63,13 +63,13 @@ if ($writable && isset ($_POST['jirafeau']))
 }
 
 if (file_exists (JIRAFEAU_ROOT . 'install.php')
 }
 
 if (file_exists (JIRAFEAU_ROOT . 'install.php')

-    && !file_exists (JIRAFEAU_ROOT.'lib/config.local.php'))
+    && !file_exists (JIRAFEAU_ROOT . 'lib/config.local.php'))

 {
     header('Location: install.php'); 
     exit;
 }
 
 {
     header('Location: install.php'); 
     exit;
 }
 

-require (JIRAFEAU_ROOT.'lib/template/header.php');
+require (JIRAFEAU_ROOT . 'lib/template/header.php');

 
 /* Checking for errors. */
 if (!is_writable (VAR_FILES))
 
 /* Checking for errors. */
 if (!is_writable (VAR_FILES))


@@ -108,20 +108,20 @@ if (!has_error () && !empty ($res))
         }
 
         echo '<div class="message">'.NL;
         }
 
         echo '<div class="message">'.NL;

-        echo '<p>'._('File uploaded! Copy the following URL to get it:').
-            '<br />' . NL;
+        echo '<p>' . _('File uploaded! Copy the following URL to get it') .
+            ':<br />' . NL;

         echo '<a href="'.$link.'">'.$link.'</a>' . NL;
 
         if ($time != JIRAFEAU_INFINITY)
         {
         echo '<a href="'.$link.'">'.$link.'</a>' . NL;
 
         if ($time != JIRAFEAU_INFINITY)
         {

-            echo '<br />'._('This file is valid until the following date:') .
-                '<br /><strong>' . strftime ('%c', $time) . '</strong>';
+            echo '<br />' . _('This file is valid until the following date') .
+                ':<br /><strong>' . strftime ('%c', $time) . '</strong>';

         }
 
         echo '</p></div>';
 
         echo '<div class="message">' . NL;
         }
 
         echo '</p></div>';
 
         echo '<div class="message">' . NL;

-        echo '<p>' . _('Keep the following URL to delete it:') . '<br />' . NL;
+        echo '<p>' . _('Keep the following URL to delete it at any moment') . ':<br />' . NL;

         echo '<a href="' . $delete_link . '">' . $delete_link . '</a>' . NL;
         echo '</p></div>';
     }
         echo '<a href="' . $delete_link . '">' . $delete_link . '</a>' . NL;
         echo '</p></div>';
     }


@@ -140,19 +140,19 @@ if (!has_error () && $writable)
         <legend><?php echo _('Upload a file');
     ?></legend> <p><input type = "file" name = "file" size =
         "30" /></p> <p class =
         <legend><?php echo _('Upload a file');
     ?></legend> <p><input type = "file" name = "file" size =
         "30" /></p> <p class =

-        "config"><?php printf (_('Maximum file size: %dMB'),
-                                  jirafeau_get_max_upload_size () / (1024 *
-                                                                     1024));
+        "config"><?php printf ('%s: %dMB', _('Maximum file size'),
+                               jirafeau_get_max_upload_size () / (1024 *
+                                                                  1024));

     ?></p> <p><input type = "submit" value =
         "<?php echo _('Send'); ?>" /></p>
         <hr /><div id = "moreoptions"> <p><label><input type =
         "checkbox" name =
         "one_time_download" /><?php echo _('One time download');
     ?></label></p> <p><label for = "input_key"
     ?></p> <p><input type = "submit" value =
         "<?php echo _('Send'); ?>" /></p>
         <hr /><div id = "moreoptions"> <p><label><input type =
         "checkbox" name =
         "one_time_download" /><?php echo _('One time download');
     ?></label></p> <p><label for = "input_key"

-       ><?php echo _('Password:');
+       ><?php echo _('Password') . ':';

     ?></label> <input type = "text" name = "key" id = "input_key" /></p>
         <p><label for = "select_time"
     ?></label> <input type = "text" name = "key" id = "input_key" /></p>
         <p><label for = "select_time"

-       ><?php echo _('Time limit:');
+       ><?php echo _('Time limit') . ':';

     ?></label>
         <select name = "time" id = "select_time">
         <option value = "none"><?php echo _('None');
     ?></label>
         <select name = "time" id = "select_time">
         <option value = "none"><?php echo _('None');

diff --git a/install.php b/install.php
index 1d052c1e71c8a77b6cd5a5baa8f3bc29921c8f8c..9d55b3b919b173f125990a0aa6a59a1d502cae1c 100755 (executable)
--- a/install.php
+++ b/install.php
@@ -262,7 +262,6 @@ case 2:
 
 case 1:
 default:
 
 case 1:
 default:

-    $languages = array ('' => 'English', 'fr_FR.UTF-8' => 'Français');

     ?><h2><?php printf (_('Installation of Jirafeau - step %d out of %d'),
                             1, 3);
     ?></h2> <div id = "install"> <form action =
     ?><h2><?php printf (_('Installation of Jirafeau - step %d out of %d'),
                             1, 3);
     ?></h2> <div id = "install"> <form action =


@@ -279,7 +278,7 @@ default:
     ?></label></td>
         <td class = "field">
         <select name = "lang" id = "select_lang">
     ?></label></td>
         <td class = "field">
         <select name = "lang" id = "select_lang">

-        <?php foreach ($languages as $key => $item)
+        <?php foreach ($languages_list as $key => $item)

     {
         echo '<option value="'.$key.'"'.($key ==
                                          $cfg['lang'] ? ' selected="selected"'
     {
         echo '<option value="'.$key.'"'.($key ==
                                          $cfg['lang'] ? ' selected="selected"'

diff --git a/lib/config.php b/lib/config.php
index a4b443a78085c5b729f2a6ea267e555a5c1c262e..25b5620601a2072a45572718394c00eda57fb61c 100644 (file)
--- a/lib/config.php
+++ b/lib/config.php
@@ -21,9 +21,10 @@
  * if you want to change this, overwrite in a config.local.php file
  */
 /* don't forget the ending '/' */
  * if you want to change this, overwrite in a config.local.php file
  */
 /* don't forget the ending '/' */

+global $cfg;

 $cfg['web_root'] = '';
 $cfg['var_root'] = '';
 $cfg['web_root'] = '';
 $cfg['var_root'] = '';

-$cfg['lang'] = '';
+$cfg['lang'] = 'auto';

 $cfg['style'] = 'default';
 $cfg['rewrite'] = false;
 $cfg['password'] = '';
 $cfg['style'] = 'default';
 $cfg['rewrite'] = false;
 $cfg['password'] = '';

diff --git a/lib/lang.php b/lib/lang.php
index fd67e2d8d0655030de5ea054ee02f602c1be130b..b1265f82b8d1a5852b96cc067ced9a348e558b69 100755 (executable)
--- a/lib/lang.php
+++ b/lib/lang.php
@@ -17,10 +17,41 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
  */\r
 \r
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
  */\r
 \r

-// Translation (TODO)\r
-function _($text)\r
+ global $languages_list;\r
+ $languages_list = array ('auto' => 'Automatic',\r
+                          'en' => 'English',\r
+                          'fr' => 'Français');\r
+\r
+/* Translation */\r
+function _ ($text)\r

 {\r
 {\r

-    return ("$text");\r
+    $cfg = $GLOBALS['cfg'];\r
+    $languages_list = $GLOBALS['languages_list'];\r
+\r
+    /* Detect user's langage if we are in automatic mode. */\r
+    if (strcmp ($cfg['lang'], 'auto') == 0)\r
+        $l = substr ($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2);\r
+    else\r
+        $l = $cfg['lang'];\r
+\r
+    /* Is the langage in the list ? */\r
+    $found = false;\r
+    foreach ($languages_list as $key => $v)\r
+        if (strcmp ($l, $key) == 0)\r
+            $found = true;\r
+\r
+    /* Get translation execpt for english. */\r
+    if ($found && strcmp ($l, "en"))\r
+    {\r
+        /* $tr is defined in this requirement. */\r
+        require (JIRAFEAU_ROOT . "lib/lang/$l.php");\r
+\r
+        foreach ($tr as $o => $t)\r
+            if (strcmp ($text, $o) == 0)\r
+                return "$t";\r
+    }\r
+    /* Return original text if no translation is found or already in english. */\r
+    return ($text);\r

 }\r
 \r
 ?>
\ No newline at end of file
 }\r
 \r
 ?>
\ No newline at end of file

diff --git a/lib/settings.php b/lib/settings.php
index 7d9db2fb879246ede04deb1d126e7d7331ecfff2..477e9c703a9c6079d3f2ae87525fa6f08ee6b859 100644 (file)
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -16,16 +16,15 @@
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */

-// Jirafeau constants
+/* Jirafeau constants */

 define ('JIRAFEAU_PACKAGE', 'Jirafeau');
 define ('JIRAFEAU_PACKAGE', 'Jirafeau');

-define ('JIRAFEAU_VERSION', '0.4');
-
-// directories
+define ('JIRAFEAU_VERSION', '0.9');

 
 

+/* Directories. */

 define ('VAR_FILES', $cfg['var_root'] . 'files/');
 define ('VAR_LINKS', $cfg['var_root'] . 'links/');
 
 define ('VAR_FILES', $cfg['var_root'] . 'files/');
 define ('VAR_LINKS', $cfg['var_root'] . 'links/');
 

-// useful constants
+/* Useful constants. */

 if (!defined ('NL'))
     define ('NL', "\n");
 
 if (!defined ('NL'))
     define ('NL', "\n");
 

diff --git a/lib/template/footer.php b/lib/template/footer.php
index 488694b326ed9cb1dafb60c0558cb9eb2a988a22..09732ec7996c331d9d96e407ec3c7ff848893e07 100644 (file)
--- a/lib/template/footer.php
+++ b/lib/template/footer.php
@@ -1,5 +1,5 @@
 <div id="copyright">
 <div id="copyright">

-<p><a href="https://gitorious.org/jirafeau/"><?php echo _('powered by Jirafeau'); ?></a><br /><a href="http://www.gnu.org/licenses/agpl.html">copyright</a> &copy; 2008-2009 <a href="https://gitorious.org/jirafeau/">Jirafeau Project</a></p>
+<p><a href="https://gitorious.org/jirafeau/"><?php echo _('powered by Jirafeau'); ?></a><br /><a href="http://www.gnu.org/licenses/agpl.html">copyright</a> &copy; 2008-2012 <a href="https://gitorious.org/jirafeau/"><?php echo _('Jirafeau Project'); ?></a></p>

 </div>
 </div>
 
 </div>
 </div>
 

diff --git a/lib/template/header.php b/lib/template/header.php
index 7b06ae7945d96b45de97d129a0ce990d6b2d4386..f9a490476b0d6a71fcc8258ebad3bc5f691b0ff2 100644 (file)
--- a/lib/template/header.php
+++ b/lib/template/header.php
@@ -1,10 +1,10 @@
 <?php
 header("Vary: Accept");
 <?php
 header("Vary: Accept");

-if(stristr($_SERVER['HTTP_ACCEPT'], 'application/xhtml+xml')) {
-  $content_type = 'application/xhtml+xml; charset=utf-8';
-}  else {
-  $content_type = 'text/html; charset=utf-8';
-}
+
+$content_type = 'text/html; charset=utf-8';
+
+if (stristr ($_SERVER['HTTP_ACCEPT'], 'application/xhtml+xml'))
+    $content_type = 'application/xhtml+xml; charset=utf-8';

 
 header('Content-Type: ' . $content_type);
 
 
 header('Content-Type: ' . $content_type);