Merge branch 'lib-minor' into 'master'

Minor changes to PHP and JS files of lib/

See merge request !8

diff --git a/COPYING b/COPYING
index dba13ed2ddf783ee8118c6a581dbf75305f816a3..c5a720e508d8bd25c31ee0814aef62bb45dec78a 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -1,7 +1,7 @@
                     GNU AFFERO GENERAL PUBLIC LICENSE
                        Version 3, 19 November 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -643,7 +643,7 @@ the "copyright" line and a pointer to where the full notice is found.
     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/>.
 
 Also add information on how to contact you by electronic and paper mail.
 

diff --git a/NEWCOMER.txt b/NEWCOMER.txt
index 11d22ddcc765bd6185d90264bf521012982b762d..d570b05851c0e71e7828af342145562e38ef3580 100644 (file)
--- a/NEWCOMER.txt
+++ b/NEWCOMER.txt
@@ -27,4 +27,3 @@ view only to show the most importants files and their role.
     ├── async : chunks of uploaded files
     ├── files : all files that has been successfully uploaded
     └── links : all links pointing to files with meta-informations
-

diff --git a/README.md b/README.md
index 283b86beb37fc555682854730f7b4789eb385351..38f882ca760187ade626a8e756d9e08718de8cbe 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Introduction
 
-Welcome to the official Jirafeau project, an [Open-Source software](http://en.wikipedia.org/wiki/Open-source_software).
+Welcome to the official Jirafeau project, an [Open-Source software](https://en.wikipedia.org/wiki/Open-source_software).
 
 Jirafeau is a web site permitting to upload a file in a simple way and give an unique link to it.
 
@@ -31,7 +31,7 @@ Jirafeau is a fork of the original project [Jyraphe](http://home.gna.org/jyraphe
 
 As it's original project, Jirafeau is made in the [KISS](http://en.wikipedia.org/wiki/KISS_principle) way (Keep It Simple, Stupid).
 
-Jirafeau project won't evolve to a file manager and will focus to keep a very few dependencies
+Jirafeau project won't evolve to a file manager and will focus to keep a very few dependencies.
 
 # Screenshots
 
@@ -46,7 +46,7 @@ Here are some screenshots:
 - [Upload 4](http://i.imgur.com/P2oS1MY.jpg)
 
 # Installation
--  [Download](https://gitlab.com/mojo42/Jirafeau/repository/archive.zip) the last version of Jirafeau from Gitlab
+-  [Download](https://gitlab.com/mojo42/Jirafeau/repository/archive.zip) the last version of Jirafeau from GitLab
 -  Upload files on your web server
 -  Don't forget to set owner of uploaded files if you need to
 -  Get your web browser and go to you install location (e.g. ```http://your-web-site.org/jirafeau/```) and follow instructions
@@ -66,7 +66,7 @@ If you are using Apache, you can add the following lineto your configuration to
 
 You should also remove un-necessessary write access once the installation is done (ex: configuration file).
 
-An other obvious basic security is to let access users to the site by https.
+An other obvious basic security is to let access users to the site by HTTPS.
 
 # Few notes about server side encryption
 
@@ -90,11 +90,11 @@ In a next step, encryption will be made by the client (in javascript), see issue
 
 Of-course ! Translations are easy to make and no technical knowledge is required.
 
-Simply go to [Jirafeau's Weblate](https://hosted.weblate.org/projects/jirafeau/master/)
+Simply go to [Jirafeau's Weblate](https://hosted.weblate.org/projects/jirafeau/master/).
 
 If you want to add a new language in the list, feel free to contact us or leave a comment in ticket #9.
 
-I would like to thanks to anonymous contributors on weblate :)
+We would like to thanks to anonymous contributors on weblate. :)
 
 ### How do I upgrade my Jirafeau ?
 
@@ -108,13 +108,13 @@ If you have some troubles:
 - It should probably come from your ```lib/config.local.php``` (configuration syntax may have changed). Just compare it with ```lib/config.original.php```
 - Check owner/permissions of your files.
 
-Anyway you should off-course make a backup of your current installation before doing anything :)
+Anyway you should off-course make a backup of your current installation before doing anything. :)
 
 ### How can I limit upload access ?
 
 There are two ways to limit upload access (but not download):
 - you can set one or more passwords in order to access the upload interface, or/and
-- you can configure a list of authorized IP ([CIDR notation](http://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing#CIDR_notation)) which are allowed to access to the upload page
+- you can configure a list of authorized IP ([CIDR notation](https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing#CIDR_notation)) which are allowed to access to the upload page
 
 Check documentation of ```upload_password``` and ```upload_ip``` parameters in [lib/config.original.php](https://gitlab.com/mojo42/Jirafeau/blob/master/lib/config.original.php).
 
@@ -122,29 +122,29 @@ Check documentation of ```upload_password``` and ```upload_ip``` parameters in [
 
 If you have some strange behavior with IE, you may configure [compatibility mode](http://feedback.dominknow.com/knowledgebase/articles/159097-internet-explorer-ie8-ie9-ie10-and-ie11-compat).
 
-Anyway I would recommand you to use another browser :)
+Anyway I would recommand you to use another web browser. :)
 
 ### I found a bug, what should I do ?
 
-Feel free to open a bug in the [gitlab's issues](https://gitlab.com/mojo42/Jirafeau/issues)
+Feel free to open a bug in the [GitLab's issues](https://gitlab.com/mojo42/Jirafeau/issues).
 
 ### How to set maximum file size ?
 
 If your browser supports HTML5 file API, you can send files as big as you want.
 
 For browsers who does not support HTML5 file API, the limitation come from PHP configuration.
-You have to set [post_max_size](http://php.net/manual/en/ini.core.php#ini.post-max-size) and [upload_max_filesize](http://php.net/manual/en/ini.core.php#ini.upload-max-filesize) in your php configuration.
+You have to set [post_max_size](https://php.net/manual/en/ini.core.php#ini.post-max-size) and [upload_max_filesize](https://php.net/manual/en/ini.core.php#ini.upload-max-filesize) in your php configuration.
 
 If you don't want to allow unlimited upload size, you can still setup a maximal file size in Jirafeau's setting (see ```maximal_upload_size``` in your configuration)
 
 ### How can I edit an option ?
 
-Documentation of all default options are located in [lib/config.original.php](https://gitlab.com/mojo42/Jirafeau/blob/master/lib/config.original.php)
-If you want to change an option, just edit your ```lib/config.local.php```
+Documentation of all default options are located in [lib/config.original.php](https://gitlab.com/mojo42/Jirafeau/blob/master/lib/config.original.php).
+If you want to change an option, just edit your ```lib/config.local.php```.
 
 ### How can I access the admin interface ?
 
-Just go to ```/admin.php```
+Just go to ```/admin.php```.
 
 ### How can I use the scripting interface ?
 
@@ -160,11 +160,11 @@ The original project seems not to be continued anymore and I prefer to add more
 
 ### What can we expect in the future ?
 
-Check [issues](https://gitlab.com/mojo42/Jirafeau/issues) to check open bugs and incoming new stuff :)
+Check [issues](https://gitlab.com/mojo42/Jirafeau/issues) to check open bugs and incoming new stuff. :)
 
 ### What is the Jirafeau's license ?
 
-Jirafeau is licensed under [AGPLv3](https://gitlab.com/mojo42/Jirafeau/blob/master/COPYING)
+Jirafeau is licensed under [AGPLv3](https://gitlab.com/mojo42/Jirafeau/blob/master/COPYING).
 
 ### How do I modify the TOS (terms of use) ?
 
@@ -189,4 +189,4 @@ So:
 
 ### How to contact someone from Jirafeau ?
 
-Feel free to create an issue if you found a bug, else you can send an email at j.jutteau A.T gmail .DOT. com
\ No newline at end of file
+Feel free to create an issue if you found a bug, else you can send an email at j.jutteau A.T gmail .DOT. com

diff --git a/index.php b/index.php
index 5a2c9263637a21c06a045a94915eb75e8a597815..b83dd35ef030059242016419085727c1c8a4610b 100644 (file)
--- a/index.php
+++ b/index.php
@@ -24,7 +24,6 @@ require (JIRAFEAU_ROOT . 'lib/config.original.php');
 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 ())
@@ -34,6 +33,8 @@ if (has_error ())
     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)))
 {

diff --git a/media/courgette/logo-jirafeau.svg b/media/courgette/logo-jirafeau.svg
index 69cdf3d70a435d9015285769abde0d80d7a65e7c..1076fb2cf3a265b415f2490982fd046cc03cab74 100644 (file)
--- a/media/courgette/logo-jirafeau.svg
+++ b/media/courgette/logo-jirafeau.svg
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
        <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
 ]>

diff --git a/media/courgette/upload.svg b/media/courgette/upload.svg
index 5cd585c1151116f1eb2d5e7226bb6c8cba001648..b4c4e19f9f489480e6b96b2adf5878d48ab76799 100644 (file)
--- a/media/courgette/upload.svg
+++ b/media/courgette/upload.svg
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
        <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
 ]>
 <svg version="1.1"
-        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
         x="0px" y="0px" width="260px" height="189px" viewBox="-42.912 -27.073 260 189"
         overflow="visible" enable-background="new -42.912 -27.073 260 189" xml:space="preserve">
-<defs>
-</defs>
 <g>
        <g>
                <path fill="#BCAAA4" d="M83.244,58.862c0,8.491,0,16.981,0,25.472c0,4.514,7,4.514,7,0c0-8.491,0-16.981,0-25.472

diff --git a/media/jyraphe/jirafeau.png b/media/jyraphe/jirafeau.png
index e141069f74612105207d5db15d00d27850546f73..3755f2856e4c4f5bdd80cd86c98194233e1c9851 100644 (file)
Binary files a/media/jyraphe/jirafeau.png and b/media/jyraphe/jirafeau.png differ