Bug #5095 : fixing technical error from Quizz application.

Author: SilverYoCha

quizz/quizz-war/src/main/java/com/stratelia/webactiv/quizz/control/QuizzSessionController.java

@@ -666,13 +666,13 @@ public List<ComponentInstLight> getGalleries() {
     List<ComponentInstLight> galleries = null;
     OrganisationController orgaController = new OrganizationController();
     String[] compoIds = orgaController.getCompoId("gallery");
-    for (int c = 0; c < compoIds.length; c++) {
-      if ("yes".equalsIgnoreCase(orgaController.getComponentParameterValue("gallery" + compoIds[c],
-          "viewInWysiwyg"))) {
+    for (final String compoId : compoIds) {
+      if ("yes".equalsIgnoreCase(
+          orgaController.getComponentParameterValue("gallery" + compoId, "viewInWysiwyg"))) {
         if (galleries == null) {
           galleries = new ArrayList<ComponentInstLight>();
         }
-        ComponentInstLight gallery = orgaController.getComponentInstLight("gallery" + compoIds[c]);
+        ComponentInstLight gallery = orgaController.getComponentInstLight("gallery" + compoId);
         galleries.add(gallery);
       }
     }

quizz/quizz-war/src/main/webapp/quizz/jsp/questionCreator.jsp

@@ -612,14 +612,15 @@ if ((action.equals("CreateQuestion")) || (action.equals("SendQuestionForm"))) {
 
         <div class="thumbnailInputs">
         <img title="<%=resources.getString("survey.answer.image.select")%>" alt="<%=resources.getString("survey.answer.image.select")%>" src="/silverpeas/util/icons/images.png" /> <input type="file" id="thumbnailFile" size="40" name="image<%=i%>" />
+        <%if (galleries != null) {%>
         <span class="txtsublibform"> ou </span><input type="hidden" name="valueImageGallery<%= i %>" id="valueImageGallery<%= i %>"/>
          <select class="galleries" name="galleries" onchange="choixGallery(this, '<%= i %>');this.selectedIndex=0;"> 
            <option selected><%= resources.getString("survey.galleries") %></option>
 <%
-          for (int k = 0; k < galleries.size(); k++) {
-            ComponentInstLight gallery = galleries.get(k); %>
+          for (ComponentInstLight gallery : galleries) { %>
              <option value="<%= gallery.getId() %>"><%= gallery.getLabel() %></option> 
-<%        } %>
+<%        }
+        } %>
           </select>
         </div>
       </div>

quizz/quizz-war/src/main/webapp/quizz/jsp/questionCreatorBis.jsp

@@ -508,14 +508,15 @@ if ((action.equals("CreateQuestion")) || (action.equals("SendQuestionForm"))) {
 
         <div class="thumbnailInputs">
         <img title="<%=resources.getString("survey.answer.image.select")%>" alt="<%=resources.getString("survey.answer.image.select")%>" src="/silverpeas/util/icons/images.png" /> <input type="file" id="thumbnailFile" size="40" name="image<%=i%>" />
+          <%if (galleries != null) {%>
         <span class="txtsublibform"> ou </span><input type="hidden" name="valueImageGallery<%= i %>" id="valueImageGallery<%= i %>"/>
          <select class="galleries" name="galleries" onchange="choixGallery(this, '<%= i %>');this.selectedIndex=0;"> 
            <option selected><%= resources.getString("survey.galleries") %></option>
 <%
-          for (int k = 0; k < galleries.size(); k++) {
-            ComponentInstLight gallery = galleries.get(k); %>
+          for (ComponentInstLight gallery : galleries) { %>
              <option value="<%= gallery.getId() %>"><%= gallery.getLabel() %></option> 
-<%        } %>
+<%        }
+        } %>
           </select>
         </div>
       </div>