Small code layout cleanup.

app/models/authorization.rb

@@ -58,7 +58,7 @@ class Authorization < ApplicationModel
     end
 
     # save/update avatar
-    if hash['info']['image']
+    if hash['info'].present? && hash['info']['image'].present?
       avatar = Avatar.add(
         object: 'User',
         o_id: user.id,

app/models/avatar.rb

@@ -104,6 +104,7 @@ add avatar by url
     end
 
     # fetch image based on http url
+    if data[:url].present?
       if data[:url] =~ /^http/
 
         # check if source ist already updated within last 2 minutes
@@ -144,14 +145,12 @@ add avatar by url
         end
         data[:resize][:content] = response.body
         data[:resize][:mime_type] = mime_type
-      if !data[:full]
+        data[:full] ||= {}
-        data[:full] = {}
-      end
         data[:full][:content] = response.body
         data[:full][:mime_type] = mime_type
 
       # try zammad backend to find image based on email
-    elsif data[:url].present? && data[:url] =~ /@/
+      elsif data[:url] =~ /@/
 
         # check if source ist already updated within last 3 minutes
         if avatar_already_exists && avatar_already_exists.source_url == data[:url]
@@ -161,26 +160,25 @@ add avatar by url
         # fetch image
         image = Service::Image.user(data[:url])
         return if !image
-      if !data[:resize]
+        data[:resize] ||= {}
-        data[:resize] = {}
-      end
         data[:resize] = image
-      if !data[:full]
+        data[:full] ||= {}
-        data[:full] = {}
-      end
         data[:full] = image
       end
+    end
 
     # check if avatar need to be updated
+    if data[:resize].present? && data[:resize][:content].present?
       record[:store_hash] = Digest::MD5.hexdigest(data[:resize][:content])
       if avatar_already_exists && avatar_already_exists.store_hash == record[:store_hash]
         avatar_already_exists.touch
         return avatar_already_exists
       end
+    end
 
     # store images
     object_name = "Avatar::#{data[:object]}"
-    if data[:full]
+    if data[:full].present?
       store_full = Store.add(
         object: "#{object_name}::Full",
         o_id: data[:o_id],
@@ -194,7 +192,7 @@ add avatar by url
       record[:store_full_id] = store_full.id
       record[:store_hash]    = Digest::MD5.hexdigest(data[:full][:content])
     end
-    if data[:resize]
+    if data[:resize].present?
       store_resize = Store.add(
         object: "#{object_name}::Resize",
         o_id: data[:o_id],
@@ -209,6 +207,8 @@ add avatar by url
       record[:store_hash]      = Digest::MD5.hexdigest(data[:resize][:content])
     end
 
+    return if record[:store_resize_id].blank? || record[:store_hash].blank?
+
     # update existing
     if avatar_already_exists
       avatar_already_exists.update!(record)

app/models/setting.rb

@@ -38,7 +38,7 @@ set config setting
     end
     setting.state_current = { value: value }
     setting.save!
-    logger.info "Setting.set(#{name}, #{value.inspect})"
+    logger.info "Setting.set('#{name}', #{value.inspect})"
   end
 
 =begin
@@ -72,7 +72,7 @@ reset config setting to default
     return true if !force && setting.state_current == setting.state_initial
     setting.state_current = setting.state_initial
     setting.save!
-    logger.info "Setting.reset(#{name}, #{setting.state_current.inspect})"
+    logger.info "Setting.reset('#{name}', #{setting.state_current.inspect})"
   end
 
 =begin