Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-06-15 05:04:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 14.32.1

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2014-12-06 18:26:16 +01:00
parent 1b643ab6a6
commit 3df1531718
4 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/swad.sql
View File

@ -1189,7 +1189,7 @@ CREATE TABLE IF NOT EXISTS usr_nicknames (
-- --
CREATE TABLE IF NOT EXISTS usr_webs ( CREATE TABLE IF NOT EXISTS usr_webs (
UsrCod INT NOT NULL, UsrCod INT NOT NULL,
Web ENUM('www','edmodo','facebook','flickr','googleplus','googlescholar','instagram','linkedin','paperli','pinterest','researchgate','scoopit','slideshare','storify','tumblr','twitter','wikipedia','youtube') NOT NULL, Web ENUM('www','edmodo','facebook','flickr','github','googleplus','googlescholar','instagram','linkedin','paperli','pinterest','researchgate','scoopit','slideshare','storify','tumblr','twitter','wikipedia','youtube') NOT NULL,
URL VARCHAR(255) NOT NULL, URL VARCHAR(255) NOT NULL,
UNIQUE INDEX(UsrCod,Web)); UNIQUE INDEX(UsrCod,Web));
-- --

6
swad_changelog.h
View File

@ -35,12 +35,16 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.32 (2014/12/06)" #define Log_PLATFORM_VERSION "SWAD 14.32.1 (2014/12/06)"
// 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 | tail -1 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h | tail -1
/* /*
Version 13.32.1 :Dic 06, 2014 Added new social network. (170518 lines)
1 change necessary in database:
ALTER TABLE usr_webs CHANGE Web Web ENUM('www','delicious','edmodo','facebook','flickr','foursquare','github','googleplus','googlescholar','instagram','linkedin','paperli','pinterest','researchgate','scoopit','slideshare','storify','tumblr','twitter','wikipedia','youtube') NOT NULL;
Version 14.32 :Dic 06, 2014 Changes in listing of attendance. (170509 lines) Version 14.32 :Dic 06, 2014 Changes in listing of attendance. (170509 lines)
Version 14.31.1 :Dic 05, 2014 Comments are shown in list of attendances when several students are listed. (170450 lines) Version 14.31.1 :Dic 05, 2014 Comments are shown in list of attendances when several students are listed. (170450 lines)
Version 14.31 :Dic 04, 2014 Comments are shown in list of attendances when one unique student is listed. (170353 lines) Version 14.31 :Dic 04, 2014 Comments are shown in list of attendances when one unique student is listed. (170353 lines)

18
swad_database.c
View File

@ -2409,18 +2409,18 @@ mysql> DESCRIBE usr_nicknames;
/***** Table usr_webs *****/ /***** Table usr_webs *****/
/* /*
mysql> DESCRIBE usr_webs; mysql> DESCRIBE usr_webs;
+--------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------+-----+---------+-------+ +--------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------+-----+---------+-------+
| Field | Type | Null | Key | Default | Extra | | Field | Type | Null | Key | Default | Extra |
+--------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------+-----+---------+-------+ +--------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------+-----+---------+-------+
| UsrCod | int(11) | NO | PRI | NULL | | | UsrCod | int(11) | NO | PRI | NULL | |
| Web | enum('www','delicious','edmodo','facebook','flickr','foursquare','googleplus','googlescholar','instagram','linkedin','paperli','pinterest','researchgate','scoopit','slideshare','storify','tumblr','twitter','wikipedia','youtube') | NO | PRI | NULL | | | Web | enum('www','delicious','edmodo','facebook','flickr','foursquare','github','googleplus','googlescholar','instagram','linkedin','paperli','pinterest','researchgate','scoopit','slideshare','storify','tumblr','twitter','wikipedia','youtube') | NO | PRI | NULL | |
| URL | varchar(255) | NO | | NULL | | | URL | varchar(255) | NO | | NULL | |
+--------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------+-----+---------+-------+ +--------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------+-----+---------+-------+
3 rows in set (0.01 sec) 3 rows in set (0.00 sec)
*/ */
DB_CreateTable ("CREATE TABLE IF NOT EXISTS usr_webs (" DB_CreateTable ("CREATE TABLE IF NOT EXISTS usr_webs ("
"UsrCod INT NOT NULL," "UsrCod INT NOT NULL,"
"Web ENUM('www','delicious','edmodo','facebook','flickr','foursquare','googleplus','googlescholar','instagram','linkedin','paperli','pinterest','researchgate','scoopit','slideshare','storify','tumblr','twitter','wikipedia','youtube') NOT NULL," "Web ENUM('www','delicious','edmodo','facebook','flickr','foursquare','github','googleplus','googlescholar','instagram','linkedin','paperli','pinterest','researchgate','scoopit','slideshare','storify','tumblr','twitter','wikipedia','youtube') NOT NULL,"
"URL VARCHAR(255) NOT NULL," "URL VARCHAR(255) NOT NULL,"
"UNIQUE INDEX(UsrCod,Web))"); "UNIQUE INDEX(UsrCod,Web))");

20
swad_network.c
View File

@ -42,7 +42,7 @@ extern struct Globals Gbl;
/***************************** Private constants *****************************/ /***************************** Private constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Net_NUM_WEBS_AND_SOCIAL_NETWORKS 20 #define Net_NUM_WEBS_AND_SOCIAL_NETWORKS 21
typedef enum typedef enum
{ {
Net_WWW, // Personal web page Net_WWW, // Personal web page
@ -51,6 +51,7 @@ typedef enum
Net_FACEBOOK, Net_FACEBOOK,
Net_FLICKR, Net_FLICKR,
Net_FOURSQUARE, Net_FOURSQUARE,
Net_GITHUB,
Net_GOOGLE_PLUS, Net_GOOGLE_PLUS,
Net_GOOGLE_SCHOLAR, Net_GOOGLE_SCHOLAR,
Net_INSTAGRAM, Net_INSTAGRAM,
@ -74,7 +75,8 @@ const char *Net_WebsAndSocialNetworksDB[Net_NUM_WEBS_AND_SOCIAL_NETWORKS] =
"edmodo", // Net_EDMODO "edmodo", // Net_EDMODO
"facebook", // Net_FACEBOOK "facebook", // Net_FACEBOOK
"flickr", // Net_FLICKR "flickr", // Net_FLICKR
"foursquare", // Net_FOURSQUARE "foursquare", // Net_FOURSQUAREhub
"github", // Net_GITHUB
"googleplus", // Net_GOOGLE_PLUS "googleplus", // Net_GOOGLE_PLUS
"googlescholar", // Net_GOOGLE_SCHOLAR "googlescholar", // Net_GOOGLE_SCHOLAR
"instagram", // Net_INSTAGRAM "instagram", // Net_INSTAGRAM
@ -99,6 +101,7 @@ const char *Net_TitleWebsAndSocialNetworks[Net_NUM_WEBS_AND_SOCIAL_NETWORKS] =
"Facebook", // Net_FACEBOOK "Facebook", // Net_FACEBOOK
"Flickr", // Net_FLICKR "Flickr", // Net_FLICKR
"Foursquare", // Net_FOURSQUARE "Foursquare", // Net_FOURSQUARE
"GitHub", // Net_GITHUB
"Google+", // Net_GOOGLE_PLUS "Google+", // Net_GOOGLE_PLUS
"Google Scholar", // Net_GOOGLE_SCHOLAR "Google Scholar", // Net_GOOGLE_SCHOLAR
"Instagram", // Net_INSTAGRAM "Instagram", // Net_INSTAGRAM
@ -177,7 +180,7 @@ void Net_ShowWebsAndSocialNets (long UsrCod)
/********************* Show form to edit my social networks ******************/ /********************* Show form to edit my social networks ******************/
/*****************************************************************************/ /*****************************************************************************/
#define COL2_WIDTH 400 #define Net_COL2_WIDTH 400
void Net_ShowFormMyWebsAndSocialNets (void) void Net_ShowFormMyWebsAndSocialNets (void)
{ {
@ -223,14 +226,15 @@ void Net_ShowFormMyWebsAndSocialNets (void)
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td align=\"left\" class=\"%s\">" "<td align=\"left\" class=\"%s\">"
"<img src=\"%s/%s16x16.gif\"" "<img src=\"%s/%s16x16.gif\""
" style=\"width:16px;height:16px;margin-right:10px;vertical-align:middle;\" alt=\"\" title=\"%s\" />" " style=\"width:16px;height:16px;margin-right:10px;vertical-align:middle;\""
" alt=\"\" title=\"%s\" />"
"%s:</td>" "%s:</td>"
"<td align=\"left\" width=\"%u\">", "<td align=\"left\" width=\"%u\">",
ClassForm, ClassForm,
Gbl.Prefs.IconsURL,Net_WebsAndSocialNetworksDB[NumURL], Gbl.Prefs.IconsURL,Net_WebsAndSocialNetworksDB[NumURL],
Net_TitleWebsAndSocialNetworks[NumURL], Net_TitleWebsAndSocialNetworks[NumURL],
Net_TitleWebsAndSocialNetworks[NumURL], Net_TitleWebsAndSocialNetworks[NumURL],
COL2_WIDTH); Net_COL2_WIDTH);
Act_FormStart (ActChgMyNet); Act_FormStart (ActChgMyNet);
Par_PutHiddenParamUnsigned ("Web",(unsigned) NumURL); Par_PutHiddenParamUnsigned ("Web",(unsigned) NumURL);
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"URL\"" fprintf (Gbl.F.Out,"<input type=\"text\" name=\"URL\""
@ -378,7 +382,8 @@ void Net_ShowWebAndSocialNetworksStats (void)
Lay_ShowErrorAndExit ("Wrong scope."); Lay_ShowErrorAndExit ("Wrong scope.");
break; break;
} }
NumRows = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get number of users with webs / social networks"); NumRows = (unsigned) DB_QuerySELECT (Query,&mysql_res,
"can not get number of users with webs / social networks");
/***** Number of users *****/ /***** Number of users *****/
Lay_StartRoundFrameTable10 (NULL,2,NULL); Lay_StartRoundFrameTable10 (NULL,2,NULL);
@ -417,7 +422,8 @@ void Net_ShowWebAndSocialNetworksStats (void)
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td align=\"left\" class=\"DAT\">" "<td align=\"left\" class=\"DAT\">"
"<img src=\"%s/%s16x16.gif\"" "<img src=\"%s/%s16x16.gif\""
" style=\"width:16px;height:16px;margin:0 2px;vertical-align:middle;\" alt=\"\" title=\"%s\" />" " style=\"width:16px;height:16px;margin:0 2px;vertical-align:middle;\""
" alt=\"\" title=\"%s\" />"
"%s</td>" "%s</td>"
"<td align=\"right\" class=\"DAT\">%u</td>" "<td align=\"right\" class=\"DAT\">%u</td>"
"<td align=\"right\" class=\"DAT\">%.2f%%</td>" "<td align=\"right\" class=\"DAT\">%.2f%%</td>"