added image_url return value to logs/images/add

Author: following5

okapi/services/logs/images/add/WebService.php

@@ -200,7 +200,7 @@ private static function _call(OkapiRequest $request)
 
         try
         {
-            $position = self::db_insert_image(
+            list($position, $image_url) = self::db_insert_image(
                 $request->consumer->key, $request->token->user_id,
                 $log_internal_id, $image_uuid, $position, $caption, $is_spoiler, $file_ext
             );
@@ -216,7 +216,7 @@ private static function _call(OkapiRequest $request)
             throw $e;
         }
 
-        return array($image_uuid, $position);
+        return array($image_uuid, $position, $image_url);
     }
 
     /**
@@ -333,6 +333,7 @@ private static function db_insert_image(
                 "NOW(), NOW(), '', 0, NOW(), '".Db::escape_string($user_id)."'";
         }
 
+        $image_url = Settings::get('IMAGES_URL').$image_uuid.$file_ext;
         Db::execute("
             insert into pictures (
                 uuid, node, local, title, spoiler, url, object_type, object_id,
@@ -345,7 +346,7 @@ private static function db_insert_image(
                 1,
                 '".Db::escape_string($caption)."',
                 '".($is_spoiler == 'true' ? 1 : 0)."',
-                '".Db::escape_string(Settings::get('IMAGES_URL').$image_uuid.$file_ext)."',
+                '".Db::escape_string($image_url)."',
                 1,
                 '".Db::escape_string($log_internal_id)."',
                 0,
@@ -386,7 +387,7 @@ private static function db_insert_image(
         Db::execute('commit');
         Db::execute('unlock tables');
 
-        return $position;
+        return array($position, $image_url);
     }
 
 
@@ -401,11 +402,12 @@ public static function call(OkapiRequest $request)
 
         try
         {
-            list($image_uuid, $position) = self::_call($request);
+            list($image_uuid, $position, $image_url) = self::_call($request);
             $result = array(
                 'success' => true,
                 'message' => _("Image has been successfully saved."),
                 'image_uuid' => $image_uuid,
+                'image_url' => $image_url,
                 'position' => $position
             );
             Okapi::gettext_domain_restore();
@@ -417,6 +419,7 @@ public static function call(OkapiRequest $request)
                 'success' => false,
                 'message' => $e->getMessage(),
                 'image_uuid' => null,
+                'image_url' => null,
                 'position' => null
             );
         }

okapi/services/logs/images/add/docs.xml

@@ -73,6 +73,10 @@
                 <b>image_uuid</b> - ID of the appended image, or <b>null</b> in
                 case of an error,
             </li>
+            <li>
+                <b>image_url</b> - URL of the appended image, or <b>null</b> in
+                case of an error,
+            </li>
             <li>
                 <b>position</b> - 0-based position of the appended image
                 on the log entry's list of images; <b>null</b> in case of