mirror of
https://github.com/acanas/swad-core.git
synced 2024-06-01 14:25:27 +02:00
Version 15.200.5
This commit is contained in:
parent
d5c9600c4d
commit
8fc14d3d46
|
@ -137,13 +137,14 @@
|
||||||
/****************************** Public constants *****************************/
|
/****************************** Public constants *****************************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
#define Log_PLATFORM_VERSION "SWAD 15.200.4 (2016-04-18)"
|
#define Log_PLATFORM_VERSION "SWAD 15.200.5 (2016-04-18)"
|
||||||
#define CSS_FILE "swad15.198.css"
|
#define CSS_FILE "swad15.198.css"
|
||||||
#define JS_FILE "swad15.197.js"
|
#define JS_FILE "swad15.197.js"
|
||||||
|
|
||||||
// Number of lines (includes comments but not blank lines) has been got with the following command:
|
// 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
|
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1
|
||||||
/*
|
/*
|
||||||
|
Version 15.200.5: Apr 18, 2016 Removed link to enter from external service. (199764 lines)
|
||||||
Version 15.200.4: Apr 18, 2016 Changes in configuration. (199785 lines)
|
Version 15.200.4: Apr 18, 2016 Changes in configuration. (199785 lines)
|
||||||
Version 15.200.3: Apr 18, 2016 Fixed bug in tests, reported by Miguel Damas Hermoso. (199788 lines)
|
Version 15.200.3: Apr 18, 2016 Fixed bug in tests, reported by Miguel Damas Hermoso. (199788 lines)
|
||||||
Version 15.200.2: Apr 18, 2016 Fixed bugs in searching for documents. (199774 lines)
|
Version 15.200.2: Apr 18, 2016 Fixed bugs in searching for documents. (199774 lines)
|
||||||
|
|
|
@ -84,8 +84,7 @@
|
||||||
#define Cfg_DEFAULT_COLUMNS Lay_SHOW_BOTH_COLUMNS
|
#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_CLIENT_COMMAND "" // Client of the web service called by this CGI
|
||||||
#define Cfg_EXTERNAL_LOGIN_SERVICE_SHORT_NAME ""
|
#define Cfg_EXTERNAL_LOGIN_SERVICE_NAME ""
|
||||||
#define Cfg_EXTERNAL_LOGIN_SERVICE_FULL_NAME ""
|
|
||||||
#define Cfg_EXTERNAL_LOGIN_URL ""
|
#define Cfg_EXTERNAL_LOGIN_URL ""
|
||||||
#define Cfg_NAME_PARAM_IMPORTED_USR_ID ""
|
#define Cfg_NAME_PARAM_IMPORTED_USR_ID ""
|
||||||
#define Cfg_NAME_PARAM_IMPORTED_SESSION_ID ""
|
#define Cfg_NAME_PARAM_IMPORTED_SESSION_ID ""
|
||||||
|
@ -134,8 +133,7 @@
|
||||||
#define Cfg_DEFAULT_COLUMNS Lay_SHOW_BOTH_COLUMNS
|
#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_CLIENT_COMMAND "" // Client of the web service called by this CGI
|
||||||
#define Cfg_EXTERNAL_LOGIN_SERVICE_SHORT_NAME ""
|
#define Cfg_EXTERNAL_LOGIN_SERVICE_NAME ""
|
||||||
#define Cfg_EXTERNAL_LOGIN_SERVICE_FULL_NAME ""
|
|
||||||
#define Cfg_EXTERNAL_LOGIN_URL ""
|
#define Cfg_EXTERNAL_LOGIN_URL ""
|
||||||
#define Cfg_NAME_PARAM_IMPORTED_USR_ID ""
|
#define Cfg_NAME_PARAM_IMPORTED_USR_ID ""
|
||||||
#define Cfg_NAME_PARAM_IMPORTED_SESSION_ID ""
|
#define Cfg_NAME_PARAM_IMPORTED_SESSION_ID ""
|
||||||
|
@ -201,8 +199,7 @@
|
||||||
#define Cfg_DEFAULT_COLUMNS Lay_SHOW_BOTH_COLUMNS
|
#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_CLIENT_COMMAND "./prado" // Client of the web service called by this CGI
|
||||||
#define Cfg_EXTERNAL_LOGIN_SERVICE_SHORT_NAME "PRADO"
|
#define Cfg_EXTERNAL_LOGIN_SERVICE_NAME "PRADO (Plataforma de Recursos de Apoyo a la Docencia)"
|
||||||
#define Cfg_EXTERNAL_LOGIN_SERVICE_FULL_NAME "PRADO (Plataforma de Recursos de Apoyo a la Docencia)"
|
|
||||||
#define Cfg_EXTERNAL_LOGIN_URL "https://oficinavirtual.ugr.es/"
|
#define Cfg_EXTERNAL_LOGIN_URL "https://oficinavirtual.ugr.es/"
|
||||||
#define Cfg_NAME_PARAM_IMPORTED_USR_ID "pradouser"
|
#define Cfg_NAME_PARAM_IMPORTED_USR_ID "pradouser"
|
||||||
#define Cfg_NAME_PARAM_IMPORTED_SESSION_ID "pradosession"
|
#define Cfg_NAME_PARAM_IMPORTED_SESSION_ID "pradosession"
|
||||||
|
@ -258,8 +255,7 @@
|
||||||
#define Cfg_DEFAULT_COLUMNS Lay_SHOW_BOTH_COLUMNS
|
#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_CLIENT_COMMAND "" // Client of the web service called by this CGI
|
||||||
#define Cfg_EXTERNAL_LOGIN_SERVICE_SHORT_NAME ""
|
#define Cfg_EXTERNAL_LOGIN_SERVICE_NAME ""
|
||||||
#define Cfg_EXTERNAL_LOGIN_SERVICE_FULL_NAME ""
|
|
||||||
#define Cfg_EXTERNAL_LOGIN_URL ""
|
#define Cfg_EXTERNAL_LOGIN_URL ""
|
||||||
#define Cfg_NAME_PARAM_IMPORTED_USR_ID ""
|
#define Cfg_NAME_PARAM_IMPORTED_USR_ID ""
|
||||||
#define Cfg_NAME_PARAM_IMPORTED_SESSION_ID ""
|
#define Cfg_NAME_PARAM_IMPORTED_SESSION_ID ""
|
||||||
|
|
|
@ -420,7 +420,7 @@ static void Imp_ListMyImpGrpsAndStds (bool ItsAFormToRegRemStds)
|
||||||
sprintf (Gbl.Message,Txt_Could_not_get_the_official_list_of_your_groups_and_students_,
|
sprintf (Gbl.Message,Txt_Could_not_get_the_official_list_of_your_groups_and_students_,
|
||||||
Cfg_PLATFORM_SHORT_NAME,
|
Cfg_PLATFORM_SHORT_NAME,
|
||||||
Cfg_EXTERNAL_LOGIN_URL,
|
Cfg_EXTERNAL_LOGIN_URL,
|
||||||
Cfg_EXTERNAL_LOGIN_SERVICE_FULL_NAME);
|
Cfg_EXTERNAL_LOGIN_SERVICE_NAME);
|
||||||
Lay_ShowAlert (Lay_ERROR,Gbl.Message);
|
Lay_ShowAlert (Lay_ERROR,Gbl.Message);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -435,7 +435,7 @@ static void Imp_ListMyImpGrpsAndStds (bool ItsAFormToRegRemStds)
|
||||||
sprintf (Gbl.Message,Txt_To_get_the_official_list_of_your_groups_and_students_,
|
sprintf (Gbl.Message,Txt_To_get_the_official_list_of_your_groups_and_students_,
|
||||||
Cfg_PLATFORM_SHORT_NAME,
|
Cfg_PLATFORM_SHORT_NAME,
|
||||||
Cfg_EXTERNAL_LOGIN_URL,
|
Cfg_EXTERNAL_LOGIN_URL,
|
||||||
Cfg_EXTERNAL_LOGIN_SERVICE_FULL_NAME);
|
Cfg_EXTERNAL_LOGIN_SERVICE_NAME);
|
||||||
Lay_ShowAlert (Lay_WARNING,Gbl.Message);
|
Lay_ShowAlert (Lay_WARNING,Gbl.Message);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
20
swad_user.c
20
swad_user.c
|
@ -1478,8 +1478,6 @@ void Usr_PutLinkToLogin (void)
|
||||||
|
|
||||||
void Usr_WriteFormLogin (void)
|
void Usr_WriteFormLogin (void)
|
||||||
{
|
{
|
||||||
extern const char *The_ClassFormBold[The_NUM_THEMES];
|
|
||||||
extern const char *Txt_Enter_from_X;
|
|
||||||
extern const char *Txt_Log_in;
|
extern const char *Txt_Log_in;
|
||||||
extern const char *Txt_User;
|
extern const char *Txt_User;
|
||||||
extern const char *Txt_nick_email_or_ID;
|
extern const char *Txt_nick_email_or_ID;
|
||||||
|
@ -1489,25 +1487,7 @@ void Usr_WriteFormLogin (void)
|
||||||
/***** Links to other actions *****/
|
/***** Links to other actions *****/
|
||||||
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
|
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
|
||||||
|
|
||||||
/* Links to create a new account */
|
|
||||||
Acc_PutLinkToCreateAccount ();
|
Acc_PutLinkToCreateAccount ();
|
||||||
|
|
||||||
/* Link to enter from external site */
|
|
||||||
if (Cfg_EXTERNAL_LOGIN_URL[0] &&
|
|
||||||
Cfg_EXTERNAL_LOGIN_SERVICE_SHORT_NAME[0])
|
|
||||||
{
|
|
||||||
fprintf (Gbl.F.Out,"<a href=\"%s\" class=\"%s\">",
|
|
||||||
Cfg_EXTERNAL_LOGIN_URL,
|
|
||||||
The_ClassFormBold[Gbl.Prefs.Theme]);
|
|
||||||
sprintf (Gbl.Title,Txt_Enter_from_X,
|
|
||||||
Cfg_EXTERNAL_LOGIN_SERVICE_SHORT_NAME);
|
|
||||||
Lay_PutIconWithText ("login64x64.png",
|
|
||||||
Gbl.Title,
|
|
||||||
Gbl.Title);
|
|
||||||
fprintf (Gbl.F.Out,"</a>");
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Links to send a new password and to change language */
|
|
||||||
Pwd_PutLinkToSendNewPasswd ();
|
Pwd_PutLinkToSendNewPasswd ();
|
||||||
Pre_PutLinkToChangeLanguage ();
|
Pre_PutLinkToChangeLanguage ();
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user