diff --git a/layouts/v7/modules/Users/PreferenceDetailViewHeader.tpl b/layouts/v7/modules/Users/PreferenceDetailViewHeader.tpl
index 3c6173ce5b42be83a27864c0577e201d58fee7d2..d9a79561b345437dd841da6058fa4e8d76b3696f 100644
--- a/layouts/v7/modules/Users/PreferenceDetailViewHeader.tpl
+++ b/layouts/v7/modules/Users/PreferenceDetailViewHeader.tpl
@@ -18,7 +18,7 @@
<div class="col-xs-8">
{assign var=IMAGE_DETAILS value=$RECORD->getImageDetails()}
{foreach key=ITER item=IMAGE_INFO from=$IMAGE_DETAILS}
- {if !empty($IMAGE_INFO.url) && !empty($IMAGE_INFO.orgname)}
+ {if !empty($IMAGE_INFO.url)}
<span class="logo col-xs-2">
<img height="75px" width="75px" src="{$IMAGE_INFO.url}" alt="{$IMAGE_INFO.orgname}" title="{$IMAGE_INFO.orgname}" data-image-id="{$IMAGE_INFO.id}">
</span>
diff --git a/layouts/v7/modules/Users/UserViewHeader.tpl b/layouts/v7/modules/Users/UserViewHeader.tpl
index 0e4b6266523a7f5aeb39bce42caec5758232e6fe..754487eb3507f85796fa72369cc331f19a1383f1 100644
--- a/layouts/v7/modules/Users/UserViewHeader.tpl
+++ b/layouts/v7/modules/Users/UserViewHeader.tpl
@@ -18,7 +18,7 @@
<div class="col-md-5 recordImage" style="height: 50px;width: 50px;">
{assign var=NOIMAGE value=0}
{foreach key=ITER item=IMAGE_INFO from=$RECORD->getImageDetails()}
- {if !empty($IMAGE_INFO.url) && !empty($IMAGE_INFO.orgname)}
+ {if !empty($IMAGE_INFO.url)}
<img height="100%" width="100%" src="{$IMAGE_INFO.url}" alt="{$IMAGE_INFO.orgname}" title="{$IMAGE_INFO.orgname}" data-image-id="{$IMAGE_INFO.id}">
{else}
{assign var=NOIMAGE value=1}
diff --git a/layouts/v7/modules/Vtiger/RecentActivities.tpl b/layouts/v7/modules/Vtiger/RecentActivities.tpl
index 0da6885c3a69677aadd46d28da47fb2e75db8761..1aaf9ecc49c3ef7a23cf8d42737c6b8ce73278e2 100644
--- a/layouts/v7/modules/Vtiger/RecentActivities.tpl
+++ b/layouts/v7/modules/Vtiger/RecentActivities.tpl
@@ -31,15 +31,15 @@
</time>
{assign var=USER_MODEL value=$RECENT_ACTIVITY->getModifiedBy()}
{assign var=IMAGE_DETAILS value=$USER_MODEL->getImageDetails()}
- {if $IMAGE_DETAILS neq '' && $IMAGE_DETAILS[0] neq '' && $IMAGE_DETAILS[0].path eq ''}
+ {if $IMAGE_DETAILS neq '' && $IMAGE_DETAILS[0] neq '' && $IMAGE_DETAILS[0].url eq ''}
<div class="update_icon bg-info">
<i class='update_image vicon-vtigeruser'></i>
</div>
{else}
{foreach item=IMAGE_INFO from=$IMAGE_DETAILS}
- {if !empty($IMAGE_INFO.path) && !empty({$IMAGE_INFO.orgname})}
+ {if !empty($IMAGE_INFO.url)}
<div class="update_icon">
- <img class="update_image" src="{$IMAGE_INFO.path}_{$IMAGE_INFO.orgname}" >
+ <img class="update_image" src="{$IMAGE_INFO.url}" >
</div>
{/if}
{/foreach}
@@ -59,15 +59,15 @@
</time>
{assign var=USER_MODEL value=$RECENT_ACTIVITY->getModifiedBy()}
{assign var=IMAGE_DETAILS value=$USER_MODEL->getImageDetails()}
- {if $IMAGE_DETAILS neq '' && $IMAGE_DETAILS[0] neq '' && $IMAGE_DETAILS[0].path eq ''}
+ {if $IMAGE_DETAILS neq '' && $IMAGE_DETAILS[0] neq '' && $IMAGE_DETAILS[0].url eq ''}
<div class="update_icon bg-info">
<i class='update_image vicon-vtigeruser'></i>
</div>
{else}
{foreach item=IMAGE_INFO from=$IMAGE_DETAILS}
- {if !empty($IMAGE_INFO.path) && !empty({$IMAGE_INFO.orgname})}
+ {if !empty($IMAGE_INFO.url)}
<div class="update_icon">
- <img class="update_image" src="{$IMAGE_INFO.path}_{$IMAGE_INFO.orgname}" >
+ <img class="update_image" src="{$IMAGE_INFO.url}" >
</div>
{/if}
{/foreach}
diff --git a/layouts/v7/modules/Vtiger/partials/Topbar.tpl b/layouts/v7/modules/Vtiger/partials/Topbar.tpl
index 70d81920063d9abd5c985a07ac92efbb13e69b8f..9cdd3ae0eec60b0633ead8371bbbfbfa84516317 100644
--- a/layouts/v7/modules/Vtiger/partials/Topbar.tpl
+++ b/layouts/v7/modules/Vtiger/partials/Topbar.tpl
@@ -155,8 +155,8 @@
<i class='vicon-vtigeruser' style="font-size:90px"></i>
{else}
{foreach item=IMAGE_INFO from=$IMAGE_DETAILS}
- {if !empty($IMAGE_INFO.path) && !empty({$IMAGE_INFO.orgname})}
- <img src="{$IMAGE_INFO.path}_{$IMAGE_INFO.orgname}" width="100px" height="100px">
+ {if !empty($IMAGE_INFO.url)}
+ <img src="{$IMAGE_INFO.url}" width="100px" height="100px">
{/if}
{/foreach}
{/if}
diff --git a/layouts/v7/modules/Vtiger/uitypes/Image.tpl b/layouts/v7/modules/Vtiger/uitypes/Image.tpl
index b2f0665c86341a19f46844a5cda8af43473b8394..6e9afa7f8c570fe0dbe73408e3ab271fe9ffa0f2 100644
--- a/layouts/v7/modules/Vtiger/uitypes/Image.tpl
+++ b/layouts/v7/modules/Vtiger/uitypes/Image.tpl
@@ -49,8 +49,8 @@
{foreach key=ITER item=IMAGE_INFO from=$IMAGE_DETAILS}
<div class="row" style="margin-top:5px;">
- {if !empty($IMAGE_INFO.path) && !empty({$IMAGE_INFO.orgname})}
- <span class="col-lg-6" name="existingImages"><img src="{$IMAGE_INFO.path}_{$IMAGE_INFO.orgname}" data-image-id="{$IMAGE_INFO.id}" width="400" height="250" ></span>
+ {if !empty($IMAGE_INFO.url)}
+ <span class="col-lg-6" name="existingImages"><img src="{$IMAGE_INFO.url}" data-image-id="{$IMAGE_INFO.id}" width="400" height="250" ></span>
<span class="col-lg-3">
<span class="row">
<span class="col-lg-11">[{$IMAGE_INFO.name}]</span>
@@ -61,4 +61,4 @@
</div>
{/foreach}
{/if}
-{/strip}
\ No newline at end of file
+{/strip}
diff --git a/layouts/v7/modules/Vtiger/uitypes/ImageDetailView.tpl b/layouts/v7/modules/Vtiger/uitypes/ImageDetailView.tpl
index 9fc6de202c9615d44325d8309782d03f0e878acb..a5ca411b80d1a63e0bf5a0b7da4241b6fd0795cf 100644
--- a/layouts/v7/modules/Vtiger/uitypes/ImageDetailView.tpl
+++ b/layouts/v7/modules/Vtiger/uitypes/ImageDetailView.tpl
@@ -10,7 +10,7 @@
********************************************************************************/
-->*}
{foreach key=ITER item=IMAGE_INFO from=$RECORD->getImageDetails()}
- {if !empty($IMAGE_INFO.path) && !empty({$IMAGE_INFO.orgname})}
- <img src="{$IMAGE_INFO.path}_{$IMAGE_INFO.orgname}" width="150" height="80">
+ {if !empty($IMAGE_INFO.url)}
+ <img src="{$IMAGE_INFO.url}" width="150" height="80">
{/if}
{/foreach}
\ No newline at end of file
diff --git a/pkg/vtiger/modules/PBXManager/templates/DetailViewHeaderTitle.tpl b/pkg/vtiger/modules/PBXManager/templates/DetailViewHeaderTitle.tpl
index 6b45a82f0cf1aed60c6bb348e8f027503fd99e7d..16648e7752a4ad7b98690aec2c463886ec1751e5 100644
--- a/pkg/vtiger/modules/PBXManager/templates/DetailViewHeaderTitle.tpl
+++ b/pkg/vtiger/modules/PBXManager/templates/DetailViewHeaderTitle.tpl
@@ -18,8 +18,8 @@
{assign var=IMAGE_DETAILS value=$MODULE_INSTANCE->getImageDetails()}
{if $IMAGE_DETAILS}
{foreach key=ITER item=IMAGE_INFO from=$IMAGE_DETAILS}
- {if !empty($IMAGE_INFO.path)}
- <img src="{$IMAGE_INFO.path}_{$IMAGE_INFO.orgname}" alt="{$IMAGE_INFO.orgname}" title="{$IMAGE_INFO.orgname}" >
+ {if !empty($IMAGE_INFO.url)}
+ <img src="{$IMAGE_INFO.url}" alt="{$IMAGE_INFO.orgname}" title="{$IMAGE_INFO.orgname}" >
{else}
<img src="{vimage_path('summary_Contact.png')}" class="summaryImg"/>
{/if}