mirror of https://github.com/acanas/swad-core.git
Version 15.255
This commit is contained in:
Antonio Cañas Vargas
parent
f22bba0bec
commit
20f1288a9a
|
|
@ -131,17 +131,22 @@
|
|||
// TODO: Send attached photos via SOAP?
|
||||
// TODO: Upload photos/files from SWADroid using MIME attachments
|
||||
|
||||
// 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
|
||||
|
||||
/*****************************************************************************/
|
||||
/****************************** Public constants *****************************/
|
||||
/*****************************************************************************/
|
||||
|
||||
#define Log_PLATFORM_VERSION "SWAD 15.254.2 (2016-09-13)"
|
||||
#define Log_PLATFORM_VERSION "SWAD 15.255 (2016-09-18)"
|
||||
#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.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)
|
||||
Version 15.254: Sep 12, 2016 Hits per year in user's usage report. (204685 lines)
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@
|
|||
#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
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
@ -221,6 +222,68 @@
|
|||
" ga('send', 'pageview');" \
|
||||
"</script>"
|
||||
|
||||
#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 "<script type=\"text/javascript\">" \
|
||||
" (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){" \
|
||||
" (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o)," \
|
||||
" m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)" \
|
||||
" })(window,document,'script','//www.google-analytics.com/analytics.js','ga');" \
|
||||
" ga('create', 'UA-42150741-1', 'ugr.es', {" \
|
||||
" 'anonymizeIp': true," \
|
||||
" 'storage': 'none'," \
|
||||
" 'clientId': window.localStorage.getItem('ga_clientId')" \
|
||||
" });" \
|
||||
" ga(function(tracker) {" \
|
||||
" window.localStorage.setItem('ga_clientID', tracker.get('clientId'));" \
|
||||
" });" \
|
||||
" ga('send', 'pageview');" \
|
||||
"</script>"
|
||||
|
||||
#elif defined SWADBERRY_UGR_ES // swadberry.ugr.es ******************
|
||||
|
||||
#define Cfg_PLATFORM_SHORT_NAME "SWADberry"
|
||||
|
|
|
|||
|
|
@ -84,10 +84,10 @@ int main (int argc, char *argv[])
|
|||
"<head><title>%s</title></head>"
|
||||
"<body><br /><br /><br /><br />"
|
||||
"<h1 class=\"CENTER_MIDDLE\">"
|
||||
"%s está parado por mantenimiento durante unos minutos"
|
||||
"%s está parado por migración a un nuevo servidor"
|
||||
"</h1>"
|
||||
"<h2 class=\"CENTER_MIDDLE\">"
|
||||
"Intente acceder más tarde, por favor."
|
||||
"Esperamos que vuelva a funcionar a lo largo del día (lunes 18 de septiembre)"
|
||||
"</h2>"
|
||||
"</body>"
|
||||
"</html>",
|
||||
|
|
|
|||
44
swad_text.c
44
swad_text.c
|
|
@ -40487,6 +40487,50 @@ const char *Txt_TAGLINE_BR =
|
|||
"plataforma de apoio<br />ao ensino (UGR)";
|
||||
# endif
|
||||
|
||||
#elif defined ODE_UGR_ES // ode.ugr.es ************************
|
||||
|
||||
const char *Txt_TAGLINE =
|
||||
# if L==1
|
||||
"plataforma de suport a la docència (UGR)";
|
||||
# elif L==2
|
||||
"Plattform zur Unterstützung der Lehre (UGR)";
|
||||
# elif L==3
|
||||
"platform to support teaching (UGR)";
|
||||
# elif L==4
|
||||
"plataforma de apoyo a la docencia (UGR)";
|
||||
# elif L==5
|
||||
"plate-forme pour appuyer l'enseignement (UGR)";
|
||||
# elif L==6
|
||||
"plataforma de apoyo a la docencia (UGR)"; // Okoteve traducción
|
||||
# elif L==7
|
||||
"piattaforma per sostenere l'insegnamento (UGR)";
|
||||
# elif L==8
|
||||
"platforma do wspierania nauczania (UGR)";
|
||||
# elif L==9
|
||||
"plataforma de apoio ao ensino (UGR)";
|
||||
# endif
|
||||
|
||||
const char *Txt_TAGLINE_BR =
|
||||
# if L==1
|
||||
"plataforma de suport<br />a la docència (UGR)";
|
||||
# elif L==2
|
||||
"Plattform zur Unterstützung<br />der Lehre (UGR)";
|
||||
# elif L==3
|
||||
"platform to support<br />teaching (UGR)";
|
||||
# elif L==4
|
||||
"plataforma de apoyo<br />a la docencia (UGR)";
|
||||
# elif L==5
|
||||
"plate-forme pour appuyer<br />l'enseignement (UGR)";
|
||||
# elif L==6
|
||||
"plataforma de apoyo<br />a la docencia (UGR)"; // Okoteve traducción
|
||||
# elif L==7
|
||||
"piattaforma per sostenere<br />l'insegnamento (UGR)";
|
||||
# elif L==8
|
||||
"platforma do wspierania<br />nauczania (UGR)";
|
||||
# elif L==9
|
||||
"plataforma de apoio<br />ao ensino (UGR)";
|
||||
# endif
|
||||
|
||||
#elif defined SWADBERRY_UGR_ES // swadberry.ugr.es *******************
|
||||
|
||||
const char *Txt_TAGLINE =
|
||||
|
|
|
|||
Loading…
Reference in New Issue