From 72e133442f8ea6a2e9974e75ad55bc878af28219 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Mon, 19 Sep 2016 17:49:25 +0200 Subject: [PATCH] Version 15.256 --- swad_changelog.h | 5 ++-- swad_chat.c | 9 ++++-- swad_config.h | 73 ++++++------------------------------------------ swad_main.c | 4 +-- swad_text.c | 44 ----------------------------- 5 files changed, 20 insertions(+), 115 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index 4825f26bb..fbc5c39e6 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -133,19 +133,20 @@ // TODO: If a user creates a request for inscription, and the user is removed ==> mark possible notifications as removed -// TODO: Passwords with % do not work +// TODO: FIX BUG: Passwords with % do not work /*****************************************************************************/ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.255 (2016-09-18)" +#define Log_PLATFORM_VERSION "SWAD 15.256 (2016-09-19)" #define CSS_FILE "swad15.229.css" #define JS_FILE "swad15.238.1.js" // Number of lines (includes comments but not blank lines) has been got with the following command: // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1 /* + Version 15.256: Sep 19, 2016 PRADO web service removed from swad.ugr.es. (204722 lines) Version 15.255: Sep 18, 2016 Migration to new server. (204804 lines) Version 15.254.2: Sep 13, 2016 Fixed bug while getting summary and content of a social note related to a new file. (204706 lines) Version 15.254.1: Sep 13, 2016 Fixed bugs related to tests, reported by Rafael Montoya Juárez. (204702 lines) diff --git a/swad_chat.c b/swad_chat.c index cdd890923..e664e87bc 100644 --- a/swad_chat.c +++ b/swad_chat.c @@ -513,8 +513,10 @@ void Cht_OpenChatWindow (void) Gbl.Layout.HTMLStartWritten = true; /***** Copy index.html file until the end of the applet code *****/ - Str_WriteUntilStrFoundInFileIncludingStr (Gbl.F.Out,FileChat,"",Str_NO_SKIP_HTML_COMMENTS); + Str_WriteUntilStrFoundInFileIncludingStr (Gbl.F.Out,FileChat,"", + Str_NO_SKIP_HTML_COMMENTS); /***** Write parameters *****/ fprintf (Gbl.F.Out,"\n", @@ -538,7 +540,8 @@ void Cht_OpenChatWindow (void) ListRoomFullNames); /***** Copy index.html file until the end *****/ - Str_WriteUntilStrFoundInFileIncludingStr (Gbl.F.Out,FileChat,"",Str_NO_SKIP_HTML_COMMENTS); + Str_WriteUntilStrFoundInFileIncludingStr (Gbl.F.Out,FileChat,"", + Str_NO_SKIP_HTML_COMMENTS); /***** Close index.html file *****/ fclose (FileChat); diff --git a/swad_config.h b/swad_config.h index 504522661..d7486e877 100644 --- a/swad_config.h +++ b/swad_config.h @@ -31,7 +31,6 @@ #define LOCALHOST_UBUNTU // Comment this line if not applicable //#define OPENSWAD_ORG // Comment this line if not applicable //#define SWAD_UGR_ES // Comment this line if not applicable -//#define ODE_UGR_ES // 150.214.203.216 //#define SWADBERRY_UGR_ES // Comment this line if not applicable /*****************************************************************************/ @@ -196,6 +195,14 @@ #define Cfg_DEFAULT_COLUMNS Lay_SHOW_BOTH_COLUMNS +#define Cfg_EXTERNAL_LOGIN_CLIENT_COMMAND "" // Client of the web service called by this CGI +#define Cfg_EXTERNAL_LOGIN_SERVICE_NAME "" +#define Cfg_EXTERNAL_LOGIN_URL "" +#define Cfg_NAME_PARAM_IMPORTED_USR_ID "" +#define Cfg_NAME_PARAM_IMPORTED_SESSION_ID "" +#define Cfg_MAX_LENGTH_IMPORTED_USR_ID 255 // The same size as that of column ImportedUsrId in table imported_sessions +#define Cfg_MAX_LENGTH_IMPORTED_SESSION_ID 255 // The same size as that of column ImportedSessionId in table imported_sessions +/* #define Cfg_EXTERNAL_LOGIN_CLIENT_COMMAND "./prado" // Client of the web service called by this CGI #define Cfg_EXTERNAL_LOGIN_SERVICE_NAME "PRADO (Plataforma de Recursos de Apoyo a la Docencia)" #define Cfg_EXTERNAL_LOGIN_URL "https://oficinavirtual.ugr.es/" @@ -203,69 +210,7 @@ #define Cfg_NAME_PARAM_IMPORTED_SESSION_ID "pradosession" #define Cfg_MAX_LENGTH_IMPORTED_USR_ID 255 // The same size as that of column ImportedUsrId in table imported_sessions #define Cfg_MAX_LENGTH_IMPORTED_SESSION_ID 255 // The same size as that of column ImportedSessionId in table imported_sessions - -#define Cfg_TIME_TO_SEND_PENDING_NOTIF ((time_t)(60UL*60UL)) // After these seconds after first pending notification, all the pending notifications are sent by e-mail - -#define Cfg_GOOGLE_ANALYTICS "" - -#elif defined ODE_UGR_ES // ode.ugr.es 150.214.203.216 ************************* - -#define Cfg_PLATFORM_SHORT_NAME "SWAD" -#define Cfg_PLATFORM_FULL_NAME "SWAD (Shared Workspace At a Distance)" -#define Cfg_PLATFORM_SERVER "150.214.203.216" // Server name (main part of the URL) -#define Cfg_URL_SWAD_CGI "https://150.214.203.216" // Without ending slash -#define Cfg_URL_SWAD_PUBLIC "https://150.214.203.216/swad" // Without ending slash -#define Cfg_PATH_CGI_BIN "/var/www/cgi-bin" // Directory for this CGI and other commands called by it -#define Cfg_PATH_SWAD_PUBLIC "/var/www/html/swad" // Main public directory for public SWAD pages, icons, etc. -#define Cfg_PATH_SWAD_PRIVATE "/var/www/swad" // Main private directory for SWAD private data - -#define Cfg_PLATFORM_LOGO_SMALL_FILENAME "swad-ugr128x64.png" // Logo displayed in the top of the page -#define Cfg_PLATFORM_LOGO_SMALL_WIDTH 80 -#define Cfg_PLATFORM_LOGO_SMALL_HEIGHT 40 -#define Cfg_PLATFORM_LOGO_BIG_FILENAME "swad-ugr280x64.png" -#define Cfg_PLATFORM_LOGO_BIG_WIDTH 175 -#define Cfg_PLATFORM_LOGO_BIG_HEIGHT 40 - -#define Cfg_PLATFORM_RESPONSIBLE_NAME "UGR" // Main responsible for the platform -#define Cfg_PLATFORM_RESPONSIBLE_E_MAIL "swad@ugr.es" // Main responsible for the platform -#define Cfg_AUTOMATIC_EMAIL_SMTP_SERVER "smtp.ugr.es" // SMTP server for sending automatic e-mails -#define Cfg_AUTOMATIC_EMAIL_SMTP_PORT "587" // SMTP port for sending automatic e-mails -#define Cfg_AUTOMATIC_EMAIL_FROM "swad@ugr.es" // E-mail address from where automatic e-mails will be sent -#define Cfg_DATABASE_HOST "localhost" // Database host -#define Cfg_DEFAULT_LANGUAGE Txt_LANGUAGE_ES // Default language -#define Cfg_LOG_START_YEAR 2005 // Year when the log started in the database - -// Footer of page with info about the institution where this platform is installed -#define Cfg_ABOUT_NAME "Universidad de Granada" -#define Cfg_ABOUT_URL "http://www.ugr.es/" -#define Cfg_ABOUT_LOGO "ugr100x32.png" -#define Cfg_ABOUT_LOGO_WIDTH 100 -#define Cfg_ABOUT_LOGO_HEIGHT 32 - -#define Cfg_DEFAULT_COLUMNS Lay_SHOW_BOTH_COLUMNS - -#define Cfg_EXTERNAL_LOGIN_CLIENT_COMMAND "./prado" // Client of the web service called by this CGI -#define Cfg_EXTERNAL_LOGIN_SERVICE_NAME "PRADO (Plataforma de Recursos de Apoyo a la Docencia)" -#define Cfg_EXTERNAL_LOGIN_URL "https://oficinavirtual.ugr.es/" -#define Cfg_NAME_PARAM_IMPORTED_USR_ID "pradouser" -#define Cfg_NAME_PARAM_IMPORTED_SESSION_ID "pradosession" -#define Cfg_MAX_LENGTH_IMPORTED_USR_ID 255 // The same size as that of column ImportedUsrId in table imported_sessions -#define Cfg_MAX_LENGTH_IMPORTED_SESSION_ID 255 // The same size as that of column ImportedSessionId in table imported_sessions - +*/ #define Cfg_TIME_TO_SEND_PENDING_NOTIF ((time_t)(60UL*60UL)) // After these seconds after first pending notification, all the pending notifications are sent by e-mail #define Cfg_GOOGLE_ANALYTICS "