WebSVN - bacoAlunos - Path Comparison - / Rev 450 and / Rev 454

Ignore whitespace Rev 450 → Rev 454

 /impl/src/java/jomm/web/ftp/impl/FtpFile.java
 ,6 → 11,7
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
 ,6 → 84,32
         return name;
     }
+    public String getNameEncoded() throws URIException
+    {
+        return URIUtil.encodePath(name,"ISO-8859-1");
+    }
+    public String getNameEscapedHtml()
+    {
+        try {
+            return jomm.utils.TextToHTMLEnconder.escapeHTML(new String(name.getBytes("ISO-8859-1")));
+        } catch (UnsupportedEncodingException e) {
+            logger.error(e,e);
+            return name;
+        }
+    }
+    public String getNameHtml()
+    {
+        try {
+            return new String(name.getBytes("ISO-8859-1"));
+        } catch (UnsupportedEncodingException e) {
+            logger.error(e,e);
+            return name;
+        }
+    }
     public String getExtension()
     {
         return extension;

 /impl/src/java/jomm/web/ftp/IFile.java
 ,6 → 22,9
     public InputStream getInputStream() throws IOException;
     public Date getLastUpdate();
     public String getName();
+    public String getNameEncoded() throws URIException;
+    public String getNameEscapedHtml();
+    public String getNameHtml();
     public String getExtension();
     public String getName(HttpServletRequest request) throws URIException;
     public long getSize();

 /impl/src/java/pt/estgp/estgweb/services/sigesimports/ImportTeachersService.java
 ,13 → 119,13
             if(t.getName() == null || t.getName().length() == 0)
                 t.setName(d.getNomeFuncionarioInt());
             //Email instituicao
-            t.setEmail(d.getEmail());
+            if(t.getEmail() == null || t.getEmail().indexOf("@") < 0)
+                t.setEmail(d.getEmail());
             if (d.getEmail() != null && d.getEmail().endsWith(Globals.EMAIL_LOCAL_SUFFIX))
             {
                 int atIndex = d.getEmail().indexOf("@");
                 if (atIndex > 0)
                     t.setUsername(d.getEmail().substring(0, atIndex));
             }
             t.setSigesCode(d.getCodigoFuncionario().intValue());
             if(t.getAddress() == null || t.getAddress().length() == 0)

/impl/src/doc/baco.ppt
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+ application/octet-stream

 /impl/src/web/css/style.css
 ,11 → 881,23
     text-align:justify;
 }
+#flashBottomNews .flashNew{
+        height:230px;
+}
 .flashNew
 {
     width:100%;
 }
+.flashNew th
+{
+    vertical-align:top;
+}
 .flashNew td
 {
      background-color: #D3D3D3;

 /impl/src/web/user/ftpclient/ftpclient.jsp
 ,10 → 125,10
 <tr class="dir">
     <td colspan="3">
-        <a id="FTP_NODE_<%=++counter%>" style="display:none" href="javascript:if(confirmLink('<bean:message key="ftp.comfirm.delete" arg0="${i.name}"/>')){document.FormFtpManager.deleteFolder.value='<%=i.getName()%>';document.FormFtpManager.submit();}"><img border="0" src="<%=request.getContextPath()%>/imgs/delete.gif" alt="apagar"></a>
+        <a id="FTP_NODE_<%=++counter%>" style="display:none" href="javascript:if(confirmLink('<bean:message key="ftp.comfirm.delete" arg0="${i.nameHtml}"/>')){document.FormFtpManager.deleteFolder.value='<%=i.getNameHtml()%>';document.FormFtpManager.submit();}"><img border="0" src="<%=request.getContextPath()%>/imgs/delete.gif" alt="apagar"></a>
         &nbsp;
         <img alt="<%=i.getCompleteUrl()%>" src="<%=request.getContextPath()%>/imgs/folder.gif">&nbsp;<a
-            href="<%=i.getName(request)%>"><%=i.getName()%>
+            href="<%=i.getName(request)%>"><%=i.getNameEscapedHtml()%>
     </a>
     </td>
 </tr>
 ,8 → 212,7
         <%
             }
         %>
-        <a target="_blank" href="<%=i.getCompleteUrl()%>"><%=i.getName()%>
-        </a>
+        <a target="_blank" href="<%=i.getCompleteUrl()%>"><%=i.getName()%></a>
     </td>
     <td>