From: Jérôme <mojo@couak.net>
Date: Thu, 16 Jul 2015 08:32:48 +0000 (+0000)
Subject: Merge branch 'php-minor' into 'master'
X-Git-Tag: 1.1~44
X-Git-Url: https://git.p6c8.net/jirafeau_project.git/commitdiff_plain/261af8ac3be2c4d9fbdae0f25c036440833d746c?hp=-c

Merge branch 'php-minor' into 'master'

Minor changes to some PHP files

See merge request !7
---

261af8ac3be2c4d9fbdae0f25c036440833d746c
diff --combined index.php
index b83dd35,0fa2ca1..f9eded5
--- a/index.php
+++ b/index.php
@@@ -16,7 -16,7 +16,7 @@@
   *  GNU Affero General Public License for more details.
   *
   *  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/>.
+  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
   */
  define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
  
@@@ -24,6 -24,7 +24,6 @@@ require (JIRAFEAU_ROOT . 'lib/config.or
  require (JIRAFEAU_ROOT . 'lib/settings.php');
  require (JIRAFEAU_ROOT . 'lib/functions.php');
  require (JIRAFEAU_ROOT . 'lib/lang.php');
 -require (JIRAFEAU_ROOT . 'lib/template/header.php');
  
  check_errors ($cfg);
  if (has_error ())
@@@ -33,8 -34,6 +33,8 @@@
      exit;
  }
  
 +require (JIRAFEAU_ROOT . 'lib/template/header.php');
 +
  /* Check if user is allowed to upload. */
  if (!jirafeau_challenge_upload_ip ($cfg, get_ip_address($cfg)))
  {
@@@ -243,7 -242,7 +243,7 @@@ if (jirafeau_has_upload_password ($cfg)
  
  </div>
  
- <script lang="Javascript">
+ <script type="text/javascript" lang="Javascript">
      document.getElementById('error_pop').style.display = 'none';
      document.getElementById('uploading').style.display = 'none';
      document.getElementById('upload_finished').style.display = 'none';