OpenmeetingsVariables.java (apache-openmeetings-6.1.0-src) | : | OpenmeetingsVariables.java (apache-openmeetings-6.2.0-src) | ||
---|---|---|---|---|
skipping to change at line 24 | skipping to change at line 24 | |||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | |||
* KIND, either express or implied. See the License for the | * KIND, either express or implied. See the License for the | |||
* specific language governing permissions and limitations | * specific language governing permissions and limitations | |||
* under the License. | * under the License. | |||
*/ | */ | |||
package org.apache.openmeetings.util; | package org.apache.openmeetings.util; | |||
import static org.apache.wicket.csp.CSPDirectiveSrcValue.SELF; | import static org.apache.wicket.csp.CSPDirectiveSrcValue.SELF; | |||
import static org.apache.wicket.csp.CSPDirectiveSrcValue.STRICT_DYNAMIC; | import static org.apache.wicket.csp.CSPDirectiveSrcValue.STRICT_DYNAMIC; | |||
import java.net.URI; | ||||
import org.slf4j.Logger; | ||||
import org.slf4j.LoggerFactory; | ||||
import com.github.openjson.JSONObject; | import com.github.openjson.JSONObject; | |||
public class OpenmeetingsVariables { | public class OpenmeetingsVariables { | |||
private static final Logger log = LoggerFactory.getLogger(OpenmeetingsVar iables.class); | ||||
public static final String ATTR_CLASS = "class"; | public static final String ATTR_CLASS = "class"; | |||
public static final String ATTR_TITLE = "title"; | public static final String ATTR_TITLE = "title"; | |||
public static final String ATTR_DISABLED = "disabled"; | public static final String ATTR_DISABLED = "disabled"; | |||
public static final String PARAM_USER_ID = "userId"; | public static final String PARAM_USER_ID = "userId"; | |||
public static final String PARAM_STATUS = "status"; | public static final String PARAM_STATUS = "status"; | |||
public static final String PARAM_SRC = "src"; | public static final String PARAM_SRC = "src"; | |||
public static final String PARAM__SRC = "_src"; | public static final String PARAM__SRC = "_src"; | |||
public static final String CONFIG_CRYPT = "crypt.class.name"; | public static final String CONFIG_CRYPT = "crypt.class.name"; | |||
public static final String CONFIG_DASHBOARD_SHOW_CHAT = "dashboard.show.c hat"; | public static final String CONFIG_DASHBOARD_SHOW_CHAT = "dashboard.show.c hat"; | |||
public static final String CONFIG_DASHBOARD_SHOW_MYROOMS = "dashboard.sho w.myrooms"; | public static final String CONFIG_DASHBOARD_SHOW_MYROOMS = "dashboard.sho w.myrooms"; | |||
skipping to change at line 251 | skipping to change at line 257 | |||
} | } | |||
public static void setMaxUploadSize(long size) { | public static void setMaxUploadSize(long size) { | |||
maxUploadSize = size; | maxUploadSize = size; | |||
} | } | |||
public static String getBaseUrl() { | public static String getBaseUrl() { | |||
return baseUrl; | return baseUrl; | |||
} | } | |||
private static URI getWebappPath(String url) { | ||||
return URI.create(URI.create(url + "/").normalize().getPath()); | ||||
} | ||||
public static URI getWebappPath() { | ||||
try { | ||||
return getWebappPath(baseUrl); | ||||
} catch (Exception e) { | ||||
log.warn("Error getting baseURL"); | ||||
return getWebappPath(DEFAULT_BASE_URL); | ||||
} | ||||
} | ||||
public static void setBaseUrl(String url) { | public static void setBaseUrl(String url) { | |||
baseUrl = url; | baseUrl = url; | |||
} | } | |||
public static boolean isSipEnabled() { | public static boolean isSipEnabled() { | |||
return sipEnabled; | return sipEnabled; | |||
} | } | |||
public static void setSipEnabled(boolean enabled) { | public static void setSipEnabled(boolean enabled) { | |||
sipEnabled = enabled; | sipEnabled = enabled; | |||
End of changes. 3 change blocks. | ||||
0 lines changed or deleted | 19 lines changed or added |