[TASK] CGL: Remove whitespaces

Remove unwanted whitespace

diff --git a/admin.php b/admin.php
index bfbd123be74372fc578da4852db2e96f0a601e5c..cb6058036bee37b11b8ada637b07e71d5fd028f6 100644 (file)
--- a/admin.php
+++ b/admin.php
@@ -71,7 +71,7 @@ else
   if (isset ($_POST['admin_password']) && empty($cfg['admin_http_auth_user']))
   {
       if ($cfg['admin_password'] === $_POST['admin_password'] ||
   if (isset ($_POST['admin_password']) && empty($cfg['admin_http_auth_user']))
   {
       if ($cfg['admin_password'] === $_POST['admin_password'] ||

-         $cfg['admin_password'] === hash('sha256', $_POST['admin_password']))
+          $cfg['admin_password'] === hash('sha256', $_POST['admin_password']))

           $_SESSION['admin_auth'] = true;
       else
       {
           $_SESSION['admin_auth'] = true;
       else
       {

diff --git a/index.php b/index.php
index f9eded53cfba6f6b95b154e72fa253145a04f438..ca67e7fda100d93427ddb22eb750f4a1d6230a51 100644 (file)
--- a/index.php
+++ b/index.php
@@ -107,7 +107,7 @@ if (jirafeau_has_upload_password ($cfg))
 
     <div id="upload_finished_download_page">
     <p>
 
     <div id="upload_finished_download_page">
     <p>

-          <?php echo t('Download page') ?> 
+          <?php echo t('Download page') ?>

           <a id="upload_link_email" href=""><img id="upload_image_email"/></a>
     </p>
     <p><a id="upload_link" href=""></a></p>
           <a id="upload_link_email" href=""><img id="upload_image_email"/></a>
     </p>
     <p><a id="upload_link" href=""></a></p>


@@ -151,7 +151,7 @@ if (jirafeau_has_upload_password ($cfg))
 <div id="upload">
 <fieldset>
     <legend>
 <div id="upload">
 <fieldset>
     <legend>

-    <?php echo t('Select a file'); ?> 
+    <?php echo t('Select a file'); ?>

     </legend>
     <p>
     <input type="file" id="file_select" size="30"
     </legend>
     <p>
     <input type="file" id="file_select" size="30"

diff --git a/install.php b/install.php
index 958aa1eef5809d4a80680cfb6d2b421bedb30420..ae4bd99b4d0df702fe9ae1161b4b4f50337556b5 100644 (file)
--- a/install.php
+++ b/install.php
@@ -232,7 +232,7 @@ default:
         "<?php echo t('Next step'); ?>" /></td> </tr> </table>
         </fieldset> </form> </div> <?php
 break;
         "<?php echo t('Next step'); ?>" /></td> </tr> </table>
         </fieldset> </form> </div> <?php
 break;

-    
+

 case 2:
     ?><h2><?php printf (t('Installation of Jirafeau') . ' - ' . t('step') .
     ' %d ' . t('out of') . ' %d', 2, 4);
 case 2:
     ?><h2><?php printf (t('Installation of Jirafeau') . ' - ' . t('step') .
     ' %d ' . t('out of') . ' %d', 2, 4);

diff --git a/lib/config.original.php b/lib/config.original.php
index 05631e6cfa5728b2646847fadea0446dbaed3810..8f55113c244fd293623d6d008cad1cff98bd710e 100644 (file)
--- a/lib/config.original.php
+++ b/lib/config.original.php
@@ -17,13 +17,13 @@
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */

- 
+

 /*
  * default configuration
  * if you want to change this, overwrite in a config.local.php file
  */
 global $cfg;
 /*
  * default configuration
  * if you want to change this, overwrite in a config.local.php file
  */
 global $cfg;

- 
+

 /* Don't forget the ending '/' */
 $cfg['web_root'] = '';
 $cfg['var_root'] = '';
 /* Don't forget the ending '/' */
 $cfg['web_root'] = '';
 $cfg['var_root'] = '';

diff --git a/lib/functions.js.php b/lib/functions.js.php
index e8a6bb18048f1ce1c9b19d40c93be887dd63d107..fbce5229ce3e17f4f1f4d431a154d10437864477 100644 (file)
--- a/lib/functions.js.php
+++ b/lib/functions.js.php
@@ -206,7 +206,7 @@ function add_time_string_to_date(d, time)
     {
         return false;
     }
     {
         return false;
     }

-    
+

     if (time == 'minute')
     {
         d.setSeconds (d.getSeconds() + 60);
     if (time == 'minute')
     {
         d.setSeconds (d.getSeconds() + 60);

diff --git a/lib/functions.php b/lib/functions.php
index d454011ca4592bed432c750d935b7c751b708e2b..5c0c45fe9f2a3c31f10990edeacf2202564216a9 100644 (file)
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -56,7 +56,7 @@ base_16_to_64 ($num)
                       '1101',  # d
                       '1110',  # e
                       '1111'); # f
                       '1101',  # d
                       '1110',  # e
                       '1111'); # f

-    $o = '';    
+    $o = '';

     $b = '';
     $i = 0;
     # Convert long hex string to bin.
     $b = '';
     $i = 0;
     # Convert long hex string to bin.


@@ -114,7 +114,7 @@ jirafeau_human_size ($octets)
     $p = min (floor (($o ? log ($o) : 0) / log (1024)), count ($u) - 1);
     $o /= pow (1024, $p);
     return round ($o, 1) . $u[$p];
     $p = min (floor (($o ? log ($o) : 0) / log (1024)), count ($u) - 1);
     $o /= pow (1024, $p);
     return round ($o, 1) . $u[$p];

-} 
+}

 
 function
 jirafeau_clean_rm_link ($link)
 
 function
 jirafeau_clean_rm_link ($link)


@@ -127,7 +127,7 @@ jirafeau_clean_rm_link ($link)
     while (file_exists ($parse)
            && ($scan = scandir ($parse))
            && count ($scan) == 2 // '.' and '..' folders => empty.
     while (file_exists ($parse)
            && ($scan = scandir ($parse))
            && count ($scan) == 2 // '.' and '..' folders => empty.

-           && basename ($parse) != basename (VAR_LINKS)) 
+           && basename ($parse) != basename (VAR_LINKS))

     {
         rmdir ($parse);
         $parse = substr ($parse, 0, strlen($parse) - strlen(basename ($parse)) - 1);
     {
         rmdir ($parse);
         $parse = substr ($parse, 0, strlen($parse) - strlen(basename ($parse)) - 1);


@@ -148,7 +148,7 @@ jirafeau_clean_rm_file ($md5)
     while (file_exists ($parse)
            && ($scan = scandir ($parse))
            && count ($scan) == 2 // '.' and '..' folders => empty.
     while (file_exists ($parse)
            && ($scan = scandir ($parse))
            && count ($scan) == 2 // '.' and '..' folders => empty.

-           && basename ($parse) != basename (VAR_FILES)) 
+           && basename ($parse) != basename (VAR_FILES))

     {
         rmdir ($parse);
         $parse = substr ($parse, 0, strlen($parse) - strlen(basename ($parse)) - 1);
     {
         rmdir ($parse);
         $parse = substr ($parse, 0, strlen($parse) - strlen(basename ($parse)) - 1);


@@ -284,7 +284,7 @@ jirafeau_delete_file ($md5)
             if (strcmp ($node, '.') == 0 || strcmp ($node, '..') == 0 ||
                 preg_match ('/\.tmp/i', "$node"))
                 continue;
             if (strcmp ($node, '.') == 0 || strcmp ($node, '..') == 0 ||
                 preg_match ('/\.tmp/i', "$node"))
                 continue;

-            
+

             if (is_dir ($d . $node))
             {
                 /* Push new found directory. */
             if (is_dir ($d . $node))
             {
                 /* Push new found directory. */


@@ -300,7 +300,7 @@ jirafeau_delete_file ($md5)
                 {
                     $count++;
                     jirafeau_delete_link ($node);
                 {
                     $count++;
                     jirafeau_delete_link ($node);

-                }   
+                }

             }
         }
     }
             }
         }
     }


@@ -413,7 +413,7 @@ jirafeau_upload ($file, $one_time_download, $key, $time, $ip, $crypt, $link_name
     {
         if (file_exists ($link_tmp_name))
             unlink ($link_tmp_name);
     {
         if (file_exists ($link_tmp_name))
             unlink ($link_tmp_name);

-        
+

         $counter--;
         if ($counter >= 1)
         {
         $counter--;
         if ($counter >= 1)
         {


@@ -506,7 +506,7 @@ function check_errors ($cfg)
     if (file_exists (JIRAFEAU_ROOT . 'install.php')
         && !($cfg['installation_done'] === true))
     {
     if (file_exists (JIRAFEAU_ROOT . 'install.php')
         && !($cfg['installation_done'] === true))
     {

-        header('Location: install.php'); 
+        header('Location: install.php');

         exit;
     }
 
         exit;
     }
 


@@ -519,7 +519,7 @@ function check_errors ($cfg)
 
     if (!is_writable (VAR_LINKS))
         add_error (t('The link directory is not writable!'), VAR_LINKS);
 
     if (!is_writable (VAR_LINKS))
         add_error (t('The link directory is not writable!'), VAR_LINKS);

-    
+

     if (!is_writable (VAR_ASYNC))
         add_error (t('The async directory is not writable!'), VAR_ASYNC);
 }
     if (!is_writable (VAR_ASYNC))
         add_error (t('The async directory is not writable!'), VAR_ASYNC);
 }


@@ -536,7 +536,7 @@ jirafeau_get_link ($hash)
 
     if (!file_exists ($link))
         return $out;
 
     if (!file_exists ($link))
         return $out;

-    
+

     $c = file ($link);
     $out['file_name'] = trim ($c[0]);
     $out['mime_type'] = trim ($c[1]);
     $c = file ($link);
     $out['file_name'] = trim ($c[0]);
     $out['mime_type'] = trim ($c[1]);


@@ -549,7 +549,7 @@ jirafeau_get_link ($hash)
     $out['ip'] = trim ($c[8]);
     $out['link_code'] = trim ($c[9]);
     $out['crypted'] = trim ($c[10]) == 'C';
     $out['ip'] = trim ($c[8]);
     $out['link_code'] = trim ($c[9]);
     $out['crypted'] = trim ($c[10]) == 'C';

-    
+

     return $out;
 }
 
     return $out;
 }
 


@@ -671,7 +671,7 @@ jirafeau_admin_clean ()
             if (strcmp ($node, '.') == 0 || strcmp ($node, '..') == 0 ||
                 preg_match ('/\.tmp/i', "$node"))
                 continue;
             if (strcmp ($node, '.') == 0 || strcmp ($node, '..') == 0 ||
                 preg_match ('/\.tmp/i', "$node"))
                 continue;

-            
+

             if (is_dir ($d . $node))
             {
                 /* Push new found directory. */
             if (is_dir ($d . $node))
             {
                 /* Push new found directory. */


@@ -717,7 +717,7 @@ jirafeau_admin_clean_async ()
             if (strcmp ($node, '.') == 0 || strcmp ($node, '..') == 0 ||
                 preg_match ('/\.tmp/i', "$node"))
                 continue;
             if (strcmp ($node, '.') == 0 || strcmp ($node, '..') == 0 ||
                 preg_match ('/\.tmp/i', "$node"))
                 continue;

-            
+

             if (is_dir ($d . $node))
             {
                 /* Push new found directory. */
             if (is_dir ($d . $node))
             {
                 /* Push new found directory. */


@@ -752,7 +752,7 @@ jirafeau_get_async_ref ($ref)
 
     if (!file_exists ($refinfos))
         return $out;
 
     if (!file_exists ($refinfos))
         return $out;

-    
+

     $c = file ($refinfos);
     $out['file_name'] = trim ($c[0]);
     $out['mime_type'] = trim ($c[1]);
     $c = file ($refinfos);
     $out['file_name'] = trim ($c[0]);
     $out['mime_type'] = trim ($c[1]);


@@ -781,7 +781,7 @@ jirafeau_async_delete ($ref)
     while (file_exists ($parse)
            && ($scan = scandir ($parse))
            && count ($scan) == 2 // '.' and '..' folders => empty.
     while (file_exists ($parse)
            && ($scan = scandir ($parse))
            && count ($scan) == 2 // '.' and '..' folders => empty.

-           && basename ($parse) != basename (VAR_ASYNC)) 
+           && basename ($parse) != basename (VAR_ASYNC))

     {
         rmdir ($parse);
         $parse = substr ($parse, 0, strlen($parse) - strlen(basename ($parse)) - 1);
     {
         rmdir ($parse);
         $parse = substr ($parse, 0, strlen($parse) - strlen(basename ($parse)) - 1);


@@ -817,7 +817,7 @@ jirafeau_async_init ($filename, $type, $one_time, $key, $time, $ip)
         echo 'Error';
         return;
     }
         echo 'Error';
         return;
     }

-    
+

     /* md5 password or empty */
     $password = '';
     if (!empty ($key))
     /* md5 password or empty */
     $password = '';
     if (!empty ($key))


@@ -849,14 +849,14 @@ jirafeau_async_push ($ref, $data, $code, $max_file_size)
 {
     /* Get async infos. */
     $a = jirafeau_get_async_ref ($ref);
 {
     /* Get async infos. */
     $a = jirafeau_get_async_ref ($ref);

-    
+

     /* Check some errors. */
     if (count ($a) == 0
         || $a['next_code'] != "$code"
         || empty ($data['tmp_name'])
         || !is_uploaded_file ($data['tmp_name']))
         return 'Error';
     /* Check some errors. */
     if (count ($a) == 0
         || $a['next_code'] != "$code"
         || empty ($data['tmp_name'])
         || !is_uploaded_file ($data['tmp_name']))
         return 'Error';

-    
+

     $p = s2p ($ref);
 
     /* File path. */
     $p = s2p ($ref);
 
     /* File path. */


@@ -887,7 +887,7 @@ jirafeau_async_push ($ref, $data, $code, $max_file_size)
     fclose ($r);
     fclose ($w);
     unlink ($r_path);
     fclose ($r);
     fclose ($w);
     unlink ($r_path);

-    
+

     /* Update async file. */
     $code = jirafeau_gen_random (4);
     $handle = fopen (VAR_ASYNC . $p . $ref, 'w');
     /* Update async file. */
     $code = jirafeau_gen_random (4);
     $handle = fopen (VAR_ASYNC . $p . $ref, 'w');


@@ -915,7 +915,7 @@ jirafeau_async_end ($ref, $code, $crypt, $link_name_length)
     if (count ($a) == 0
         || $a['next_code'] != "$code")
         return "Error";
     if (count ($a) == 0
         || $a['next_code'] != "$code")
         return "Error";

-    
+

     /* Generate link infos. */
     $p = VAR_ASYNC . s2p ($ref) . $ref . "_data";
     if (!file_exists($p))
     /* Generate link infos. */
     $p = VAR_ASYNC . s2p ($ref) . $ref . "_data";
     if (!file_exists($p))


@@ -934,13 +934,13 @@ jirafeau_async_end ($ref, $code, $crypt, $link_name_length)
     $size = filesize($p);
     $np = s2p ($md5);
     $delete_link_code = jirafeau_gen_random (5);
     $size = filesize($p);
     $np = s2p ($md5);
     $delete_link_code = jirafeau_gen_random (5);

-    
-    /* File already exist ? */ 
+
+    /* File already exist ? */

     if (!file_exists (VAR_FILES . $np))
         @mkdir (VAR_FILES . $np, 0755, true);
     if (!file_exists (VAR_FILES . $np . $md5))
         rename ($p, VAR_FILES . $np . $md5);
     if (!file_exists (VAR_FILES . $np))
         @mkdir (VAR_FILES . $np, 0755, true);
     if (!file_exists (VAR_FILES . $np . $md5))
         rename ($p, VAR_FILES . $np . $md5);

-    
+

     /* Increment or create count file. */
     $counter = 0;
     if (file_exists (VAR_FILES . $np . $md5 . '_count'))
     /* Increment or create count file. */
     $counter = 0;
     if (file_exists (VAR_FILES . $np . $md5 . '_count'))


@@ -952,7 +952,7 @@ jirafeau_async_end ($ref, $code, $crypt, $link_name_length)
     $handle = fopen (VAR_FILES . $np . $md5. '_count', 'w');
     fwrite ($handle, $counter);
     fclose ($handle);
     $handle = fopen (VAR_FILES . $np . $md5. '_count', 'w');
     fwrite ($handle, $counter);
     fclose ($handle);

-    
+

     /* Create link. */
     $link_tmp_name =  VAR_LINKS . $md5 . rand (0, 10000) . '.tmp';
     $handle = fopen ($link_tmp_name, 'w');
     /* Create link. */
     $link_tmp_name =  VAR_LINKS . $md5 . rand (0, 10000) . '.tmp';
     $handle = fopen ($link_tmp_name, 'w');


@@ -966,7 +966,7 @@ jirafeau_async_end ($ref, $code, $crypt, $link_name_length)
     if (!@mkdir (VAR_LINKS . $l, 0755, true) ||
         !rename ($link_tmp_name,  VAR_LINKS . $l . $md5_link))
         echo "Error";
     if (!@mkdir (VAR_LINKS . $l, 0755, true) ||
         !rename ($link_tmp_name,  VAR_LINKS . $l . $md5_link))
         echo "Error";

-    
+

     /* Clean async upload. */
     jirafeau_async_delete ($ref);
     return $md5_link . NL . $delete_link_code . NL . urlencode($crypt_key);
     /* Clean async upload. */
     jirafeau_async_delete ($ref);
     return $md5_link . NL . $delete_link_code . NL . urlencode($crypt_key);


@@ -1198,13 +1198,13 @@ jirafeau_get_alias ($hash)
 
     if (!file_exists ($link))
         return $out;
 
     if (!file_exists ($link))
         return $out;

-    
+

     $c = file ($link);
     $out['md5_password'] = trim ($c[0]);
     $out['ip'] = trim ($c[1]);
     $out['update_date'] = trim ($c[2]);
     $out['destination'] = trim ($c[3], NL);
     $c = file ($link);
     $out['md5_password'] = trim ($c[0]);
     $out['ip'] = trim ($c[1]);
     $out['update_date'] = trim ($c[2]);
     $out['destination'] = trim ($c[3], NL);

-   
+

     return $out;
 }
 
     return $out;
 }
 


@@ -1235,12 +1235,12 @@ jirafeau_alias_create ($alias, $destination, $password, $ip)
     $p = VAR_ALIAS . s2p ($alias);
     if (file_exists ($p))
         return 'Error';
     $p = VAR_ALIAS . s2p ($alias);
     if (file_exists ($p))
         return 'Error';

-    
+

     /* Create alias folder. */
     @mkdir ($p, 0755, true);
     if (!file_exists ($p))
         return 'Error';
     /* Create alias folder. */
     @mkdir ($p, 0755, true);
     if (!file_exists ($p))
         return 'Error';

-    
+

     /* Generate password. */
     $md5_password = md5 ($password);
 
     /* Generate password. */
     $md5_password = md5 ($password);
 


@@ -1330,7 +1330,7 @@ jirafeau_clean_rm_alias ($alias)
     while (file_exists ($parse)
            && ($scan = scandir ($parse))
            && count ($scan) == 2 // '.' and '..' folders => empty.
     while (file_exists ($parse)
            && ($scan = scandir ($parse))
            && count ($scan) == 2 // '.' and '..' folders => empty.

-           && basename ($parse) != basename (VAR_ALIAS)) 
+           && basename ($parse) != basename (VAR_ALIAS))

     {
         rmdir ($parse);
         $parse = substr ($parse, 0, strlen($parse) - strlen(basename ($parse)) - 1);
     {
         rmdir ($parse);
         $parse = substr ($parse, 0, strlen($parse) - strlen(basename ($parse)) - 1);

diff --git a/lib/lang.php b/lib/lang.php
index 43bdf6cd4c1e10a8c9c56b130e00168a0ef51e5b..bf6365977f4531c4cd2055b637b0f7eaec7bf403 100644 (file)
--- a/lib/lang.php
+++ b/lib/lang.php
@@ -105,7 +105,7 @@ function json_lang_generator ()
 \r
     /* Open translation file. */\r
     $trans_j = file_get_contents (JIRAFEAU_ROOT . "lib/locales/$l.json");\r
 \r
     /* Open translation file. */\r
     $trans_j = file_get_contents (JIRAFEAU_ROOT . "lib/locales/$l.json");\r

-    return $trans_j; \r
+    return $trans_j;\r

 }\r
 \r
 ?>\r
 }\r
 \r
 ?>\r

diff --git a/media/jyraphe/style.css.php b/media/jyraphe/style.css.php
index 76c59c772eb5bca807bfec4b6bb5fcc7540cab03..3747caf87d0e9daac449a2f5b6f4217ae5e0d3b0 100644 (file)
--- a/media/jyraphe/style.css.php
+++ b/media/jyraphe/style.css.php
@@ -171,7 +171,7 @@ h1 a {
   text-align: left;
 }
 
   text-align: left;
 }
 

-#install .navright { 
+#install .navright {

   float: right;
 }
 
   float: right;
 }
 


@@ -219,7 +219,7 @@ h1 a {
   text-align: left;
 }
 
   text-align: left;
 }
 

-#admin .navright { 
+#admin .navright {

   float: right;
 }
 
   float: right;
 }