Put OnlyOffice button in toolbar

Author: car031

logicaldoc-core/src/main/java/com/logicaldoc/core/security/SessionManager.java

@@ -444,10 +444,10 @@ public Session getSession(HttpServletRequest request) {
 	 * Gets the Session ID specification from the current request following this
 	 * lookup strategy:
 	 * <ol>
-	 * <li>Session attribute <code>PARAM_SID</code></li>
-	 * <li>Request attribute <code>PARAM_SID</code></li>
 	 * <li>Request parameter <code>PARAM_SID</code></li>
 	 * <li>Request header <code>PARAM_SID</code></li>
+	 * <li>Request attribute <code>PARAM_SID</code></li>
+	 * <li>Session attribute <code>PARAM_SID</code></li>
 	 * <li>Cookie <code>COOKIE_SID</code></li>
 	 * <li>Spring SecurityContextHolder</li>
 	 * <li>Client ID</li>
@@ -481,20 +481,20 @@ private String getSessionIdFromRequest(HttpServletRequest request) {
 			return null;
 
 		String sid = null;
-		if (request.getSession(true).getAttribute(PARAM_SID) != null
-				&& StringUtils.isNotEmpty((String) request.getSession(true).getAttribute(PARAM_SID)))
-			sid = (String) request.getSession(true).getAttribute(PARAM_SID);
-		else if (request.getAttribute(PARAM_SID) != null
-				&& StringUtils.isNotEmpty((String) request.getAttribute(PARAM_SID)))
-			sid = (String) request.getAttribute(PARAM_SID);
-		else if (StringUtils.isNotEmpty(request.getParameter(PARAM_SID))
+		if (StringUtils.isNotEmpty(request.getParameter(PARAM_SID))
 				&& Context.get().getProperties().getBoolean("security.acceptsid", false))
 			sid = request.getParameter(PARAM_SID);
 		else if (StringUtils.isNotEmpty(request.getHeader(PARAM_SID)))
 			sid = request.getHeader(PARAM_SID);
-		else {
+		else if (request.getAttribute(PARAM_SID) != null
+				&& StringUtils.isNotEmpty((String) request.getAttribute(PARAM_SID)))
+			sid = (String) request.getAttribute(PARAM_SID); 
+		else if (request.getSession(true).getAttribute(PARAM_SID) != null
+				&& StringUtils.isNotEmpty((String) request.getSession(true).getAttribute(PARAM_SID)))
+			sid = (String) request.getSession(true).getAttribute(PARAM_SID);
+		else 
 			sid = getSessionIdFromCookie(request);
-		}
+		
 		return sid;
 	}
 

logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/document/DocumentToolbar.java

@@ -486,7 +486,7 @@ private void addOnlyOffice() {
 		if (Feature.visible(Feature.ONLYOFFICE) && Menu.enabled(Menu.ONLYOFFICE)) {
 			addButton(onlyoffice);
 			onlyoffice.setTooltip(I18N.message("editwithonlyoffice"));
-			onlyoffice.setTitle("<i class='fab fa-briefcase fa-lg fa-lg' aria-hidden='true'></i>");
+			onlyoffice.setTitle("<i class='fal fa-briefcase fa-lg fa-lg' aria-hidden='true'></i>");
 			if (!Feature.enabled(Feature.OFFICE))
 				setFeatureDisabled(office);
 

logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/impex/syndication/SyndicationStandardProperties.java

@@ -116,8 +116,6 @@ private void refresh() {
 				hiddenApiKey, changedHandler);
 		apiKey.addChangedHandler(changedHandler);
 
-		GuiLog.info("key: " + syndication.getApiKey());
-
 		TextItem include = ItemFactory.newTextItem("include", syndication.getIncludes());
 		include.addChangedHandler(changedHandler);