X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/cbef2b93dfeb51484956c960d58af8c4557c25f5..3cf8b39b331dd5f80c4ac674d13a6387d01d49b9:/lib/functions.php?ds=sidebyside

diff --git a/lib/functions.php b/lib/functions.php
index 48bdefd..bb49079 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -17,62 +17,42 @@
  *  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/>.
  */
-
 /**
  * transforms a php.ini string representing a value in an integer
  * @param $value the value from php.ini
  * @returns an integer for this value
  */
-function jirafeau_ini_to_bytes($value) {
-  $modifier = substr($value, -1);
-  $bytes = substr($value, 0, -1);
-  switch(strtoupper($modifier)) {
-  case 'P':
-    $bytes *= 1024;
-  case 'T':
-    $bytes *= 1024;
-  case 'G':
-    $bytes *= 1024;
-  case 'M':
-    $bytes *= 1024;
-  case 'K':
-    $bytes *= 1024;
-  default:
-    break;
-  }
-  return $bytes;
+function jirafeau_ini_to_bytes ($value)
+{
+    $modifier = substr ($value, -1);
+    $bytes = substr ($value, 0, -1);
+    switch (strtoupper ($modifier))
+    {
+    case 'P':
+        $bytes *= 1024;
+    case 'T':
+        $bytes *= 1024;
+    case 'G':
+        $bytes *= 1024;
+    case 'M':
+        $bytes *= 1024;
+    case 'K':
+        $bytes *= 1024;
+    default:
+        break;
+    }
+    return $bytes;
 }
 
 /**
  * gets the maximum upload size according to php.ini
  * @returns the maximum upload size
  */
-function jirafeau_get_max_upload_size() {
-  return min(jirafeau_ini_to_bytes(ini_get('post_max_size')), jirafeau_ini_to_bytes(ini_get('upload_max_filesize')));
-}
-
-/**
- * detects if a given filename is present in a directory and find an alternate filename
- * @param $name the initial filename
- * @param $dir the directory to explore (finishing with a '/')
- * @returns an alternate filename, possibly the initial filename
- */
-function jirafeau_detect_collision($name, $dir) {
-  if(!file_exists($dir . $name)) {
-    return $name;
-  }
-
-  $dot = strpos($name, '.');
-  $dot = ($dot === false) ? strlen($name) : $dot;
-  $first = substr($name, 0, $dot);
-  $second = substr($name, $dot);
-  $i = 1;
-  do {
-    $new_name = $first . '-' . $i . $second;
-    $i++;
-  } while(file_exists($dir . $new_name));
-
-  return $new_name;
+function
+jirafeau_get_max_upload_size ()
+{
+    return min (jirafeau_ini_to_bytes (ini_get ('post_max_size')),
+                jirafeau_ini_to_bytes (ini_get ('upload_max_filesize')));
 }
 
 /**
@@ -80,28 +60,69 @@ function jirafeau_detect_collision($name, $dir) {
  * @param $code the error code
  * @returns a string explaining the error
  */
-function jirafeau_upload_errstr($code) {
-  switch($code) {
-  case UPLOAD_ERR_INI_SIZE:
-  case UPLOAD_ERR_FORM_SIZE:
-    return _('Your file exceeds the maximum authorized file size.');
-    break;
-
-  case UPLOAD_ERR_PARTIAL:
-  case UPLOAD_ERR_NO_FILE:
-    return _('Your file was not uploaded correctly. You may succeed in retrying.');
-    break;
-
-  case UPLOAD_ERR_NO_TMP_DIR:
-  case UPLOAD_ERR_CANT_WRITE:
-  case UPLOAD_ERR_EXTENSION:
-    return _('Internal error. You may not succeed in retrying.');
-    break;
-
-  default:
-    break;
-  }
-  return _('Unknown error.');
+function
+jirafeau_upload_errstr ($code)
+{
+    switch ($code)
+    {
+    case UPLOAD_ERR_INI_SIZE:
+    case UPLOAD_ERR_FORM_SIZE:
+        return _('Your file exceeds the maximum authorized file size. ');
+        break;
+
+    case UPLOAD_ERR_PARTIAL:
+    case UPLOAD_ERR_NO_FILE:
+        return
+            _
+            ('Your file was not uploaded correctly. You may succeed in retrying. ');
+        break;
+
+    case UPLOAD_ERR_NO_TMP_DIR:
+    case UPLOAD_ERR_CANT_WRITE:
+    case UPLOAD_ERR_EXTENSION:
+        return _('Internal error. You may not succeed in retrying. ');
+        break;
+
+    default:
+        break;
+    }
+    return _('Unknown error. ');
+}
+
+/** Remove link and it's file
+ * @param $link the link's name (hash)
+ */
+
+function
+jirafeau_delete ($link)
+{
+    if (!file_exists ( VAR_LINKS . $link))
+        return;
+
+    $content = file ( VAR_LINKS . $link);
+    $md5 = trim ($content[5]);
+    unlink ( VAR_LINKS . $link);
+
+    $counter = 1;
+    if (file_exists ( VAR_FILES . $md5. '_count'))
+    {
+        $content = file ( VAR_FILES . $md5. '_count');
+        $counter = trim ($content[0]);
+    }
+    $counter--;
+
+    if ($counter >= 1)
+    {
+        $handle = fopen ( VAR_FILES . $md5. '_count', 'w');
+        fwrite ($handle, $counter);
+        fclose ($handle);
+    }
+
+    if ($counter == 0 && file_exists ( VAR_FILES . $md5))
+    {
+        unlink ( VAR_FILES . $md5);
+        unlink ( VAR_FILES . $md5. '_count');
+    }
 }
 
 /**
@@ -115,76 +136,106 @@ function jirafeau_upload_errstr($code) {
  * @returns an array containing some information
  *   'error' => information on possible errors
  *   'link' => the link name of the uploaded file
+ *   'delete_link' => the link code to delete file
  */
-function jirafeau_upload($file, $one_time_download, $key, $time, $cfg, $ip) {
-  if(empty($file['tmp_name']) || !is_uploaded_file($file['tmp_name'])) {
-    return(array('error' => array('has_error' => true, 'why' => jirafeau_upload_errstr($file['error'])), 'link' => ''));
-  }
-
-  /* array representing no error */
-  $noerr = array('has_error' => false, 'why' => '');
-
-  /* file informations */
-  $md5 = md5_file($file['tmp_name']);
-  $name = trim($file['name']);
-  $mime_type = $file['type'];
-  $size = $file['size'];
-
-  /* does file already exist ? */
-  $rc = false;
-  if(file_exists(VAR_FILES . $md5)) {
-    $rc = unlink($file['tmp_name']);
-  }
-  elseif(move_uploaded_file($file['tmp_name'], VAR_FILES . $md5)) {
-    $rc = true;
-  }
-  if(!$rc)
-  {
-    return(array(
-      'error' => array(
-        'has_error' => true,
-        'why' => _('Internal error during file creation.')),
-      'link' => '')
-    );
-  }
-
-  /* increment or create count file */
-  $counter=0;
-  if(file_exists(VAR_FILES . $md5 . '_count')) {
-    $content = file(VAR_FILES . $md5 . '_count');
-    $counter = trim($content[0]);
-  }
-  $counter++;
-  $handle = fopen(VAR_FILES . $md5 . '_count', 'w');
-  fwrite($handle, $counter);
-  fclose($handle);
-
-  /* create link file */
-  $link_tmp_name = VAR_LINKS . $md5 . rand(0, 10000) . '.tmp';
-  $handle = fopen($link_tmp_name, 'w');
-  fwrite($handle, $name . NL . $mime_type . NL . $size . NL . $key . NL . $time . NL . $md5 . NL . ($one_time_download ? 'O' : 'R') . NL . date('U') . NL . $ip . NL);
-  fclose($handle);
-  $md5_link = md5_file($link_tmp_name);
-  if(!rename($link_tmp_name, VAR_LINKS . $md5_link)) {
-    if ($counter > 1) {
-      $counter--;
-      $handle = fopen(VAR_FILES . $md5 . '_count', 'w');
-      fwrite($handle, $counter);
-      fclose($handle);
+function
+jirafeau_upload ($file, $one_time_download, $key, $time, $cfg, $ip)
+{
+    if (empty ($file['tmp_name']) || !is_uploaded_file ($file['tmp_name']))
+    {
+        return (array(
+                 'error' =>
+                   array ('has_error' => true,
+                          'why' => jirafeau_upload_errstr ($file['error'])),
+                 'link' => '',
+                 'delete_link' => ''));
     }
-    else {
-      unlink($link_tmp_name);
-      unlink(VAR_FILE . $md5 . '_count');
-      unlink(VAR_FILE . $md5);
+
+    /* array representing no error */
+    $noerr = array ('has_error' => false, 'why' => '');
+
+    /* file informations */
+    $md5 = md5_file ($file['tmp_name']);
+    $name = trim ($file['name']);
+    $mime_type = $file['type'];
+    $size = $file['size'];
+
+    /* does file already exist ? */
+    $rc = false;
+    if (file_exists ( VAR_FILES . $md5))
+    {
+        $rc = unlink ($file['tmp_name']);
+    }
+    elseif (move_uploaded_file ($file['tmp_name'],  VAR_FILES . $md5))
+    {
+        $rc = true;
     }
-    return(array(
-      'error' => array(
-        'has_error' => true,
-        'why' => _('Internal error during file creation.')),
-      'link' => '')
-    );
-  }
-  return(array('error' => $noerr, 'link' => $md5_link));
+    if (!$rc)
+    {
+        return (array(
+                 'error' =>
+                   array ('has_error' => true,
+                          'why' => _('Internal error during file creation. ')),
+                 'link' =>'',
+                 'delete_link' => ''));
+    }
+
+    /* increment or create count file */
+    $counter = 0;
+    if (file_exists (VAR_FILES . $md5 . '_count'))
+    {
+        $content = file ( VAR_FILES . $md5. '_count');
+        $counter = trim ($content[0]);
+    }
+    $counter++;
+    $handle = fopen ( VAR_FILES . $md5. '_count', 'w');
+    fwrite ($handle, $counter);
+    fclose ($handle);
+
+    /* Create delete code. */
+    $delete_link_code = 0;
+    for ($i = 0; $i < 8; $i++)
+        $delete_link_code .= dechex (rand (0, 16));
+
+    /* md5 password or empty */
+    $password = '';
+    if (!empty ($key))
+        $password = md5 ($key);
+
+    /* create link file */
+    $link_tmp_name =  VAR_LINKS . $md5.rand (0, 10000) . ' .tmp';
+    $handle = fopen ($link_tmp_name, 'w');
+    fwrite ($handle,
+            $name . NL. $mime_type . NL. $size . NL. $password . NL. $time . NL . $md5.
+            NL.($one_time_download ? 'O' : 'R') . NL.date ('U') . NL. $ip . NL.
+            $delete_link_code . NL);
+    fclose ($handle);
+    $md5_link = md5_file ($link_tmp_name);
+    if (!rename ($link_tmp_name,  VAR_LINKS . $md5_link))
+    {
+        unlink ($link_tmp_name);
+        $counter--;
+        if ($counter >= 1)
+        {
+            $handle = fopen ( VAR_FILES . $md5. '_count', 'w');
+            fwrite ($handle, $counter);
+            fclose ($handle);
+        }
+        else
+        {
+            unlink ( VAR_FILES . $md5. '_count');
+            unlink ( VAR_FILES . $md5);
+        }
+        return (array(
+                 'error' =>
+                   array ('has_error' => true,
+                          'why' => _('Internal error during file creation. ')),
+                 'link' =>'',
+                 'delete_link' => ''));
+    }
+   return (array ('error' => $noerr,
+                  'link' => $md5_link,
+                  'delete_link' => $delete_link_code));
 }
 
 /**
@@ -192,14 +243,17 @@ function jirafeau_upload($file, $one_time_download, $key, $time, $cfg, $ip) {
  * @param $mime the mime type
  * @returns a boolean telling if a mime type is viewable
  */
-function jirafeau_is_viewable($mime) {
-  if(!empty($mime)) {
-    // actually, verify if mime-type is an image or a text
-    $viewable = array('image', 'text');
-    $decomposed = explode('/', $mime);
-    return in_array($decomposed[0], $viewable);
-  }
-  return false;
+function
+jirafeau_is_viewable ($mime)
+{
+    if (!empty ($mime))
+    {
+        /* Actually, verify if mime-type is an image or a text. */
+        $viewable = array ('image', 'text');
+        $decomposed = explode ('/', $mime);
+        return in_array ($decomposed[0], $viewable);
+    }
+    return false;
 }
 
 
@@ -212,16 +266,20 @@ $error_list = array ();
  * @param $title the error's title
  * @param $description is a human-friendly description of the problem.
  */
-function add_error ($title, $description) {
+function
+add_error ($title, $description)
+{
     global $error_list;
-    $error_list[] = '<p>' . $title . '<br />' . $description . '</p>';
+    $error_list[] = '<p>' . $title. '<br />' . $description. '</p>';
 }
 
 /**
  * Informs whether any error has been registered yet.
  * @return true if there are errors.
  */
-function has_error () {
+function
+has_error ()
+{
     global $error_list;
     return !empty ($error_list);
 }
@@ -229,11 +287,15 @@ function has_error () {
 /**
  * Displays all the errors.
  */
-function show_errors () {
-    if (has_error ()) {
+function
+show_errors ()
+{
+    if (has_error ())
+    {
         global $error_list;
         echo '<div class="error">';
-        foreach ($error_list as $error) {
+        foreach ($error_list as $error)
+        {
             echo $error;
         }
         echo '</div>';