The autofollow option is moved from the addons to the core.

[friendica.git] / mod / wall_attach.php

diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index c23efc7869a7181985afdd73c385dd5d43a74c2a..80b679012c88caec7566f7cb9a1f946605c8c68c 100644 (file)
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -65,10 +65,22 @@ function wall_attach_post(&$a) {
 
        $maxfilesize = get_config('system','maxfilesize');
 
+       /* Found html code written in text field of form,
+        * when trying to upload a file with filesize
+        * greater than upload_max_filesize. Cause is unknown.
+        * Then Filesize gets <= 0.
+        */
+
+       if($filesize <=0) {
+               notice(t('Sorry, maybe your upload is bigger than the PHP configuration allows') . EOL .(t('Or - did you try to upload an empty file?')) . EOL);
+               @unlink($src);
+               killme();
+       }
+
        if(($maxfilesize) && ($filesize > $maxfilesize)) {
-               notice( sprintf(t('File exceeds size limit of %d'), $maxfilesize) . EOL);
+               echo sprintf(t('File exceeds size limit of %s'), formatBytes($maxfilesize)) . EOL;
                @unlink($src);
-               return;
+               killme();
        }
 
        $r = q("select sum(octet_length(data)) as total from attach where uid = %d ",
@@ -122,10 +134,7 @@ function wall_attach_post(&$a) {
                killme();
        }
 
-       $lf = '<br />';
-
-       if(local_user() && intval(get_pconfig(local_user(),'system','plaintext')))
-               $lf = "\n";
+       $lf = "\n";
 
        echo  $lf . $lf . '[attachment]' . $r[0]['id'] . '[/attachment]' . $lf;