Just some more fixed notice

[friendica.git] / mod / wall_attach.php

diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index 6d7a18fe0ae5b9bb3cd47e0044143d8cfb1d5850..69763c2fe5f17a3b3155007c1838e863aee71a4a 100644 (file)
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -2,14 +2,16 @@
 /**
  * @file mod/wall_attach.php
  */
+
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\System;
+use Friendica\Database\dba;
 use Friendica\Database\DBM;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Mimetype;
 
-require_once 'include/datetime.php';
-
 function wall_attach_post(App $a) {
 
        $r_json = (x($_GET,'response') && $_GET['response']=='json');
@@ -21,7 +23,7 @@ function wall_attach_post(App $a) {
                );
                if (! DBM::is_result($r)) {
                        if ($r_json) {
-                               echo json_encode(['error'=>t('Invalid request.')]);
+                               echo json_encode(['error'=>L10n::t('Invalid request.')]);
                                killme();
                        }
                        return;
@@ -29,7 +31,7 @@ function wall_attach_post(App $a) {
 
        } else {
                if ($r_json) {
-                       echo json_encode(['error'=>t('Invalid request.')]);
+                       echo json_encode(['error'=>L10n::t('Invalid request.')]);
                        killme();
                }
                return;
@@ -71,7 +73,7 @@ function wall_attach_post(App $a) {
        }
        if(! $can_post) {
                if ($r_json) {
-                       echo json_encode(['error'=>t('Permission denied.')]);
+                       echo json_encode(['error'=>L10n::t('Permission denied.')]);
                        killme();
                }
                notice(L10n::t('Permission denied.') . EOL );
@@ -80,7 +82,7 @@ function wall_attach_post(App $a) {
 
        if(! x($_FILES,'userfile')) {
                if ($r_json) {
-                       echo json_encode(['error'=>t('Invalid request.')]);
+                       echo json_encode(['error'=>L10n::t('Invalid request.')]);
                }
                killme();
        }
@@ -98,7 +100,7 @@ function wall_attach_post(App $a) {
         */
 
        if($filesize <=0) {
-               $msg = t('Sorry, maybe your upload is bigger than the PHP configuration allows') . EOL .(t('Or - did you try to upload an empty file?'));
+               $msg = L10n::t('Sorry, maybe your upload is bigger than the PHP configuration allows') . EOL .(L10n::t('Or - did you try to upload an empty file?'));
                if ($r_json) {
                        echo json_encode(['error'=>$msg]);
                } else {
@@ -109,7 +111,7 @@ function wall_attach_post(App $a) {
        }
 
        if(($maxfilesize) && ($filesize > $maxfilesize)) {
-               $msg = sprintf(t('File exceeds size limit of %s'), formatBytes($maxfilesize));
+               $msg = L10n::t('File exceeds size limit of %s', formatBytes($maxfilesize));
                if ($r_json) {
                        echo json_encode(['error'=>$msg]);
                } else {
@@ -121,8 +123,8 @@ function wall_attach_post(App $a) {
 
        $filedata = @file_get_contents($src);
        $mimetype = Mimetype::getContentType($filename);
-       $hash = get_guid(64);
-       $created = datetime_convert();
+       $hash = System::createGUID(64);
+       $created = DateTimeFormat::utcNow();
 
        $fields = ['uid' => $page_owner_uid, 'hash' => $hash, 'filename' => $filename, 'filetype' => $mimetype,
                'filesize' => $filesize, 'data' => $filedata, 'created' => $created, 'edited' => $created,
@@ -133,7 +135,7 @@ function wall_attach_post(App $a) {
        @unlink($src);
 
        if(! $r) {
-               $msg =  t('File upload failed.');
+               $msg =  L10n::t('File upload failed.');
                if ($r_json) {
                        echo json_encode(['error'=>$msg]);
                } else {
@@ -149,7 +151,7 @@ function wall_attach_post(App $a) {
        );
 
        if (! DBM::is_result($r)) {
-               $msg = t('File upload failed.');
+               $msg = L10n::t('File upload failed.');
                if ($r_json) {
                        echo json_encode(['error'=>$msg]);
                } else {