X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FPhoto.php;h=4ec4f204c3c4efee2973ca7f94454fbe479ba9a9;hb=18807ae21d3f18e187a524ea2dfb12830feb8ca3;hp=bcfe13f5372e4330a2650f15caa8225a3109ab66;hpb=c1f99c70b1c7d62120723f3b142e843ba25ab338;p=friendica.git diff --git a/src/Module/Photo.php b/src/Module/Photo.php index bcfe13f537..4ec4f204c3 100644 --- a/src/Module/Photo.php +++ b/src/Module/Photo.php @@ -53,15 +53,15 @@ class Photo extends BaseModule switch($a->argc) { case 4: $customsize = intval($a->argv[2]); - $uid = self::stripExtension($a->argv[3]); + $uid = MPhoto::stripExtension($a->argv[3]); $photo = self::getAvatar($uid, $a->argv[1]); break; case 3: - $uid = self::stripExtension($a->argv[2]); + $uid = MPhoto::stripExtension($a->argv[2]); $photo = self::getAvatar($uid, $a->argv[1]); break; case 2: - $photoid = self::stripExtension($a->argv[1]); + $photoid = MPhoto::stripExtension($a->argv[1]); $scale = 0; if (substr($photoid, -2, 1) == "-") { $scale = intval(substr($photoid, -1, 1)); @@ -117,15 +117,6 @@ class Photo extends BaseModule exit(); } - private static function stripExtension($name) - { - $name = str_replace([".jpg", ".png", ".gif"], ["", "", ""], $name); - foreach (Image::supportedTypes() as $m => $e) { - $name = str_replace("." . $e, "", $name); - } - return $name; - } - private static function getAvatar($uid, $type="avatar") {