Security fix, bug fix and project name change.

[jirafeau_mojo42.git] / install.php

diff --git a/pub/install.php b/install.php
similarity index 75%
rename from pub/install.php
rename to install.php
index faf79116acec51ae25fe95a161fdc12653612fcf..dfe094cb67086cd395c1b6548562e7d65556ff3d 100644 (file)
--- a/pub/install.php
+++ b/install.php
@@ -1,6 +1,6 @@
 <?php
 /*
 <?php
 /*

- *  Jyraphe, your web file repository
+ *  Jirafeau, your web file repository

  *  Copyright (C) 2008  Julien "axolotl" BERNARD <axolotl@magieeternelle.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  Copyright (C) 2008  Julien "axolotl" BERNARD <axolotl@magieeternelle.org>
  *
  *  This program is free software: you can redistribute it and/or modify


@@ -17,29 +17,29 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 

-define('JYRAPHE_ROOT', dirname(__FILE__) . '/');
+define('JIRAFEAU_ROOT', dirname(__FILE__) . '/');

 define('NL', "\n");
 define('QUOTE', "'");
 
 define('NL', "\n");
 define('QUOTE', "'");
 

-define('JYRAPHE_CFG', JYRAPHE_ROOT . 'lib/config.local.php');
-define('JYRAPHE_VAR_RAND_LENGTH', 15);
+define('JIRAFEAU_CFG', JIRAFEAU_ROOT . 'lib/config.local.php');
+define('JIRAFEAU_VAR_RAND_LENGTH', 15);

 
 

-require(JYRAPHE_ROOT . 'lib/config.php');
+require(JIRAFEAU_ROOT . 'lib/config.php');

 
 

-function jyraphe_quoted($str) {
+function jirafeau_quoted($str) {

   return QUOTE . str_replace(QUOTE, "\'", $str) . QUOTE;
 }
 
   return QUOTE . str_replace(QUOTE, "\'", $str) . QUOTE;
 }
 

-function jyraphe_export_cfg($cfg) {
-  $handle = fopen(JYRAPHE_CFG, 'w');
+function jirafeau_export_cfg($cfg) {
+  $handle = fopen(JIRAFEAU_CFG, 'w');

   fwrite($handle, '<?php' . NL);
   fwrite($handle, '/* ' . _('This file was generated by the install process. You can edit it. Please see config.php to understand the configuration items.') . ' */' . NL);
   foreach($cfg as $key => $item) {
   fwrite($handle, '<?php' . NL);
   fwrite($handle, '/* ' . _('This file was generated by the install process. You can edit it. Please see config.php to understand the configuration items.') . ' */' . NL);
   foreach($cfg as $key => $item) {

-    fwrite($handle, '$cfg[' . jyraphe_quoted($key) . '] = ');
+    fwrite($handle, '$cfg[' . jirafeau_quoted($key) . '] = ');

     if(is_bool($item)) {
       fwrite($handle, ($item ? 'true' : 'false'));
     } else if(is_string($item)) {
     if(is_bool($item)) {
       fwrite($handle, ($item ? 'true' : 'false'));
     } else if(is_string($item)) {

-      fwrite($handle, jyraphe_quoted($item));
+      fwrite($handle, jirafeau_quoted($item));

     } else {
       fwrite($handle, 'null');
     }
     } else {
       fwrite($handle, 'null');
     }


@@ -49,7 +49,7 @@ function jyraphe_export_cfg($cfg) {
   fclose($handle);
 }
 
   fclose($handle);
 }
 

-function jyraphe_mkdir($path) {
+function jirafeau_mkdir($path) {

   if(!file_exists($path)) {
     if(!@mkdir($path, 0755)) {
       return false;
   if(!file_exists($path)) {
     if(!@mkdir($path, 0755)) {
       return false;


@@ -64,25 +64,25 @@ function jyraphe_mkdir($path) {
  * @param $path is the file or directory to be tested.
  * @return true if $path is writable.
  */
  * @param $path is the file or directory to be tested.
  * @return true if $path is writable.
  */

-function jyraphe_is_writable($path) {
+function jirafeau_is_writable($path) {

   return is_writable($path) || @chmod($path, 0777); // "@" gets rid of error messages.
 }
 
   return is_writable($path) || @chmod($path, 0777); // "@" gets rid of error messages.
 }
 

-function jyraphe_check_var_dir($path) {
+function jirafeau_check_var_dir($path) {

   $mkdir_str1 = _('The following directory could not be created:');
   $mkdir_str2 = _('You should create this directory by hand.');
   $write_str1 = _('The following directory is not writable:');
   $write_str2 = _('You should give the write right to the web server on this directory.');
   $solution_str = _('Here is a solution:');
 
   $mkdir_str1 = _('The following directory could not be created:');
   $mkdir_str2 = _('You should create this directory by hand.');
   $write_str1 = _('The following directory is not writable:');
   $write_str2 = _('You should give the write right to the web server on this directory.');
   $solution_str = _('Here is a solution:');
 

-  if(!jyraphe_mkdir($path)) {
+  if(!jirafeau_mkdir($path)) {

     return array(
       'has_error' => true,
       'why' => $mkdir_str1 . '<br /><code>' . $path . '</code><br />' . $solution_str . '<br />' . $mkdir_str2
     );
   }
 
     return array(
       'has_error' => true,
       'why' => $mkdir_str1 . '<br /><code>' . $path . '</code><br />' . $solution_str . '<br />' . $mkdir_str2
     );
   }
 

-  if(!jyraphe_is_writable($path)) {
+  if(!jirafeau_is_writable($path)) {

     return array(
       'has_error' => true,
       'why' => $write_str1 . '<br /><code>' . $path . '</code><br />' . $solution_str . '<br />' . $write_str2
     return array(
       'has_error' => true,
       'why' => $write_str1 . '<br /><code>' . $path . '</code><br />' . $solution_str . '<br />' . $write_str2


@@ -92,14 +92,14 @@ function jyraphe_check_var_dir($path) {
   foreach(array('files', 'links', 'trash') as $subdir) {
     $subpath = $path . $subdir;
 
   foreach(array('files', 'links', 'trash') as $subdir) {
     $subpath = $path . $subdir;
 

-    if(!jyraphe_mkdir($subpath)) {
+    if(!jirafeau_mkdir($subpath)) {

       return array(
         'has_error' => true,
         'why' => $mkdir_str1 . '<br /><code>' . $subpath . '</code><br />' . $solution_str . '<br />' . $mkdir_str2
       );
     }
 
       return array(
         'has_error' => true,
         'why' => $mkdir_str1 . '<br /><code>' . $subpath . '</code><br />' . $solution_str . '<br />' . $mkdir_str2
       );
     }
 

-    if(!jyraphe_is_writable($subpath)) {
+    if(!jirafeau_is_writable($subpath)) {

       return array(
         'has_error' => true,
         'why' => $write_str1 . '<br /><code>' . $subpath . '</code><br />' . $solution_str . '<br />' . $write_str2
       return array(
         'has_error' => true,
         'why' => $write_str1 . '<br /><code>' . $subpath . '</code><br />' . $solution_str . '<br />' . $write_str2


@@ -111,24 +111,24 @@ function jyraphe_check_var_dir($path) {
   return array('has_error' => false, 'why' => '');
 }
 
   return array('has_error' => false, 'why' => '');
 }
 

-function jyraphe_add_ending_slash($path) {
+function jirafeau_add_ending_slash($path) {

   return $path . ((substr($path, -1) == '/') ? '' : '/');
 }
 
   return $path . ((substr($path, -1) == '/') ? '' : '/');
 }
 

-if(!file_exists(JYRAPHE_CFG)) {
+if(!file_exists(JIRAFEAU_CFG)) {

   // we try to create an empty one
   // we try to create an empty one

-  if(!@touch(JYRAPHE_CFG)) {
-    require(JYRAPHE_ROOT . 'lib/template/header.php');
+  if(!@touch(JIRAFEAU_CFG)) {
+    require(JIRAFEAU_ROOT . 'lib/template/header.php');

     echo '<div class="error"><p>' . _('The local configuration file could not be created. Create a <code>lib/config.local.php</code> file and give the write right to the web server (preferred solution), or give the write right to the web server on the <code>lib</code> directory.') . '</p></div>';
     echo '<div class="error"><p>' . _('The local configuration file could not be created. Create a <code>lib/config.local.php</code> file and give the write right to the web server (preferred solution), or give the write right to the web server on the <code>lib</code> directory.') . '</p></div>';

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

     exit;
   }
 }
 
     exit;
   }
 }
 

-if (!is_writable(JYRAPHE_CFG) && !@chmod(JYRAPHE_CFG, '0666')) {
-  require(JYRAPHE_ROOT . 'lib/template/header.php');
+if (!is_writable(JIRAFEAU_CFG) && !@chmod(JIRAFEAU_CFG, '0666')) {
+  require(JIRAFEAU_ROOT . 'lib/template/header.php');

   echo '<div class="error"><p>' . _('The local configuration is not writable by the web server. Give the write right to the web server on the <code>lib/config.local.php</code> file.') . '</p></div>';
   echo '<div class="error"><p>' . _('The local configuration is not writable by the web server. Give the write right to the web server on the <code>lib/config.local.php</code> file.') . '</p></div>';

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

   exit;
 }
 
   exit;
 }
 


@@ -136,13 +136,13 @@ if(isset($_POST['step']) && isset($_POST['next'])) {
   switch($_POST['step']) {
   case 1:
     $cfg['lang'] = $_POST['lang'];
   switch($_POST['step']) {
   case 1:
     $cfg['lang'] = $_POST['lang'];

-    jyraphe_export_cfg($cfg);
+    jirafeau_export_cfg($cfg);

     break;
 
   case 2:
     break;
 
   case 2:

-    $cfg['web_root'] = jyraphe_add_ending_slash($_POST['web_root']);
-    $cfg['var_root'] = jyraphe_add_ending_slash($_POST['var_root']);
-    jyraphe_export_cfg($cfg);
+    $cfg['web_root'] = jirafeau_add_ending_slash($_POST['web_root']);
+    $cfg['var_root'] = jirafeau_add_ending_slash($_POST['var_root']);
+    jirafeau_export_cfg($cfg);

     break;
 
   default:
     break;
 
   default:


@@ -151,8 +151,8 @@ if(isset($_POST['step']) && isset($_POST['next'])) {
 
 }
 
 
 }
 

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

 
 $current = 1;
 if(isset($_POST['next'])) {
 
 $current = 1;
 if(isset($_POST['next'])) {


@@ -166,16 +166,16 @@ if(isset($_POST['next'])) {
 switch($current) {
   case 3:
 ?>
 switch($current) {
   case 3:
 ?>

-<h2><?php printf(_('Installation of Jyraphe - step %d out of %d'), 3, 3); ?></h2>
+<h2><?php printf(_('Installation of Jirafeau - step %d out of %d'), 3, 3); ?></h2>

 <div id="install">
 <form action="<?php echo basename(__FILE__); ?>" method="post">
 <div id="install">
 <form action="<?php echo basename(__FILE__); ?>" method="post">

-<input type="hidden" name="jyraphe" value="<?php echo JYRAPHE_VERSION; ?>" />
+<input type="hidden" name="jirafeau" value="<?php echo JIRAFEAU_VERSION; ?>" />

 <input type="hidden" name="step" value="3" />
 <fieldset>
   <legend><?php echo _('Finalisation'); ?></legend>
   <table>
     <tr>
 <input type="hidden" name="step" value="3" />
 <fieldset>
   <legend><?php echo _('Finalisation'); ?></legend>
   <table>
     <tr>

-      <td class="info" colspan="2"><?php echo _('Jyraphe is setting the website according to the configuration you provided.'); ?></td>
+      <td class="info" colspan="2"><?php echo _('Jirafeau is setting the website according to the configuration you provided.'); ?></td>

     </tr>
     <tr>
       <td class="nav previous"><input type="submit" name="previous" value="<?php echo _('Previous step'); ?>" /></td>
     </tr>
     <tr>
       <td class="nav previous"><input type="submit" name="previous" value="<?php echo _('Previous step'); ?>" /></td>


@@ -187,12 +187,12 @@ switch($current) {
 </div>
 
 <?php
 </div>
 
 <?php

-    $err = jyraphe_check_var_dir($cfg['var_root']);
+    $err = jirafeau_check_var_dir($cfg['var_root']);

     if($err['has_error']) {
       echo '<div class="error"><p>' . $err['why'] . '<br />' . NL;
 ?>
 <form action="<?php echo basename(__FILE__); ?>" method="post">
     if($err['has_error']) {
       echo '<div class="error"><p>' . $err['why'] . '<br />' . NL;
 ?>
 <form action="<?php echo basename(__FILE__); ?>" method="post">

-<input type="hidden" name="jyraphe" value="<?php echo JYRAPHE_VERSION; ?>" />
+<input type="hidden" name="jirafeau" value="<?php echo JIRAFEAU_VERSION; ?>" />

 <input type="hidden" name="step" value="3" />
 <input type="submit" name="retry" value="<?php echo _('Retry this step'); ?>" />
 </form>
 <input type="hidden" name="step" value="3" />
 <input type="submit" name="retry" value="<?php echo _('Retry this step'); ?>" />
 </form>


@@ -205,16 +205,16 @@ switch($current) {
 
   case 2:
 ?>
 
   case 2:
 ?>

-<h2><?php printf(_('Installation of Jyraphe - step %d out of %d'), 2, 3); ?></h2>
+<h2><?php printf(_('Installation of Jirafeau - step %d out of %d'), 2, 3); ?></h2>

 <div id="install">
 <form action="<?php echo basename(__FILE__); ?>" method="post">
 <div id="install">
 <form action="<?php echo basename(__FILE__); ?>" method="post">

-<input type="hidden" name="jyraphe" value="<?php echo JYRAPHE_VERSION; ?>" />
+<input type="hidden" name="jirafeau" value="<?php echo JIRAFEAU_VERSION; ?>" />

 <input type="hidden" name="step" value="2" />
 <fieldset>
   <legend><?php echo _('Information'); ?></legend>
   <table>
     <tr>
 <input type="hidden" name="step" value="2" />
 <fieldset>
   <legend><?php echo _('Information'); ?></legend>
   <table>
     <tr>

-      <td class="info" colspan="2"><?php echo _('The base address of Jyraphe is the first part of the URL, until (and including) the last slash. For example: "http://www.example.com/". Do not forget the ending slash!'); ?></td>
+      <td class="info" colspan="2"><?php echo _('The base address of Jirafeau is the first part of the URL, until (and including) the last slash. For example: "http://www.example.com/". Do not forget the ending slash!'); ?></td>

     </tr>
     <tr>
       <td class="label"><label for="input_web_root"><?php echo _('Base address:'); ?></label></td>
     </tr>
     <tr>
       <td class="label"><label for="input_web_root"><?php echo _('Base address:'); ?></label></td>


@@ -234,10 +234,10 @@ switch($current) {
           $alphanum = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
           $len_alphanum = strlen($alphanum);
           $var = 'var-';
           $alphanum = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
           $len_alphanum = strlen($alphanum);
           $var = 'var-';

-          for($i = 0; $i < JYRAPHE_VAR_RAND_LENGTH; $i++) {
+          for($i = 0; $i < JIRAFEAU_VAR_RAND_LENGTH; $i++) {

             $var .= substr($alphanum, mt_rand(0, $len_alphanum - 1), 1);
           }
             $var .= substr($alphanum, mt_rand(0, $len_alphanum - 1), 1);
           }

-          echo JYRAPHE_ROOT . $var . '/';
+          echo JIRAFEAU_ROOT . $var . '/';

         } else {
           echo $cfg['var_root'];
         } 
         } else {
           echo $cfg['var_root'];
         } 


@@ -263,16 +263,16 @@ switch($current) {
       'fr_FR.UTF-8' => 'Français'
     );
 ?>
       'fr_FR.UTF-8' => 'Français'
     );
 ?>

-<h2><?php printf(_('Installation of Jyraphe - step %d out of %d'), 1, 3); ?></h2>
+<h2><?php printf(_('Installation of Jirafeau - step %d out of %d'), 1, 3); ?></h2>

 <div id="install">
 <form action="<?php echo basename(__FILE__); ?>" method="post">
 <div id="install">
 <form action="<?php echo basename(__FILE__); ?>" method="post">

-<input type="hidden" name="jyraphe" value="<?php echo JYRAPHE_VERSION; ?>" />
+<input type="hidden" name="jirafeau" value="<?php echo JIRAFEAU_VERSION; ?>" />

 <input type="hidden" name="step" value="1" />
 <fieldset>
   <legend><?php echo _('Language'); ?></legend>
   <table>
     <tr>
 <input type="hidden" name="step" value="1" />
 <fieldset>
   <legend><?php echo _('Language'); ?></legend>
   <table>
     <tr>

-      <td class="info" colspan="2"><?php echo _('The installation of Jyraphe is internationalised, so you can have it in your own language if the translation is available.'); ?></td>
+      <td class="info" colspan="2"><?php echo _('The installation of Jirafeau is internationalised, so you can have it in your own language if the translation is available.'); ?></td>

     </tr>
     <tr>
       <td class="label"><label for="select_lang"><?php echo _('Choose your language:'); ?></label></td>
     </tr>
     <tr>
       <td class="label"><label for="select_lang"><?php echo _('Choose your language:'); ?></label></td>


@@ -299,7 +299,7 @@ switch($current) {
 }
 
 
 }
 
 

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

 
 
 /**
 
 
 /**