Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 15.44.4

This commit is contained in:
Antonio Cañas Vargas 2015-11-24 10:29:07 +01:00
parent 300e667c19
commit ed0020c7d7
3 changed files with 192 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
swad_changelog.h
View File

@ -111,12 +111,13 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.44.3 (2015/11/23)"
#define Log_PLATFORM_VERSION "SWAD 15.44.4 (2015/11/24)"
// 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.44.3: Nov 23, 2015 Improvement of speed in list of administrators. (187839 lines)
Version 15.44.4: Nov 24, 2015 Code refactoring in layout. (187893 lines)
Version 15.44.3: Nov 23, 2015 Improvement of speed in list of administrators. (187841 lines)
1 change necessary in database:
ALTER TABLE admin ADD INDEX (Scope,Cod);

310
swad_layout.c
View File

@ -89,7 +89,8 @@ static void Lay_WriteScriptInit (void);
static void Lay_WriteScriptConnectedUsrs (void);
static void Lay_WriteScriptCustomDropzone (void);
static void Lay_WritePageTopHeading (void);
static void Lay_WritePageTopHeadingDesktop (void);
static void Lay_WritePageTopHeadingMobile (void);
static void Lay_WriteTitleAction (void);
@ -270,12 +271,10 @@ void Lay_WriteStartOfPage (void)
/***** Header of layout *****/
fprintf (Gbl.F.Out,"<table class=\"%s\" style=\"width:100%%;\">",
ClassBackground[Gbl.Prefs.Theme]);
Lay_WritePageTopHeading ();
switch (Gbl.Prefs.Layout)
{
case Lay_LAYOUT_DESKTOP:
Lay_WritePageTopHeadingDesktop ();
if (Gbl.Prefs.SideCols == Lay_SHOW_BOTH_COLUMNS)
ColspanCentralPart = 1; // 11: both side columns visible, left and right
else if (Gbl.Prefs.SideCols == Lay_HIDE_BOTH_COLUMNS)
@ -284,6 +283,7 @@ void Lay_WriteStartOfPage (void)
ColspanCentralPart = 2; // 10 or 01: only one side column visible, left or right
break;
case Lay_LAYOUT_MOBILE:
Lay_WritePageTopHeadingMobile ();
ColspanCentralPart = 3;
break;
default:
@ -697,7 +697,7 @@ static void Lay_WriteScriptCustomDropzone (void)
/************************ Write top heading of the page **********************/
/*****************************************************************************/
static void Lay_WritePageTopHeading (void)
static void Lay_WritePageTopHeadingDesktop (void)
{
extern const char *The_ClassHead[The_NUM_THEMES];
const struct
@ -705,14 +705,12 @@ static void Lay_WritePageTopHeading (void)
const char *Icon;
const unsigned Width;
const unsigned Height;
} LogoLayout[Lay_NUM_LAYOUTS] =
} LogoLayout =
{
{ // Lay_LAYOUT_DESKTOP
"swad112x32.gif",140,40,
},
{ // Lay_LAYOUT_MOBILE
"swad168x48.gif",210,60,
},
// Lay_LAYOUT_DESKTOP
"swad112x32.gif",
140,
40,
};
const char *ClassHeadRow1[The_NUM_THEMES] =
{
@ -722,46 +720,43 @@ static void Lay_WritePageTopHeading (void)
"YELLOW_HEAD_ROW_1", // The_THEME_YELLOW
};
fprintf (Gbl.F.Out,"<tr class=\"%s\">",ClassHeadRow1[Gbl.Prefs.Theme]);
/***** 1st. row, 1st. column: logo *****/
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\" style=\"width:%upx;\">",
LogoLayout[Gbl.Prefs.Layout].Width + 20);
/* Left logo */
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\">"
/***** 1st. row *****/
/* 1st. row, 1st. column: logo */
fprintf (Gbl.F.Out,"<tr class=\"%s\">"
"<td class=\"CENTER_MIDDLE\" style=\"width:%upx;\">"
"<a href=\"%s\" target=\"_blank\">"
"<img src=\"%s/%s\""
" alt=\"%s\" title=\"%s\""
" class=\"CENTER_MIDDLE\""
" style=\"width:%upx; height:%upx;\" />"
"</a>",
ClassHeadRow1[Gbl.Prefs.Theme],
LogoLayout.Width + 20,
Cfg_HTTPS_URL_SWAD_CGI,Gbl.Prefs.PathTheme,
LogoLayout[Gbl.Prefs.Layout].Icon,
LogoLayout.Icon,
Cfg_PLATFORM_SHORT_NAME,Cfg_PLATFORM_FULL_NAME,
LogoLayout[Gbl.Prefs.Layout].Width,
LogoLayout[Gbl.Prefs.Layout].Height);
LogoLayout.Width,
LogoLayout.Height);
fprintf (Gbl.F.Out,"</td>");
/* 1st. row, 2nd. column:
search, and logged user / language selection */
/* Search courses / teachers */
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">"
"<table style=\"width:100%%;\">"
"<tr>");
/***** 1st. row, 2nd. column:
search, and logged user / language selection *****/
if (Gbl.Prefs.Layout == Lay_LAYOUT_DESKTOP)
{
/* Search courses / teachers */
fprintf (Gbl.F.Out,"<td class=\"%s LEFT_MIDDLE\">",
The_ClassHead[Gbl.Prefs.Theme]);
Act_FormStart ( Gbl.CurrentCrs.Crs.CrsCod > 0 ? ActCrsSch :
(Gbl.CurrentDeg.Deg.DegCod > 0 ? ActDegSch :
(Gbl.CurrentCtr.Ctr.CtrCod > 0 ? ActCtrSch :
(Gbl.CurrentIns.Ins.InsCod > 0 ? ActInsSch :
(Gbl.CurrentCty.Cty.CtyCod > 0 ? ActCtySch :
ActSysSch)))));
Sco_PutParamScope (Sco_SCOPE_SYS);
Sch_PutFormToSearch (Gbl.Prefs.PathTheme);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>");
}
"<tr>"
"<td class=\"%s LEFT_MIDDLE\">",
The_ClassHead[Gbl.Prefs.Theme]);
Act_FormStart ( Gbl.CurrentCrs.Crs.CrsCod > 0 ? ActCrsSch :
(Gbl.CurrentDeg.Deg.DegCod > 0 ? ActDegSch :
(Gbl.CurrentCtr.Ctr.CtrCod > 0 ? ActCtrSch :
(Gbl.CurrentIns.Ins.InsCod > 0 ? ActInsSch :
(Gbl.CurrentCty.Cty.CtyCod > 0 ? ActCtySch :
ActSysSch)))));
Sco_PutParamScope (Sco_SCOPE_SYS);
Sch_PutFormToSearch (Gbl.Prefs.PathTheme);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>");
/* Logged user or language selection */
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_MIDDLE\">",
@ -775,6 +770,141 @@ static void Lay_WritePageTopHeading (void)
"</table>"
"</td>");
/* 1st. row, 3rd. column: link to open/close session */
fprintf (Gbl.F.Out,"<td class=\"%s CENTER_MIDDLE\" style=\"width:160px;\">",
The_ClassHead[Gbl.Prefs.Theme]);
if (Gbl.Usrs.Me.Logged)
Usr_PutFormLogOut ();
else
Usr_PutFormLogIn ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** 2nd. row *****/
/* 2nd. row, 1st. column
Clock with hour:minute (server hour is shown) */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"CENTER_TOP\""
" style=\"width:160px; height:80px;\">");
Dat_ShowClientLocalTime ();
fprintf (Gbl.F.Out,"</td>"); // End of first column
/* 2nd. row, 2nd. column: degree and course */
fprintf (Gbl.F.Out,"<td class=\"CENTER_TOP\" style=\"height:80px;\">"
"<div class=\"CENTER_TOP\""
" style=\"padding-top:5px;\">");
Deg_WriteCtyInsCtrDeg ();
Crs_WriteSelectorMyCourses ();
Deg_WriteBigNameCtyInsCtrDegCrs ();
fprintf (Gbl.F.Out,"</div>"
"</td>");
/* 2nd. row, 3rd. column */
fprintf (Gbl.F.Out,"<td class=\"CENTER_TOP\""
" style=\"width:160px; height:80px;\">");
if (Gbl.Usrs.Me.Logged)
{
/* Number of new messages (not seen) */
fprintf (Gbl.F.Out,"<div id=\"msg\"" // Used for AJAX based refresh
" style=\"padding-top:10px;\">");
Ntf_WriteNumberOfNewNtfs ();
fprintf (Gbl.F.Out,"</div>"); // Used for AJAX based refresh
}
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** 3rd. row *****/
fprintf (Gbl.F.Out,"<tr>");
/* 3rd. row, 1st. column */
if (Gbl.Prefs.SideCols & Lay_SHOW_LEFT_COLUMN) // Left column visible
fprintf (Gbl.F.Out,"<td class=\"CENTER_TOP\">"
"</td>");
/* 3rd. row, 2nd. column */
Tab_DrawTabs ();
/* 3rd. row, 3rd. column */
if (Gbl.Prefs.SideCols & Lay_SHOW_RIGHT_COLUMN) // Right column visible
{
fprintf (Gbl.F.Out,"<td rowspan=\"2\" class=\"CENTER_TOP\""
" style=\"width:160px;\">");
Lay_ShowRightColumn ();
fprintf (Gbl.F.Out,"</td>");
}
fprintf (Gbl.F.Out,"</tr>");
/***** 4th. row *****/
fprintf (Gbl.F.Out,"<tr>");
/* 4th. row, 1st. column */
if (Gbl.Prefs.SideCols & Lay_SHOW_LEFT_COLUMN) // Left column visible
{
fprintf (Gbl.F.Out,"<td class=\"CENTER_TOP\""
" style=\"width:160px;\">");
Lay_ShowLeftColumn ();
fprintf (Gbl.F.Out,"</td>");
}
}
static void Lay_WritePageTopHeadingMobile (void)
{
extern const char *The_ClassHead[The_NUM_THEMES];
const struct
{
const char *Icon;
const unsigned Width;
const unsigned Height;
} LogoLayout =
{
// Lay_LAYOUT_MOBILE
"swad168x48.gif",
210,
60,
};
const char *ClassHeadRow1[The_NUM_THEMES] =
{
"WHITE_HEAD_ROW_1", // The_THEME_WHITE
"GREY_HEAD_ROW_1", // The_THEME_GREY
"BLUE_HEAD_ROW_1", // The_THEME_BLUE
"YELLOW_HEAD_ROW_1", // The_THEME_YELLOW
};
/***** 1st. row, 1st. column: logo *****/
fprintf (Gbl.F.Out,"<tr class=\"%s\">"
"<td class=\"CENTER_MIDDLE\" style=\"width:%upx;\">"
"<a href=\"%s\" target=\"_blank\">"
"<img src=\"%s/%s\""
" alt=\"%s\" title=\"%s\""
" class=\"CENTER_MIDDLE\""
" style=\"width:%upx; height:%upx;\" />"
"</a>"
"</td>",
ClassHeadRow1[Gbl.Prefs.Theme],
LogoLayout.Width + 20,
Cfg_HTTPS_URL_SWAD_CGI,Gbl.Prefs.PathTheme,
LogoLayout.Icon,
Cfg_PLATFORM_SHORT_NAME,Cfg_PLATFORM_FULL_NAME,
LogoLayout.Width,
LogoLayout.Height);
/***** 1st. row, 2nd. column:
logged user / language selection *****/
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">"
"<table style=\"width:100%%;\">"
"<tr>"
"<td class=\"%s RIGHT_MIDDLE\">",
The_ClassHead[Gbl.Prefs.Theme]);
if (Gbl.Usrs.Me.Logged)
Usr_WriteLoggedUsrHead ();
else
Pre_PutSelectorToSelectLanguage ();
fprintf (Gbl.F.Out,"</td>"
"</tr>"
"</table>"
"</td>");
/***** 1st. row, 3rd. column: link to open/close session *****/
fprintf (Gbl.F.Out,"<td class=\"%s CENTER_MIDDLE\" style=\"width:160px;\">",
The_ClassHead[Gbl.Prefs.Theme]);
@ -786,95 +916,19 @@ static void Lay_WritePageTopHeading (void)
"</tr>");
/***** 2nd. row *****/
fprintf (Gbl.F.Out,"<tr>");
switch (Gbl.Prefs.Layout)
{
case Lay_LAYOUT_DESKTOP:
/***** 2nd. row, 1st. column *****/
/* Clock with hour:minute (server hour is shown) */
fprintf (Gbl.F.Out,"<td class=\"CENTER_TOP\""
" style=\"width:160px; height:80px;\">");
Dat_ShowClientLocalTime ();
fprintf (Gbl.F.Out,"</td>"); // End of first column
/***** 2nd. row, 2nd. column: degree and course *****/
fprintf (Gbl.F.Out,"<td class=\"CENTER_TOP\" style=\"height:80px;\">"
"<div class=\"CENTER_TOP\""
" style=\"padding-top:5px;\">");
Deg_WriteCtyInsCtrDeg ();
Crs_WriteSelectorMyCourses ();
Deg_WriteBigNameCtyInsCtrDegCrs ();
fprintf (Gbl.F.Out,"</div>"
"</td>");
/***** 2nd. row, 3rd. column *****/
fprintf (Gbl.F.Out,"<td class=\"CENTER_TOP\""
" style=\"width:160px; height:80px;\">");
if (Gbl.Usrs.Me.Logged)
{
/* Number of new messages (not seen) */
fprintf (Gbl.F.Out,"<div id=\"msg\"" // Used for AJAX based refresh
" style=\"padding-top:10px;\">");
Ntf_WriteNumberOfNewNtfs ();
fprintf (Gbl.F.Out,"</div>"); // Used for AJAX based refresh
}
break;
case Lay_LAYOUT_MOBILE:
fprintf (Gbl.F.Out,"<td colspan=\"3\" class=\"CENTER_MIDDLE\""
" style=\"height:40px;\">");
Deg_WriteCtyInsCtrDeg ();
Crs_WriteSelectorMyCourses ();
break;
default:
break;
}
fprintf (Gbl.F.Out,"</td>");
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"3\" class=\"CENTER_MIDDLE\""
" style=\"height:40px;\">");
Deg_WriteCtyInsCtrDeg ();
Crs_WriteSelectorMyCourses ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** 3rd. row *****/
fprintf (Gbl.F.Out,"<tr>");
Tab_DrawTabs ();
fprintf (Gbl.F.Out,"</tr>"
"<tr>");
switch (Gbl.Prefs.Layout)
{
case Lay_LAYOUT_DESKTOP:
/***** 3rd. row, 1st. column *****/
if (Gbl.Prefs.SideCols & Lay_SHOW_LEFT_COLUMN) // Left column visible
fprintf (Gbl.F.Out,"<td class=\"CENTER_TOP\">"
"</td>");
/***** 3rd. row, 2nd. column *****/
Tab_DrawTabs ();
/***** 3rd. row, 3rd. column *****/
if (Gbl.Prefs.SideCols & Lay_SHOW_RIGHT_COLUMN) // Right column visible
{
fprintf (Gbl.F.Out,"<td rowspan=\"2\" class=\"CENTER_TOP\""
" style=\"width:160px;\">");
Lay_ShowRightColumn ();
fprintf (Gbl.F.Out,"</td>");
}
fprintf (Gbl.F.Out,"</tr>"
"<tr>");
/***** 4th. row, 1st. column *****/
if (Gbl.Prefs.SideCols & Lay_SHOW_LEFT_COLUMN) // Left column visible
{
fprintf (Gbl.F.Out,"<td class=\"CENTER_TOP\""
" style=\"width:160px;\">");
Lay_ShowLeftColumn ();
fprintf (Gbl.F.Out,"</td>");
}
break;
case Lay_LAYOUT_MOBILE:
Tab_DrawTabs ();
fprintf (Gbl.F.Out,"</tr>"
"<tr>");
break;
default:
break;
}
"<tr>");
}
/*****************************************************************************/

12
swad_user.c
View File

@ -4148,8 +4148,10 @@ static void Usr_GetAdmsLst (Sco_Scope_t Scope)
char Query[1024];
/***** Build query *****/
// Very important: use UNION instead OR in the following queries
// (OR with different tables is very slow)
// Important: it is better to use:
// SELECT... WHERE UsrCod IN (SELECT...) OR UsrCod IN (SELECT...) <-- fast
// instead of using or with different joins:
// SELECT... WHERE (...) OR (...) <-- very slow
switch (Scope)
{
case Sco_SCOPE_SYS: // All admins
@ -4811,7 +4813,7 @@ void Usr_AllocateListSelectedUsrCodStd (void)
{
if (!Gbl.Usrs.Select.Std)
{
if ((Gbl.Usrs.Select.Std = (char *) malloc (Usr_MAX_BYTES_LIST_ENCRYPTED_USR_CODS+1)) == NULL)
if ((Gbl.Usrs.Select.Std = (char *) malloc (Usr_MAX_BYTES_LIST_ENCRYPTED_USR_CODS + 1)) == NULL)
Lay_ShowErrorAndExit ("Not enough memory to store list of users.");
Gbl.Usrs.Select.Std[0] = '\0';
}
@ -4825,7 +4827,7 @@ void Usr_AllocateListSelectedUsrCodTch (void)
{
if (!Gbl.Usrs.Select.Tch)
{
if ((Gbl.Usrs.Select.Tch = (char *) malloc (Usr_MAX_BYTES_LIST_ENCRYPTED_USR_CODS+1)) == NULL)
if ((Gbl.Usrs.Select.Tch = (char *) malloc (Usr_MAX_BYTES_LIST_ENCRYPTED_USR_CODS + 1)) == NULL)
Lay_ShowErrorAndExit ("Not enough memory to store list of users.");
Gbl.Usrs.Select.Tch[0] = '\0';
}
@ -4862,7 +4864,7 @@ static void Usr_AllocateListOtherRecipients (void)
{
if (!Gbl.Usrs.ListOtherRecipients)
{
if ((Gbl.Usrs.ListOtherRecipients = malloc (Nck_MAX_BYTES_LIST_NICKS+1)) == NULL)
if ((Gbl.Usrs.ListOtherRecipients = malloc (Nck_MAX_BYTES_LIST_NICKS + 1)) == NULL)
Lay_ShowErrorAndExit ("Not enough memory to store list of recipients.");
Gbl.Usrs.ListOtherRecipients[0] = '\0';
}