notags calls

[friendica.git] / mod / photos.php

diff --git a/mod/photos.php b/mod/photos.php
index 7a49f061a752c9addeb79c4928fc054881d8c405..238c7358589f99fd0f95c21f7d051522e8a5f58e 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -31,6 +31,7 @@ use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Map;
 use Friendica\Util\Security;
 use Friendica\Util\Temporal;
+use Friendica\Util\Strings;
 use Friendica\Util\XML;
 
 require_once 'include/items.php';
@@ -222,7 +223,7 @@ function photos_post(App $a)
                }
 
                // RENAME photo album
-               $newalbum = notags(trim($_POST['albumname']));
+               $newalbum = Strings::removeTags(trim($_POST['albumname']));
                if ($newalbum != $album) {
                        q("UPDATE `photo` SET `album` = '%s' WHERE `album` = '%s' AND `uid` = %d",
                                DBA::escape($newalbum),
@@ -365,11 +366,11 @@ function photos_post(App $a)
        }
 
        if ($a->argc > 2 && (!empty($_POST['desc']) || !empty($_POST['newtag']) || !empty($_POST['albname']) !== false)) {
-               $desc        = !empty($_POST['desc'])      ? notags(trim($_POST['desc']))      : '';
-               $rawtags     = !empty($_POST['newtag'])    ? notags(trim($_POST['newtag']))    : '';
+               $desc        = !empty($_POST['desc'])      ? Strings::removeTags(trim($_POST['desc']))      : '';
+               $rawtags     = !empty($_POST['newtag'])    ? Strings::removeTags(trim($_POST['newtag']))    : '';
                $item_id     = !empty($_POST['item_id'])   ? intval($_POST['item_id'])         : 0;
-               $albname     = !empty($_POST['albname'])   ? notags(trim($_POST['albname']))   : '';
-               $origaname   = !empty($_POST['origaname']) ? notags(trim($_POST['origaname'])) : '';
+               $albname     = !empty($_POST['albname'])   ? Strings::removeTags(trim($_POST['albname']))   : '';
+               $origaname   = !empty($_POST['origaname']) ? Strings::removeTags(trim($_POST['origaname'])) : '';
 
                $str_group_allow   = !empty($_POST['group_allow'])   ? perms2str($_POST['group_allow'])   : '';
                $str_contact_allow = !empty($_POST['contact_allow']) ? perms2str($_POST['contact_allow']) : '';
@@ -707,8 +708,8 @@ function photos_post(App $a)
        Addon::callHooks('photo_post_init', $_POST);
 
        // Determine the album to use
-       $album    = !empty($_REQUEST['album'])    ? notags(trim($_REQUEST['album']))    : '';
-       $newalbum = !empty($_REQUEST['newalbum']) ? notags(trim($_REQUEST['newalbum'])) : '';
+       $album    = !empty($_REQUEST['album'])    ? Strings::removeTags(trim($_REQUEST['album']))    : '';
+       $newalbum = !empty($_REQUEST['newalbum']) ? Strings::removeTags(trim($_REQUEST['newalbum'])) : '';
 
        Logger::log('mod/photos.php: photos_post(): album= ' . $album . ' newalbum= ' . $newalbum , Logger::DEBUG);