Skip to content

Commit a66e6fc

Browse files
mmoquimmoqui
committed
Take into account the feedback of Sonar analysis of the previous commit
1 parent eee02d7 commit a66e6fc

File tree

1 file changed

+36
-34
lines changed

1 file changed

+36
-34
lines changed

‎classifieds/classifieds-war/src/main/webapp/classifieds/jsp/classifiedManager.jsp

Lines changed: 36 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@
110110
<fmt:message var="GML_ThisFormContains" key="GML.ThisFormContains"/>
111111
<fmt:message var="GML_error" key="GML.error"/>
112112
<fmt:message var="GML_errors" key="GML.errors"/>
113+
<fmt:message var="mandatoryField" key="GML.requiredField"/>
114+
<fmt:message var="deletionOp" key="GML.delete"/>
113115

114116
<script type="text/javascript">
115117
@@ -140,7 +142,6 @@
140142
141143
function ifCorrectLocalFormExecute(callback)
142144
{
143-
let verif;
144145
let errorMsg = "";
145146
let errorNb = 0;
146147
const title = stripInitialWhitespace(document.classifiedForm.Title.value);
@@ -168,35 +169,28 @@
168169
</c:if>
169170
170171
<c:if test="${instanceSettings.photosAllowed}">
171-
if (!isWhitespace(document.classifiedForm.Image1.value)) {
172-
verif = /[.][jpg,gif,bmp,tiff,tif,jpeg,png,JPG,GIF,BMP,TIFF,TIF,JPEG,PNG]{3,4}$/;
173-
if (verif.exec(document.classifiedForm.Image1.value) == null) {
174-
errorMsg+=" - '${classifieds_image}1' : ${classifieds_imageFormat}\n";
172+
let imgExtPattern = /\.(jpg|gif|bmp|tiff|tif|jpeg|png|webp)$/i;
173+
if (!isWhitespace(document.classifiedForm.Image1.value) &&
174+
imgExtPattern.exec(document.classifiedForm.Image1.value) == null) {
175+
errorMsg+=" - '${classifieds_image}1': ${classifieds_imageFormat}\n";
175176
errorNb++;
176-
}
177177
}
178178
179-
if (!isWhitespace(document.classifiedForm.Image2.value)) {
180-
verif = /[.][jpg,gif,bmp,tiff,tif,jpeg,png,JPG,GIF,BMP,TIFF,TIF,JPEG,PNG]{3,4}$/;
181-
if (verif.exec(document.classifiedForm.Image2.value) == null) {
182-
errorMsg+=" - '${classifieds_image}2' : ${classifieds_imageFormat}\n";
179+
if (!isWhitespace(document.classifiedForm.Image2.value) &&
180+
imgExtPattern.exec(document.classifiedForm.Image2.value) == null) {
181+
errorMsg+=" - '${classifieds_image}2': ${classifieds_imageFormat}\n";
183182
errorNb++;
184-
}
185183
}
186184
187-
if (!isWhitespace(document.classifiedForm.Image3.value)) {
188-
verif = /[.][jpg,gif,bmp,tiff,tif,jpeg,png,JPG,GIF,BMP,TIFF,TIF,JPEG,PNG]{3,4}$/;
189-
if (verif.exec(document.classifiedForm.Image3.value) == null) {
190-
errorMsg+=" - '${classifieds_image}3' : ${classifieds_imageFormat}\n";
185+
if (!isWhitespace(document.classifiedForm.Image3.value) &&
186+
imgExtPattern.exec(document.classifiedForm.Image3.value) == null) {
187+
errorMsg+=" - '${classifieds_image}3': ${classifieds_imageFormat}\n";
191188
errorNb++;
192-
}
193189
}
194-
if (!isWhitespace(document.classifiedForm.Image4.value)) {
195-
verif = /[.][jpg,gif,bmp,tiff,tif,jpeg,png,JPG,GIF,BMP,TIFF,TIF,JPEG,PNG]{3,4}$/;
196-
if (verif.exec(document.classifiedForm.Image4.value) == null) {
197-
errorMsg+=" - '${classifieds_image}4' : ${classifieds_imageFormat}\n";
198-
errorNb++;
199-
}
190+
if (!isWhitespace(document.classifiedForm.Image4.value) &&
191+
imgExtPattern.exec(document.classifiedForm.Image4.value) == null) {
192+
errorMsg+=" - '${classifieds_image}4': ${classifieds_imageFormat}\n";
193+
errorNb++;
200194
}
201195
</c:if>
202196
@@ -205,7 +199,7 @@
205199
callback.call(this);
206200
break;
207201
case 1 :
208-
errorMsg = "${GML_ThisFormContains} 1 ${GML_error} : \n" + errorMsg;
202+
errorMsg = "${GML_ThisFormContains} 1 ${GML_error}: \n" + errorMsg;
209203
jQuery.popup.error(errorMsg);
210204
break;
211205
default :
@@ -217,6 +211,7 @@
217211
function hideImageFile(idElement) {
218212
document.getElementById("imageFile"+idElement).style.visibility = "hidden";
219213
document.classifiedForm["RemoveImageFile"+idElement].value = "yes";
214+
return true;
220215
}
221216
222217
</script>
@@ -240,7 +235,8 @@
240235
</c:if>
241236
</c:set>
242237
<c:set var="displayedId"><view:encodeHtml string="${classifiedId}" /></c:set>
243-
238+
<c:set var="mandatoryIcon">${pageContext.request.contextPath}<fmt:message key="classifieds.mandatory" bundle="${icons}"/></c:set>
239+
<c:set var="deletionIcon">${pageContext.request.contextPath}<fmt:message key="classifieds.crossDelete" bundle="${icons}"/></c:set>
244240
<form name="classifiedForm" class="classifiedForm" action="${action}" method="post" enctype="multipart/form-data" onsubmit="sendData();return false;">
245241
<fieldset id="classifiedInfo" class="skinFieldset">
246242
<legend><fmt:message key="classifieds.mainInfos"/></legend>
@@ -259,7 +255,7 @@
259255
<label for="classifiedName" class="txtlibform"><fmt:message key="GML.title"/></label>
260256
<div class="champs">
261257
<input type="text" name="Title" id="classifiedName" size="60" maxlength="100" value="${displayedTitle}"/>
262-
&nbsp;<img src="${pageContext.request.contextPath}<fmt:message key="classifieds.mandatory" bundle="${icons}"/>" width="5" height="5" />
258+
&nbsp;<img alt="${mandatoryField}" src="${mandatoryIcon}" width="5" height="5" />
263259
<input type="hidden" name="ClassifiedId" value="${displayedId}"/>
264260
<input type="hidden" id="publishInput" name="Publish" value=""/>
265261
</div>
@@ -269,7 +265,7 @@
269265
<label for="classifiedDesc" class="txtlibform"><fmt:message key="GML.description"/></label>
270266
<div class="champs">
271267
<textarea cols="100" rows="8" name="Description" id="classifiedDesc">${displayedDescription}</textarea>
272-
&nbsp;<img src="${pageContext.request.contextPath}<fmt:message key="classifieds.mandatory" bundle="${icons}"/>" width="5" height="5" />
268+
&nbsp;<img alt="${mandatoryField}" src="${mandatoryIcon}" width="5" height="5" />
273269
</div>
274270
</div>
275271

@@ -284,7 +280,7 @@
284280

285281
<c:if test="${action eq 'UpdateClassified'}">
286282
<div class="field" id="creationDateArea">
287-
<label class="txtlibform"><fmt:message key="classifieds.creationDate"/></label>
283+
<span class="label txtlibform"><fmt:message key="classifieds.creationDate"/></span>
288284
<div class="champs">
289285
<view:formatDateTime value="${creationDate}"/> <fmt:message key="classifieds.by"/>
290286
<view:username userId="${creatorId}" />
@@ -293,23 +289,25 @@
293289
</c:if>
294290
<c:if test="${not empty updateDate}">
295291
<div class="field" id="updateDateArea">
296-
<label class="txtlibform"><fmt:message key="classifieds.updateDate"/></label>
292+
<span class="label txtlibform"><fmt:message key="classifieds.updateDate"/></span>
297293
<div class="champs">
298294
<view:formatDateTime value="${updateDate}"/>
299295
</div>
300296
</div>
301297
</c:if>
302298
<c:if test="${(not empty validateDate) && (not empty validatorName)}">
303299
<div class="field" id="validationDateArea">
304-
<label class="txtlibform"><fmt:message key="classifieds.validateDate"/></label>
300+
<span class="label txtlibform"><fmt:message key="classifieds.validateDate"/></span>
305301
<div class="champs">
306302
<view:formatDateTime value="${validateDate}" /> <fmt:message key="classifieds.by"/> ${validatorName}
307303
</div>
308304
</div>
309305
</c:if>
310306

311307
<div class="field" id="mandatoryArea">
312-
<label class="txtlibform"><img src="${pageContext.request.contextPath}<fmt:message key="classifieds.mandatory" bundle="${icons}" />" width="5" height="5"/> : <fmt:message key="GML.requiredField"/></label>
308+
<span class="txtlibform">
309+
<img alt="${mandatoryField}" src="${mandatoryIcon}" width="5" height="5"/>&nbsp;&nbsp;${mandatoryField}
310+
</span>
313311
</div>
314312

315313
</div>
@@ -329,7 +327,7 @@
329327
<view:image src="${image.attachmentURL}" size="250x" css="thumbnail" id="actualImage1"/>
330328
</div>
331329
<div id="thumbnailActions">
332-
<a href="javascript:onClick=hideImageFile('1');"><img src="${pageContext.request.contextPath}<fmt:message key="classifieds.crossDelete" bundle="${icons}"/>" /></a>
330+
<a href="javascript:onClick=hideImageFile('1');"><img alt="${deletionOp}" src="${deletionIcon}" /></a>
333331
<input type="hidden" name="IdImage1" value="${image.id}"/>
334332
</div>
335333
</div>
@@ -348,7 +346,9 @@
348346
<view:image src="${image.attachmentURL}" size="250x" css="thumbnail" id="actualImage2"/>
349347
</div>
350348
<div id="thumbnailActions">
351-
<a href="javascript:onClick=hideImageFile('2');"><img src="${pageContext.request.contextPath}<fmt:message key="classifieds.crossDelete" bundle="${icons}"/>" /></a>
349+
<a href="javascript:onClick=hideImageFile('2');">
350+
<img alt="${deletionOp}" src="${deletionIcon}" />
351+
</a>
352352
<input type="hidden" name="IdImage2" value="${image.id}"/>
353353
</div>
354354
</div>
@@ -367,7 +367,8 @@
367367
<view:image src="${image.attachmentURL}" size="250x" css="thumbnail" id="actualImage3"/>
368368
</div>
369369
<div id="thumbnailActions">
370-
<a href="javascript:onClick=hideImageFile('3');"><img src="${pageContext.request.contextPath}<fmt:message key="classifieds.crossDelete" bundle="${icons}"/>"/></a>
370+
<a href="javascript:onClick=hideImageFile('3');">
371+
<img alt="${deletionOp}" src="${deletionIcon}"/></a>
371372
<input type="hidden" name="IdImage3" value="${image.id}"/>
372373
</div>
373374
</div>
@@ -386,7 +387,8 @@
386387
<view:image src="${image.attachmentURL}" size="250x" css="thumbnail" id="actualImage4"/>
387388
</div>
388389
<div id="thumbnailActions">
389-
<a href="javascript:onClick=hideImageFile('4');"><img src="${pageContext.request.contextPath}<fmt:message key="classifieds.crossDelete" bundle="${icons}"/>"/></a>
390+
<a href="javascript:onClick=hideImageFile('4');">
391+
<img alt="${deletionOp}" src="${deletionIcon}"/></a>
390392
<input type="hidden" name="IdImage4" value="${image.id}"/>
391393
</div>
392394
</div>

0 commit comments

Comments
 (0)