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 16.127

This commit is contained in:
Antonio Cañas Vargas 2017-01-28 15:58:46 +01:00
parent d8df950fdf
commit d4f15919a2
100 changed files with 2494 additions and 2472 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
js/swad16.123.js
View File

@ -43,7 +43,7 @@ var countClockConnected = 0;
function writeLocalDateFromUTC (id,TimeUTC,StrToday) {
var today = new Date();
var todayYea = today.getFullYear();
var todayMon = today.getMonth()+1;
var todayMon = today.getMonth() + 1;
var todayDay = today.getDate();
var d = new Date();
var Yea;
@ -77,7 +77,7 @@ function writeLocalDateHMSFromUTC (id,TimeUTC,Separator,StrToday,
// HMS: Hour, Minutes, Seconds
var today = new Date();
var todayYea = today.getFullYear();
var todayMon = today.getMonth()+1;
var todayMon = today.getMonth() + 1;
var todayDay = today.getDate();
var d = new Date();
var WriteDate;
@ -264,7 +264,7 @@ function adjustDateForm (id) {
}
// Create new days at the end if necessary
for (var Day=Number(LastDayValue)+1; Day<=Days; Day++) {
for (var Day = Number(LastDayValue) + 1; Day <= Days; Day++) {
var opt = document.createElement('option');
opt.value = opt.text = Day;
FormDay.add(opt);
@ -283,7 +283,7 @@ function adjustDateForm (id) {
function setDateToYesterday () {
var d = new Date();
d.setTime (d.getTime () - 24*60*60*1000); // Today - 1 day
d.setTime (d.getTime () - 24 * 60 * 60 * 1000); // Today - 1 day
setDateRange(d);
}
@ -298,7 +298,7 @@ function setDateToToday () {
function setDateRange (d) {
var FormYea;
var Yea = d.getFullYear();
var Mon = d.getMonth()+1;
var Mon = d.getMonth() + 1;
var Day = d.getDate();
FormYea = document.getElementById('StartYear');
@ -481,16 +481,16 @@ function readConnUsrsData () {
if (objXMLHttpReqCon.readyState == 4) { // Check if data have been received
if (objXMLHttpReqCon.status == 200) {
var endOfDelay = objXMLHttpReqCon.responseText.indexOf('|',0); // Get separator position
var endOfNotif = objXMLHttpReqCon.responseText.indexOf('|',endOfDelay+1); // Get separator position
var endOfGblCon = objXMLHttpReqCon.responseText.indexOf('|',endOfNotif+1); // Get separator position
var endOfCrsCon = objXMLHttpReqCon.responseText.indexOf('|',endOfGblCon+1); // Get separator position
var endOfNumUsrs = objXMLHttpReqCon.responseText.indexOf('|',endOfCrsCon+1); // Get separator position
var endOfNotif = objXMLHttpReqCon.responseText.indexOf('|',endOfDelay + 1); // Get separator position
var endOfGblCon = objXMLHttpReqCon.responseText.indexOf('|',endOfNotif + 1); // Get separator position
var endOfCrsCon = objXMLHttpReqCon.responseText.indexOf('|',endOfGblCon + 1); // Get separator position
var endOfNumUsrs = objXMLHttpReqCon.responseText.indexOf('|',endOfCrsCon + 1); // Get separator position
var delay = parseInt(objXMLHttpReqCon.responseText.substring(0,endOfDelay)); // Get refresh delay
var htmlNotif = objXMLHttpReqCon.responseText.substring(endOfDelay +1,endOfNotif); // Get HTML code for new notifications
var htmlGblCon = objXMLHttpReqCon.responseText.substring(endOfNotif +1,endOfGblCon); // Get HTML code for connected
var htmlCrsCon = objXMLHttpReqCon.responseText.substring(endOfGblCon+1,endOfCrsCon); // Get HTML code for course connected
var NumUsrsStr = objXMLHttpReqCon.responseText.substring(endOfCrsCon+1,endOfNumUsrs); // Get number of users
var htmlNotif = objXMLHttpReqCon.responseText.substring(endOfDelay + 1,endOfNotif); // Get HTML code for new notifications
var htmlGblCon = objXMLHttpReqCon.responseText.substring(endOfNotif + 1,endOfGblCon); // Get HTML code for connected
var htmlCrsCon = objXMLHttpReqCon.responseText.substring(endOfGblCon + 1,endOfCrsCon); // Get HTML code for course connected
var NumUsrsStr = objXMLHttpReqCon.responseText.substring(endOfCrsCon + 1,endOfNumUsrs); // Get number of users
var startOfUsr;
var endOfUsr;
@ -510,7 +510,7 @@ function readConnUsrsData () {
countClockConnected = 0; // Don't refresh again using writeClockConnected until past 10 seconds
startOfUsr = endOfNumUsrs + 1;
for (var NumUsr=0; NumUsr<NumUsrsCon; NumUsr++) {
endOfUsr = objXMLHttpReqCon.responseText.indexOf('|',startOfUsr+1);
endOfUsr = objXMLHttpReqCon.responseText.indexOf('|',startOfUsr + 1);
ListSeconds[NumUsr] = parseInt(objXMLHttpReqCon.responseText.substring(startOfUsr,endOfUsr));
startOfUsr = endOfUsr + 1;
}
@ -530,7 +530,7 @@ function readLastClicksData () {
var endOfDelay = objXMLHttpReqLog.responseText.indexOf('|',0); // Get separator position
var delay = parseInt(objXMLHttpReqLog.responseText.substring(0,endOfDelay)); // Get refresh delay
var htmlLastClicks = objXMLHttpReqLog.responseText.substring(endOfDelay+1); // Get HTML code for last clicks
var htmlLastClicks = objXMLHttpReqLog.responseText.substring(endOfDelay + 1); // Get HTML code for last clicks
var divLastClicks = document.getElementById('lastclicks'); // Access to last click DIV
if (divLastClicks)
@ -545,9 +545,9 @@ function readLastClicksData () {
function readNewTimelineData () {
if (objXMLHttpReqSoc.readyState == 4) { // Check if data have been received
if (objXMLHttpReqSoc.status == 200) {
var endOfDelay = objXMLHttpReqSoc.responseText.indexOf('|',0); // Get separator position
var delay = parseInt(objXMLHttpReqSoc.responseText.substring(0,endOfDelay)); // Get refresh delay
var htmlJustNowTimeline = objXMLHttpReqSoc.responseText.substring(endOfDelay+1);// Get HTML code for social timeline
var endOfDelay = objXMLHttpReqSoc.responseText.indexOf('|',0); // Get separator position
var delay = parseInt(objXMLHttpReqSoc.responseText.substring(0,endOfDelay)); // Get refresh delay
var htmlJustNowTimeline = objXMLHttpReqSoc.responseText.substring(endOfDelay + 1); // Get HTML code for social timeline
var justNowTimeline = document.getElementById('just_now_timeline_list');// Access to UL for the just received timeline
if (justNowTimeline) {
@ -590,7 +590,7 @@ function readOldTimelineData () {
if (objXMLHttpReqSoc.status == 200) {
var endOfDelay = objXMLHttpReqSoc.responseText.indexOf('|',0); // Get separator position
var delay = parseInt(objXMLHttpReqSoc.responseText.substring(0,endOfDelay)); // Get refresh delay
var htmlOldTimeline = objXMLHttpReqSoc.responseText.substring(endOfDelay+1); // Get HTML code for social timeline
var htmlOldTimeline = objXMLHttpReqSoc.responseText.substring(endOfDelay + 1); // Get HTML code for social timeline
var oldTimeline = document.getElementById('old_timeline_list'); // Access to UL with the recent timeline
if (oldTimeline) {
@ -707,8 +707,8 @@ function zoom (img,urlPhoto,idCaption) {
// Exit from zooming a user's photograph
function noZoom () {
var xPos = -(187+15);
var yPos = -(250+15+110);
var xPos = -(187 + 15);
var yPos = -(250 + 15 + 110);
document.getElementById('zoomTxt').innerHTML = '';
document.getElementById('zoomImg').src='/swad/icon/usr_bl.jpg';
document.getElementById('zoomLyr').style.left = xPos + 'px';

12
swad_ID.c
View File

@ -720,7 +720,7 @@ static void ID_RemoveUsrID (const struct UsrData *UsrDat,bool ItsMe)
extern const char *Txt_ID_X_removed;
extern const char *Txt_You_can_not_delete_this_ID;
extern const char *Txt_User_not_found_or_you_do_not_have_permission_;
char UsrID[ID_MAX_LENGTH_USR_ID+1];
char UsrID[ID_MAX_LENGTH_USR_ID + 1];
bool ICanRemove;
if (Usr_AsAdminICanEditOtherUsr (UsrDat))
@ -776,7 +776,7 @@ static bool ID_CheckIfConfirmed (long UsrCod,const char *UsrID)
static void ID_RemoveUsrIDFromDB (long UsrCod,const char *UsrID)
{
char Query[256+ID_MAX_LENGTH_USR_ID];
char Query[256 + ID_MAX_LENGTH_USR_ID];
/***** Remove one of my user's IDs *****/
sprintf (Query,"DELETE FROM usr_IDs"
@ -838,7 +838,7 @@ static void ID_NewUsrID (const struct UsrData *UsrDat,bool ItsMe)
extern const char *Txt_The_ID_X_has_been_registered_successfully;
extern const char *Txt_The_ID_X_is_not_valid;
extern const char *Txt_User_not_found_or_you_do_not_have_permission_;
char NewID[ID_MAX_LENGTH_USR_ID+1];
char NewID[ID_MAX_LENGTH_USR_ID + 1];
unsigned NumID;
bool AlreadyExists;
unsigned NumIDFound = 0; // Initialized to avoid warning
@ -918,7 +918,7 @@ static void ID_NewUsrID (const struct UsrData *UsrDat,bool ItsMe)
static void ID_InsertANewUsrIDInDB (long UsrCod,const char *NewID,bool Confirmed)
{
char Query[256+ID_MAX_LENGTH_USR_ID];
char Query[256 + ID_MAX_LENGTH_USR_ID];
/***** Update my nickname in database *****/
sprintf (Query,"INSERT INTO usr_IDs"
@ -958,7 +958,7 @@ static void ID_ReqConfOrConfOtherUsrID (ID_ReqConfOrConfID_t ReqConfOrConfID)
extern const char *Txt_Do_you_want_to_confirm_the_ID_X;
extern const char *Txt_The_ID_X_has_been_confirmed;
extern const char *Txt_User_not_found_or_you_do_not_have_permission_;
char UsrID[ID_MAX_LENGTH_USR_ID+1];
char UsrID[ID_MAX_LENGTH_USR_ID + 1];
bool ICanConfirm;
bool Found;
unsigned NumID;
@ -1040,7 +1040,7 @@ static void ID_ReqConfOrConfOtherUsrID (ID_ReqConfOrConfID_t ReqConfOrConfID)
void ID_ConfirmUsrID (const struct UsrData *UsrDat,const char *UsrID)
{
char Query[256+ID_MAX_LENGTH_USR_ID];
char Query[256 + ID_MAX_LENGTH_USR_ID];
/***** Update database *****/
sprintf (Query,"UPDATE usr_IDs SET Confirmed='Y'"

2
swad_ID.h
View File

@ -38,7 +38,7 @@
#define ID_MIN_LENGTH_USR_ID 5 // This number MUST be >= 3
#define ID_MAX_LENGTH_USR_ID 16
#define ID_MAX_BYTES_LIST_USRS_IDS (ID_MAX_LENGTH_USR_ID*Cfg_MAX_USRS_IN_LIST*10)
#define ID_MAX_BYTES_LIST_USRS_IDS (ID_MAX_LENGTH_USR_ID * Cfg_MAX_USRS_IN_LIST * 10)
struct ListIDs
{

4
swad_MFU.c
View File

@ -93,7 +93,7 @@ void MFU_FreeMFUActions (struct MFU_ListMFUActions *ListMFUActions)
void MFU_GetMFUActions (struct MFU_ListMFUActions *ListMFUActions,unsigned MaxActionsShown)
{
extern Act_Action_t Act_FromActCodToAction[1+Act_MAX_ACTION_COD];
extern Act_Action_t Act_FromActCodToAction[1 + Act_MAX_ACTION_COD];
extern struct Act_Actions Act_Actions[Act_NUM_ACTIONS];
char Query[512];
MYSQL_RES *mysql_res;
@ -134,7 +134,7 @@ void MFU_GetMFUActions (struct MFU_ListMFUActions *ListMFUActions,unsigned MaxAc
Act_Action_t MFU_GetMyLastActionInCurrentTab (void)
{
extern Act_Action_t Act_FromActCodToAction[1+Act_MAX_ACTION_COD];
extern Act_Action_t Act_FromActCodToAction[1 + Act_MAX_ACTION_COD];
extern struct Act_Actions Act_Actions[Act_NUM_ACTIONS];
char Query[512];
MYSQL_RES *mysql_res;

6
swad_QR.c
View File

@ -39,7 +39,7 @@
/***************************** Internal constants ****************************/
/*****************************************************************************/
#define QR_CODE_SIZE ((6+25+6)*8)
#define QR_CODE_SIZE ((6 + 25 + 6) * 8)
#define QR_DEFAULT_TYPE QR_ID
/*****************************************************************************/
@ -95,7 +95,7 @@ static void QR_PutParamQRString (void)
void QR_PrintQRCode (void)
{
char QRString[Cns_MAX_BYTES_STRING+1];
char QRString[Cns_MAX_BYTES_STRING + 1];
/***** Get QR string *****/
Par_GetParToText ("QRString",QRString,Cns_MAX_BYTES_STRING);
@ -132,7 +132,7 @@ static void QR_ImageQRCode (const char *QRString)
void QR_LinkTo (unsigned Size,const char *ParamStr,long Cod)
{
extern const char *Txt_Shortcut;
extern const char *Txt_STR_LANG_ID[1+Txt_NUM_LANGUAGES];
extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES];
/***** Show QR code with direct link to the current centre *****/
fprintf (Gbl.F.Out,"<img src=\"https://chart.googleapis.com/chart?cht=qr&amp;chs=%ux%u&amp;chl=%s/%s?%s=%ld\""

12
swad_RSS.c
View File

@ -59,8 +59,8 @@ static void RSS_WriteExamAnnouncements (FILE *FileRSS,struct Course *Crs);
void RSS_UpdateRSSFileForACrs (struct Course *Crs)
{
char PathRelPublRSSDir[PATH_MAX+1];
char PathRelPublRSSFile[PATH_MAX+1];
char PathRelPublRSSDir[PATH_MAX + 1];
char PathRelPublRSSFile[PATH_MAX + 1];
FILE *FileRSS;
struct tm *tm;
@ -249,7 +249,6 @@ static void RSS_WriteExamAnnouncements (FILE *FileRSS,struct Course *Crs)
time_t CallTimeUTC;
long ExaCod;
unsigned long NumExa,NumExamAnnouncements;
// char Content[Cns_MAX_BYTES_TEXT+1];
if (Gbl.DB.DatabaseIsOpen)
{
@ -298,11 +297,6 @@ static void RSS_WriteExamAnnouncements (FILE *FileRSS,struct Course *Crs)
fprintf (FileRSS,"<description><![CDATA[<p><em>Fecha examen: %s</em></p>]]></description>\n",
row[2]);
/* Write author */
// if (UsrDat.Email[0])
// fprintf (FileRSS,"<author>%s (%s %s %s)</author>\n",
// UsrDat.Email,UsrDat.FirstName,UsrDat.Surname1,UsrDat.Surname2);
/* Write unique string for this item */
fprintf (FileRSS,"<guid isPermaLink=\"false\">%s, course #%ld, exam #%ld</guid>\n",
Cfg_URL_SWAD_CGI,Crs->CrsCod,ExaCod);
@ -315,8 +309,6 @@ static void RSS_WriteExamAnnouncements (FILE *FileRSS,struct Course *Crs)
fprintf (FileRSS,"</item>\n");
}
// Usr_UsrDataDestructor (&UsrDat);
}
/***** Free structure that stores the query result *****/

14
swad_account.c
View File

@ -172,7 +172,7 @@ void Acc_CheckIfEmptyAccountExists (void)
extern const char *Txt_Check_another_ID;
extern const char *Txt_Please_enter_your_ID;
extern const char *Txt_Before_creating_a_new_account_check_if_you_have_been_already_registered_with_your_ID;
char ID[ID_MAX_LENGTH_USR_ID+1];
char ID[ID_MAX_LENGTH_USR_ID + 1];
unsigned NumUsrs;
unsigned NumUsr;
struct UsrData UsrDat;
@ -331,7 +331,7 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith
extern const char *Txt_HELP_nickname;
extern const char *Txt_HELP_email;
extern const char *Txt_Email;
char NewNicknameWithArroba[Nck_MAX_BYTES_NICKNAME_FROM_FORM+1];
char NewNicknameWithArroba[Nck_MAX_BYTES_NICKNAME_FROM_FORM + 1];
/***** Form to enter some data of the new user *****/
Act_FormStart (ActCreUsrAcc);
@ -356,7 +356,7 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith
"</tr>",
The_ClassForm[Gbl.Prefs.Theme],
Txt_Nickname,
1+Nck_MAX_LENGTH_NICKNAME_WITHOUT_ARROBA,
1 + Nck_MAX_LENGTH_NICKNAME_WITHOUT_ARROBA,
Txt_HELP_nickname,
NewNicknameWithArroba);
@ -697,11 +697,11 @@ void Acc_CreateNewUsr (struct UsrData *UsrDat,bool CreatingMyOwnAccount)
extern const char *The_ThemeId[The_NUM_THEMES];
extern const char *Ico_IconSetId[Ico_NUM_ICON_SETS];
extern const char *Pri_VisibilityDB[Pri_NUM_OPTIONS_PRIVACY];
extern const char *Txt_STR_LANG_ID[1+Txt_NUM_LANGUAGES];
extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES];
extern const char *Usr_StringsSexDB[Usr_NUM_SEXS];
char BirthdayStrDB[Usr_BIRTHDAY_STR_DB_LENGTH + 1];
char Query[2048];
char PathRelUsr[PATH_MAX+1];
char PathRelUsr[PATH_MAX + 1];
unsigned NumID;
/***** Check if user's code is initialized *****/
@ -780,7 +780,7 @@ void Acc_CreateNewUsr (struct UsrData *UsrDat,bool CreatingMyOwnAccount)
static void Acc_CreateNewEncryptedUsrCod (struct UsrData *UsrDat)
{
char RandomStr[LENGTH_RANDOM_STR+1];
char RandomStr[LENGTH_RANDOM_STR + 1];
unsigned NumTry;
for (NumTry = 0;
@ -1106,7 +1106,7 @@ void Acc_CompletelyEliminateAccount (struct UsrData *UsrDat,
static void Acc_RemoveUsrBriefcase (struct UsrData *UsrDat)
{
char PathRelUsr[PATH_MAX+1];
char PathRelUsr[PATH_MAX + 1];
/***** Remove files of the user's briefcase from disc *****/
Usr_ConstructPathUsr (UsrDat->UsrCod,PathRelUsr);

8
swad_action.c
View File

@ -2910,7 +2910,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
/* ActRemOldBrf */{1489,-1,TabUnk,ActAdmBrf ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Brw_RemoveOldFilesBriefcase ,NULL},
};
Act_Action_t Act_FromActCodToAction[1+Act_MAX_ACTION_COD] = // Do not reuse unique action codes!
Act_Action_t Act_FromActCodToAction[1 + Act_MAX_ACTION_COD] = // Do not reuse unique action codes!
{
ActSeeAdmDocCrsGrp, // #0
-1, // #1 (obsolete action)
@ -4679,8 +4679,8 @@ void Act_FormStartId (Act_Action_t NextAction,const char *Id)
static void Act_FormStartInternal (Act_Action_t NextAction,bool PutParameterLocationIfNoSesion,
const char *Id,const char *Anchor,const char *OnSubmit)
{
extern const char *Txt_STR_LANG_ID[1+Txt_NUM_LANGUAGES];
char ParamsStr[256+256+Ses_LENGTH_SESSION_ID+256];
extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES];
char ParamsStr[256 + 256 + Ses_LENGTH_SESSION_ID + 256];
if (!Gbl.Form.Inside)
{
@ -4716,7 +4716,7 @@ static void Act_FormStartInternal (Act_Action_t NextAction,bool PutParameterLoca
}
}
// Params should have space for 256+256+Ses_LENGTH_SESSION_ID+256 bytes
// Params should have space for 256 + 256 + Ses_LENGTH_SESSION_ID + 256 bytes
void Act_SetParamsForm (char *ParamsStr,Act_Action_t NextAction,
bool PutParameterLocationIfNoSesion)
{

2472
swad_action.h
View File

File diff suppressed because it is too large Load Diff

26
swad_agenda.c
View File

@ -115,7 +115,7 @@ void Agd_PutFormLogInToShowUsrAgenda (void)
void Agd_PutParamAgd (void)
{
char Nickname[Nck_MAX_BYTES_NICKNAME_FROM_FORM+1];
char Nickname[Nck_MAX_BYTES_NICKNAME_FROM_FORM + 1];
sprintf (Nickname,"@%s",Gbl.Usrs.Other.UsrDat.Nickname);
Par_PutHiddenParamString ("agd",Nickname);
@ -218,7 +218,7 @@ void Agd_ShowOtherAgendaAfterLogIn (void)
extern const unsigned Txt_Current_CGI_SWAD_Language;
extern const char *Txt_Public_agenda_USER;
extern const char *Txt_User_not_found_or_you_do_not_have_permission_;
extern const char *Txt_Switching_to_LANGUAGE[1+Txt_NUM_LANGUAGES];
extern const char *Txt_Switching_to_LANGUAGE[1 + Txt_NUM_LANGUAGES];
bool ItsMe;
if (Gbl.Usrs.Me.Logged)
@ -506,7 +506,7 @@ static void Agd_PutIconToViewEditMyFullAgenda (void)
static void Agd_PutIconToShowQR (void)
{
char URL[Cns_MAX_LENGTH_WWW + 1];
extern const char *Txt_STR_LANG_ID[1+Txt_NUM_LANGUAGES];
extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES];
sprintf (URL,"%s/%s?agd=@%s",
Cfg_URL_SWAD_CGI,
@ -523,7 +523,7 @@ static void Agd_PutIconsOtherPublicAgenda (void)
extern const char *Txt_View_record_and_office_hours;
/***** Button to view user's public profile *****/
if (Pri_ShowIsAllowed (Gbl.Usrs.Other.UsrDat.ProfileVisibility,
if (Pri_ShowingIsAllowed (Gbl.Usrs.Other.UsrDat.ProfileVisibility,
&Gbl.Usrs.Other.UsrDat))
Lay_PutContextualLink (ActSeePubPrf,
Usr_PutParamOtherUsrCodEncrypted,
@ -582,7 +582,7 @@ static void Agd_ShowOneEvent (Agd_AgendaType_t AgendaType,long AgdCod)
extern const char *Txt_Today;
static unsigned UniqueId = 0;
struct AgendaEvent AgdEvent;
char Txt[Cns_MAX_BYTES_TEXT+1];
char Txt[Cns_MAX_BYTES_TEXT + 1];
/***** Get data of this event *****/
AgdEvent.AgdCod = AgdCod;
@ -693,7 +693,7 @@ static void Agd_ShowOneEvent (Agd_AgendaType_t AgendaType,long AgdCod)
static void Agd_GetParamEventOrderType (void)
{
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
unsigned UnsignedNum;
static bool AlreadyGot = false;
@ -1039,10 +1039,10 @@ static void Agd_PutParamAgdCod (long AgdCod)
long Agd_GetParamAgdCod (void)
{
char LongStr[1+10+1];
char LongStr[1 + 10 + 1];
/***** Get parameter with code of event *****/
Par_GetParToText ("AgdCod",LongStr,1+10);
Par_GetParToText ("AgdCod",LongStr,1 + 10);
return Str_ConvertStrCodToLongCod (LongStr);
}
@ -1389,7 +1389,7 @@ void Agd_RecFormEvent (void)
struct AgendaEvent AgdEvent;
bool ItsANewEvent;
bool NewEventIsCorrect = true;
char Txt[Cns_MAX_BYTES_TEXT+1];
char Txt[Cns_MAX_BYTES_TEXT + 1];
/***** Set author of the event *****/
AgdEvent.UsrCod = Gbl.Usrs.Me.UsrDat.UsrCod;
@ -1414,7 +1414,7 @@ void Agd_RecFormEvent (void)
if (AgdEvent.TimeUTC[Agd_START_TIME] == 0)
AgdEvent.TimeUTC[Agd_START_TIME] = Gbl.StartExecutionTimeUTC;
if (AgdEvent.TimeUTC[Agd_END_TIME] == 0)
AgdEvent.TimeUTC[Agd_END_TIME] = AgdEvent.TimeUTC[Agd_START_TIME] + 2*60*60; // +2 hours
AgdEvent.TimeUTC[Agd_END_TIME] = AgdEvent.TimeUTC[Agd_START_TIME] + 2 * 60 * 60; // +2 hours
/***** Check if event is correct *****/
if (!AgdEvent.Location[0]) // If there is no event
@ -1477,7 +1477,7 @@ void Agd_RecFormEvent (void)
static bool Agd_CheckIfSimilarEventExists (struct AgendaEvent *AgdEvent)
{
char Query[256+Agd_MAX_LENGTH_EVENT];
char Query[256 + Agd_MAX_LENGTH_EVENT];
/***** Get number of events with a field value from database *****/
sprintf (Query,"SELECT COUNT(*) FROM agendas"
@ -1492,7 +1492,7 @@ static bool Agd_CheckIfSimilarEventExists (struct AgendaEvent *AgdEvent)
static void Agd_CreateEvent (struct AgendaEvent *AgdEvent,const char *Txt)
{
char Query[1024+Cns_MAX_BYTES_TEXT];
char Query[1024 + Cns_MAX_BYTES_TEXT];
/***** Create a new event *****/
sprintf (Query,"INSERT INTO agendas"
@ -1515,7 +1515,7 @@ static void Agd_CreateEvent (struct AgendaEvent *AgdEvent,const char *Txt)
static void Agd_UpdateEvent (struct AgendaEvent *AgdEvent,const char *Txt)
{
char Query[1024+Cns_MAX_BYTES_TEXT];
char Query[1024 + Cns_MAX_BYTES_TEXT];
/***** Update the data of the event *****/
sprintf (Query,"UPDATE agendas SET "

10
swad_announcement.c
View File

@ -387,11 +387,11 @@ static void Ann_PutParams (void)
static long Ann_GetParamAnnCod (void)
{
char LongStr[1+10+1]; // String that holds the announcement code
char LongStr[1 + 10 + 1]; // String that holds the announcement code
long AnnCod;
/* Get announcement code */
Par_GetParToText ("AnnCod",LongStr,1+10);
Par_GetParToText ("AnnCod",LongStr,1 + 10);
if (sscanf (LongStr,"%ld",&AnnCod) != 1)
Lay_ShowErrorAndExit ("Wrong code of announcement.");
@ -481,8 +481,8 @@ void Ann_ReceiveAnnouncement (void)
{
extern const char *Txt_Announcement_created;
unsigned Roles;
char Subject[Cns_MAX_BYTES_SUBJECT+1];
char Content[Cns_MAX_BYTES_TEXT+1];
char Subject[Cns_MAX_BYTES_SUBJECT + 1];
char Content[Cns_MAX_BYTES_TEXT + 1];
/***** Get data from form *****/
/* Get the subject of the announcement */
@ -511,7 +511,7 @@ void Ann_ReceiveAnnouncement (void)
static void Ann_CreateAnnouncement (unsigned Roles,const char *Subject,const char *Content)
{
char Query[128+Cns_MAX_BYTES_SUBJECT+Cns_MAX_BYTES_TEXT];
char Query[128 + Cns_MAX_BYTES_SUBJECT + Cns_MAX_BYTES_TEXT];
/***** Select announcements not seen *****/
sprintf (Query,"INSERT INTO announcements (Roles,Subject,Content)"

22
swad_assignment.c
View File

@ -305,7 +305,7 @@ static void Asg_ShowOneAssignment (long AsgCod)
extern const char *Txt_No;
static unsigned UniqueId = 0;
struct Assignment Asg;
char Txt[Cns_MAX_BYTES_TEXT+1];
char Txt[Cns_MAX_BYTES_TEXT + 1];
/***** Get data of this assignment *****/
Asg.AsgCod = AsgCod;
@ -433,7 +433,7 @@ static void Asg_ShowOneAssignment (long AsgCod)
static void Asg_WriteAsgAuthor (struct Assignment *Asg)
{
bool ShowPhoto = false;
char PhotoURL[PATH_MAX+1];
char PhotoURL[PATH_MAX + 1];
char FirstName[Usr_MAX_BYTES_NAME + 1];
char Surnames[Usr_MAX_BYTES_SURNAMES + 1];
struct UsrData UsrDat;
@ -444,7 +444,7 @@ static void Asg_WriteAsgAuthor (struct Assignment *Asg)
/***** Get data of author *****/
UsrDat.UsrCod = Asg->UsrCod;
if (Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat))
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (&UsrDat,PhotoURL);
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (&UsrDat,PhotoURL);
/***** Show photo *****/
Pho_ShowUsrPhoto (&UsrDat,ShowPhoto ? PhotoURL :
@ -523,7 +523,7 @@ static void Asg_WriteAssignmentFolder (struct Assignment *Asg)
static void Asg_GetParamAsgOrderType (void)
{
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
unsigned UnsignedNum;
Par_GetParToText ("Order",UnsignedStr,10);
@ -929,10 +929,10 @@ static void Asg_PutParamAsgCod (long AsgCod)
long Asg_GetParamAsgCod (void)
{
char LongStr[1+10+1];
char LongStr[1 + 10 + 1];
/***** Get parameter with code of assignment *****/
Par_GetParToText ("AsgCod",LongStr,1+10);
Par_GetParToText ("AsgCod",LongStr,1 + 10);
return Str_ConvertStrCodToLongCod (LongStr);
}
@ -1116,7 +1116,7 @@ void Asg_RequestCreatOrEditAsg (void)
extern const char *Txt_Save;
struct Assignment Asg;
bool ItsANewAssignment;
char Txt[Cns_MAX_BYTES_TEXT+1];
char Txt[Cns_MAX_BYTES_TEXT + 1];
/***** Get parameters *****/
Asg_GetParamAsgOrderType ();
@ -1307,7 +1307,7 @@ void Asg_RecFormAssignment (void)
bool ItsANewAssignment;
bool NewAssignmentIsCorrect = true;
unsigned NumUsrsToBeNotifiedByEMail;
char Txt[Cns_MAX_BYTES_TEXT+1];
char Txt[Cns_MAX_BYTES_TEXT + 1];
/***** Get the code of the assignment *****/
NewAsg.AsgCod = Asg_GetParamAsgCod ();
@ -1345,7 +1345,7 @@ void Asg_RecFormAssignment (void)
if (NewAsg.TimeUTC[Dat_START_TIME] == 0)
NewAsg.TimeUTC[Dat_START_TIME] = Gbl.StartExecutionTimeUTC;
if (NewAsg.TimeUTC[Dat_END_TIME] == 0)
NewAsg.TimeUTC[Dat_END_TIME] = NewAsg.TimeUTC[Dat_START_TIME] + 2*60*60; // +2 hours
NewAsg.TimeUTC[Dat_END_TIME] = NewAsg.TimeUTC[Dat_START_TIME] + 2 * 60 * 60; // +2 hours
/***** Check if title is correct *****/
if (NewAsg.Title[0]) // If there's an assignment title
@ -1462,7 +1462,7 @@ static void Asg_UpdateNumUsrsNotifiedByEMailAboutAssignment (long AsgCod,unsigne
static void Asg_CreateAssignment (struct Assignment *Asg,const char *Txt)
{
char Query[1024+Cns_MAX_BYTES_TEXT];
char Query[1024 + Cns_MAX_BYTES_TEXT];
/***** Create a new assignment *****/
sprintf (Query,"INSERT INTO assignments"
@ -1490,7 +1490,7 @@ static void Asg_CreateAssignment (struct Assignment *Asg,const char *Txt)
static void Asg_UpdateAssignment (struct Assignment *Asg,const char *Txt)
{
char Query[1024+Cns_MAX_BYTES_TEXT];
char Query[1024 + Cns_MAX_BYTES_TEXT];
/***** Update the data of the assignment *****/
sprintf (Query,"UPDATE assignments SET "

68
swad_attendance.c
View File

@ -143,7 +143,7 @@ static void Att_ListAttEventsForAStd (unsigned NumStd,struct UsrData *UsrDat);
void Att_SeeAttEvents (void)
{
char NicknameWithArroba[Nck_MAX_BYTES_NICKNAME_FROM_FORM+1];
char NicknameWithArroba[Nck_MAX_BYTES_NICKNAME_FROM_FORM + 1];
/***** Get parameters *****/
Att_GetParamAttOrderType ();
@ -356,7 +356,7 @@ static void Att_ShowOneAttEvent (struct AttendanceEvent *Att,bool ShowOnlyThisAt
extern const char *Txt_Today;
extern const char *Txt_View_event;
static unsigned UniqueId = 0;
char Txt[Cns_MAX_BYTES_TEXT+1];
char Txt[Cns_MAX_BYTES_TEXT + 1];
/***** Get data of this attendance event *****/
Att_GetDataOfAttEventByCodAndCheckCrs (Att);
@ -475,7 +475,7 @@ static void Att_ShowOneAttEvent (struct AttendanceEvent *Att,bool ShowOnlyThisAt
static void Att_WriteAttEventAuthor (struct AttendanceEvent *Att)
{
bool ShowPhoto = false;
char PhotoURL[PATH_MAX+1];
char PhotoURL[PATH_MAX + 1];
char FirstName[Usr_MAX_BYTES_NAME + 1];
char Surnames[Usr_MAX_BYTES_SURNAMES + 1];
struct UsrData UsrDat;
@ -486,7 +486,7 @@ static void Att_WriteAttEventAuthor (struct AttendanceEvent *Att)
/***** Get data of author *****/
UsrDat.UsrCod = Att->UsrCod;
if (Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat)) // Get of the database the data of the author
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (&UsrDat,PhotoURL);
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (&UsrDat,PhotoURL);
/***** Show photo *****/
Pho_ShowUsrPhoto (&UsrDat,ShowPhoto ? PhotoURL :
@ -522,7 +522,7 @@ static void Att_WriteAttEventAuthor (struct AttendanceEvent *Att)
static void Att_GetParamAttOrderType (void)
{
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
unsigned UnsignedNum;
Par_GetParToText ("Order",UnsignedStr,10);
@ -893,10 +893,10 @@ void Att_PutParamAttCod (long AttCod)
long Att_GetParamAttCod (void)
{
char LongStr[1+10+1];
char LongStr[1 + 10 + 1];
/***** Get parameter with code of attendance event *****/
Par_GetParToText ("AttCod",LongStr,1+10);
Par_GetParToText ("AttCod",LongStr,1 + 10);
return Str_ConvertStrCodToLongCod (LongStr);
}
@ -1280,10 +1280,10 @@ void Att_RecFormAttEvent (void)
extern const char *Txt_The_event_has_been_modified;
struct AttendanceEvent OldAtt;
struct AttendanceEvent ReceivedAtt;
char YN[1+1];
char YN[1 + 1];
bool ItsANewAttEvent;
bool ReceivedAttEventIsCorrect = true;
char Txt[Cns_MAX_BYTES_TEXT+1];
char Txt[Cns_MAX_BYTES_TEXT + 1];
/***** Get the code of the attendance event *****/
ItsANewAttEvent = ((ReceivedAtt.AttCod = Att_GetParamAttCod ()) == -1L);
@ -1314,7 +1314,7 @@ void Att_RecFormAttEvent (void)
if (ReceivedAtt.TimeUTC[Att_START_TIME] == 0)
ReceivedAtt.TimeUTC[Att_START_TIME] = Gbl.StartExecutionTimeUTC;
if (ReceivedAtt.TimeUTC[Att_END_TIME] == 0)
ReceivedAtt.TimeUTC[Att_END_TIME] = ReceivedAtt.TimeUTC[Att_START_TIME] + 2*60*60; // +2 hours // TODO: 2*60*60 should be in a #define in swad_config.h
ReceivedAtt.TimeUTC[Att_END_TIME] = ReceivedAtt.TimeUTC[Att_START_TIME] + 2 * 60 * 60; // +2 hours // TODO: 2 * 60 * 60 should be in a #define in swad_config.h
/***** Check if title is correct *****/
if (ReceivedAtt.Title[0]) // If there's an attendance event title
@ -1373,7 +1373,7 @@ void Att_RecFormAttEvent (void)
void Att_CreateAttEvent (struct AttendanceEvent *Att,const char *Txt)
{
char Query[1024+Cns_MAX_BYTES_TEXT];
char Query[1024 + Cns_MAX_BYTES_TEXT];
/***** Create a new attendance event *****/
sprintf (Query,"INSERT INTO att_events"
@ -1405,7 +1405,7 @@ void Att_CreateAttEvent (struct AttendanceEvent *Att,const char *Txt)
void Att_UpdateAttEvent (struct AttendanceEvent *Att,const char *Txt)
{
char Query[1024+Cns_MAX_BYTES_TEXT];
char Query[1024 + Cns_MAX_BYTES_TEXT];
/***** Update the data of the attendance event *****/
sprintf (Query,"UPDATE att_events SET "
@ -2045,10 +2045,10 @@ static void Att_WriteRowStdToCallTheRoll (unsigned NumStd,struct UsrData *UsrDat
extern const char *Txt_Present;
extern const char *Txt_Absent;
bool Present;
char PhotoURL[PATH_MAX+1];
char PhotoURL[PATH_MAX + 1];
bool ShowPhoto;
char CommentStd[Cns_MAX_BYTES_TEXT+1];
char CommentTch[Cns_MAX_BYTES_TEXT+1];
char CommentStd[Cns_MAX_BYTES_TEXT + 1];
char CommentTch[Cns_MAX_BYTES_TEXT + 1];
/***** Check if this student is already registered in the current event *****/
Present = Att_CheckIfUsrIsPresentInAttEventAndGetComments (Att->AttCod,UsrDat->UsrCod,CommentStd,CommentTch);
@ -2097,7 +2097,7 @@ static void Att_WriteRowStdToCallTheRoll (unsigned NumStd,struct UsrData *UsrDat
{
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP COLOR%u\">",
Gbl.RowEvenOdd);
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (UsrDat,PhotoURL);
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (UsrDat,PhotoURL);
Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL :
NULL,
"PHOTO45x60",Pho_ZOOM,false);
@ -2222,9 +2222,9 @@ void Att_RegisterMeAsStdInAttEvent (void)
extern const char *Txt_Your_comment_has_been_updated;
struct AttendanceEvent Att;
bool Present;
char CommentParamName[10+10+1];
char CommentStd[Cns_MAX_BYTES_TEXT+1];
char CommentTch[Cns_MAX_BYTES_TEXT+1];
char CommentParamName[10 + 10 + 1];
char CommentStd[Cns_MAX_BYTES_TEXT + 1];
char CommentTch[Cns_MAX_BYTES_TEXT + 1];
/***** Get attendance event code *****/
if ((Att.AttCod = Att_GetParamAttCod ()) == -1L)
@ -2283,9 +2283,9 @@ void Att_RegisterStudentsInAttEvent (void)
unsigned NumStdsPresent;
unsigned NumStdsAbsent;
struct UsrData UsrData;
char CommentParamName[10+10+1];
char CommentStd[Cns_MAX_BYTES_TEXT+1];
char CommentTch[Cns_MAX_BYTES_TEXT+1];
char CommentParamName[10 + 10 + 1];
char CommentStd[Cns_MAX_BYTES_TEXT + 1];
char CommentTch[Cns_MAX_BYTES_TEXT + 1];
/***** Get attendance event code *****/
if ((Att.AttCod = Att_GetParamAttCod ()) == -1L)
@ -2411,7 +2411,7 @@ static void Att_GetNumStdsTotalWhoAreInAttEvent (struct AttendanceEvent *Att)
static unsigned Att_GetNumStdsFromAListWhoAreInAttEvent (long AttCod,long LstSelectedUsrCods[],unsigned NumStdsInList)
{
char *Query;
char SubQuery[1+1+10+1];
char SubQuery[1 + 1 + 10 + 1];
unsigned NumStd;
unsigned NumStdsInAttEvent = 0;
size_t MaxLength;
@ -2581,7 +2581,7 @@ void Att_RegUsrInAttEventNotChangingComments (long AttCod,long UsrCod)
static void Att_RegUsrInAttEventChangingComments (long AttCod,long UsrCod,bool Present,
const char *CommentStd,const char *CommentTch)
{
char Query[256+Cns_MAX_BYTES_TEXT*2];
char Query[256 + Cns_MAX_BYTES_TEXT * 2];
/***** Register user as assistant to an event in database *****/
sprintf (Query,"REPLACE INTO att_usr (AttCod,UsrCod,Present,CommentStd,CommentTch)"
@ -2719,7 +2719,7 @@ void Usr_PrintMyAttendanceCrs (void)
static void Usr_ListOrPrintMyAttendanceCrs (Att_TypeOfView_t TypeOfView)
{
unsigned NumAttEvent;
char YN[1+1];
char YN[1 + 1];
/***** Get list of attendance events *****/
Att_GetListAttEvents (Att_OLDEST_FIRST);
@ -2785,7 +2785,7 @@ static void Usr_ListOrPrintStdsAttendanceCrs (Att_TypeOfView_t TypeOfView)
unsigned NumStdsInList;
long *LstSelectedUsrCods;
unsigned NumAttEvent;
char YN[1+1];
char YN[1 + 1];
/***** Get list of attendance events *****/
Att_GetListAttEvents (Att_OLDEST_FIRST);
@ -2893,7 +2893,7 @@ static void Att_GetListSelectedAttCods (char **StrAttCodsSelected)
unsigned NumAttEvent;
const char *Ptr;
long AttCod;
char LongStr[1+10+1];
char LongStr[1 + 10 + 1];
char Query[256];
MYSQL_RES *mysql_res;
MYSQL_ROW row;
@ -2903,8 +2903,8 @@ static void Att_GetListSelectedAttCods (char **StrAttCodsSelected)
unsigned NumGrpSel;
/***** Allocate memory for list of attendance events selected *****/
MaxSizeListAttCodsSelected = Gbl.AttEvents.Num * (1+10+1);
if ((*StrAttCodsSelected = (char *) malloc (MaxSizeListAttCodsSelected+1)) == NULL)
MaxSizeListAttCodsSelected = Gbl.AttEvents.Num * (1 + 10 + 1);
if ((*StrAttCodsSelected = (char *) malloc (MaxSizeListAttCodsSelected + 1)) == NULL)
Lay_ShowErrorAndExit ("Not enough memory to store list of attendance events selected.");
/***** Get parameter multiple with list of attendance events selected *****/
@ -2925,7 +2925,7 @@ static void Att_GetListSelectedAttCods (char **StrAttCodsSelected)
)
{
/* Get next attendance event selected */
Par_GetNextStrUntilSeparParamMult (&Ptr,LongStr,1+10);
Par_GetNextStrUntilSeparParamMult (&Ptr,LongStr,1 + 10);
AttCod = Str_ConvertStrCodToLongCod (LongStr);
/* Set each event in *StrAttCodsSelected as selected */
@ -3317,7 +3317,7 @@ static void Att_WriteRowStdSeveralAttEvents (unsigned NumStd,struct UsrData *Usr
{
extern const char *Txt_Present;
extern const char *Txt_Absent;
char PhotoURL[PATH_MAX+1];
char PhotoURL[PATH_MAX + 1];
bool ShowPhoto;
unsigned NumAttEvent;
bool Present;
@ -3339,7 +3339,7 @@ static void Att_WriteRowStdSeveralAttEvents (unsigned NumStd,struct UsrData *Usr
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE COLOR%u\""
" style=\"width:22px;\">",
Gbl.RowEvenOdd);
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (UsrDat,PhotoURL);
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (UsrDat,PhotoURL);
Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL :
NULL,
"PHOTO21x28",Pho_ZOOM,false);
@ -3459,7 +3459,7 @@ static void Att_ListAttEventsForAStd (unsigned NumStd,struct UsrData *UsrDat)
extern const char *Txt_Absent;
extern const char *Txt_Student_comment;
extern const char *Txt_Teachers_comment;
char PhotoURL[PATH_MAX+1];
char PhotoURL[PATH_MAX + 1];
bool ShowPhoto;
unsigned NumAttEvent;
unsigned UniqueId;
@ -3483,7 +3483,7 @@ static void Att_ListAttEventsForAStd (unsigned NumStd,struct UsrData *UsrDat)
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE COLOR%u\""
" style=\"width:22px;\">",
Gbl.RowEvenOdd);
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (UsrDat,PhotoURL);
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (UsrDat,PhotoURL);
Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL :
NULL,
"PHOTO21x28",Pho_ZOOM,false);

12
swad_banner.c
View File

@ -423,10 +423,10 @@ static void Ban_PutParamBanCod (long BanCod)
long Ban_GetParamBanCod (void)
{
char LongStr[1+10+1];
char LongStr[1 + 10 + 1];
/***** Get parameter with code of banner *****/
Par_GetParToText ("BanCod",LongStr,1+10);
Par_GetParToText ("BanCod",LongStr,1 + 10);
return Str_ConvertStrCodToLongCod (LongStr);
}
@ -553,7 +553,7 @@ static void Ban_RenameBanner (Cns_ShrtOrFullName_t ShrtOrFullName)
const char *FieldName = NULL; // Initialized to avoid warning
unsigned MaxLength = 0; // Initialized to avoid warning
char *CurrentBanName = NULL; // Initialized to avoid warning
char NewBanName[Ban_MAX_LENGTH_FULL_NAME+1];
char NewBanName[Ban_MAX_LENGTH_FULL_NAME + 1];
Ban = &Gbl.Banners.EditingBan;
switch (ShrtOrFullName)
@ -653,8 +653,8 @@ void Ban_ChangeBannerImg (void)
extern const char *Txt_The_new_image_is_X;
extern const char *Txt_You_can_not_leave_the_image_empty;
struct Banner *Ban;
char Query[256+Ban_MAX_LENGTH_IMAGE];
char NewImg[Ban_MAX_LENGTH_IMAGE+1];
char Query[256 + Ban_MAX_LENGTH_IMAGE];
char NewImg[Ban_MAX_LENGTH_IMAGE + 1];
Ban = &Gbl.Banners.EditingBan;
@ -698,7 +698,7 @@ void Ban_ChangeBannerWWW (void)
extern const char *Txt_The_new_web_address_is_X;
extern const char *Txt_You_can_not_leave_the_web_address_empty;
struct Banner *Ban;
char Query[256+Cns_MAX_LENGTH_WWW];
char Query[256 + Cns_MAX_LENGTH_WWW];
char NewWWW[Cns_MAX_LENGTH_WWW + 1];
Ban = &Gbl.Banners.EditingBan;

8
swad_calendar.c
View File

@ -160,7 +160,7 @@ void Cal_ChangeFirstDayOfWeek (void)
static unsigned Cal_GetParamFirstDayOfWeek (void)
{
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
unsigned UnsignedNum;
unsigned FirstDayOfWeek = Cal_FIRST_DAY_OF_WEEK_DEFAULT;
@ -178,7 +178,7 @@ static unsigned Cal_GetParamFirstDayOfWeek (void)
void Cal_DrawCurrentMonth (void)
{
extern const char *Txt_STR_LANG_ID[1+Txt_NUM_LANGUAGES];
extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES];
char ParamsStr[256 + 256 + Ses_LENGTH_SESSION_ID + 256];
/***** Get list of holidays *****/
@ -233,8 +233,8 @@ void Cal_DrawCurrentMonth (void)
void Cal_DrawCalendar (void)
{
extern const char *Hlp_ASSESSMENT_Calendar;
extern const char *Txt_STR_LANG_ID[1+Txt_NUM_LANGUAGES];
char ParamsStr[256+256+Ses_LENGTH_SESSION_ID+256];
extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES];
char ParamsStr[256 + 256 + Ses_LENGTH_SESSION_ID + 256];
bool PrintView = (Gbl.Action.Act == ActPrnCal);
/***** Get list of holidays *****/

54
swad_centre.c
View File

@ -99,7 +99,8 @@ static long Ctr_GetParamOtherCtrCod (void);
static void Ctr_UpdateCtrInsDB (long CtrCod,long InsCod);
static void Ctr_RenameCentre (struct Centre *Ctr,Cns_ShrtOrFullName_t ShrtOrFullName);
static bool Ctr_CheckIfCtrNameExistsInIns (const char *FieldName,const char *Name,long CtrCod,long InsCod);
static void Ctr_UpdateCtrWWWDB (long CtrCod,const char NewWWW[Cns_MAX_LENGTH_WWW+1]);
static void Ctr_UpdateCtrWWWDB (long CtrCod,
const char NewWWW[Cns_MAX_LENGTH_WWW + 1]);
static void Ctr_PutButtonToGoToCtr (struct Centre *Ctr);
static void Ctr_PutFormToCreateCentre (void);
@ -272,7 +273,7 @@ static void Ctr_Configuration (bool PrintView)
extern const char *Txt_Short_name;
extern const char *Txt_Web;
extern const char *Txt_Shortcut;
extern const char *Txt_STR_LANG_ID[1+Txt_NUM_LANGUAGES];
extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES];
extern const char *Txt_QR_code;
extern const char *Txt_Users_of_the_centre;
extern const char *Txt_Place;
@ -282,7 +283,7 @@ static void Ctr_Configuration (bool PrintView)
extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
unsigned NumIns;
struct Place Plc;
char PathPhoto[PATH_MAX+1];
char PathPhoto[PATH_MAX + 1];
bool PhotoExists;
char *PhotoAttribution = NULL;
bool PutLink = !PrintView && Gbl.CurrentCtr.Ctr.WWW[0];
@ -692,7 +693,7 @@ static void Ctr_PutIconToChangePhoto (void)
{
extern const char *Txt_Change_photo;
extern const char *Txt_Upload_photo;
char PathPhoto[PATH_MAX+1];
char PathPhoto[PATH_MAX + 1];
bool PhotoExists;
/***** Link to upload photo of centre *****/
@ -918,7 +919,7 @@ static void Ctr_ListOneCentreForSeeing (struct Centre *Ctr,unsigned NumCtr)
static void Ctr_GetParamCtrOrderType (void)
{
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
unsigned UnsignedNum;
Par_GetParToText ("Order",UnsignedStr,10);
@ -1677,10 +1678,10 @@ long Ctr_GetAndCheckParamOtherCtrCod (void)
static long Ctr_GetParamOtherCtrCod (void)
{
char LongStr[1+10+1];
char LongStr[1 + 10 + 1];
/***** Get parameter with code of centre *****/
Par_GetParToText ("OthCtrCod",LongStr,1+10);
Par_GetParToText ("OthCtrCod",LongStr,1 + 10);
return Str_ConvertStrCodToLongCod (LongStr);
}
@ -1694,7 +1695,7 @@ void Ctr_RemoveCentre (void)
extern const char *Txt_Centre_X_removed;
char Query[512];
struct Centre Ctr;
char PathCtr[PATH_MAX+1];
char PathCtr[PATH_MAX + 1];
/***** Get centre code *****/
Ctr.CtrCod = Ctr_GetAndCheckParamOtherCtrCod ();
@ -1902,7 +1903,7 @@ static void Ctr_RenameCentre (struct Centre *Ctr,Cns_ShrtOrFullName_t ShrtOrFull
const char *FieldName = NULL; // Initialized to avoid warning
unsigned MaxLength = 0; // Initialized to avoid warning
char *CurrentCtrName = NULL; // Initialized to avoid warning
char NewCtrName[Ctr_MAX_LENGTH_CENTRE_FULL_NAME+1];
char NewCtrName[Ctr_MAX_LENGTH_CENTRE_FULL_NAME + 1];
switch (ShrtOrFullName)
{
@ -1974,7 +1975,7 @@ static void Ctr_RenameCentre (struct Centre *Ctr,Cns_ShrtOrFullName_t ShrtOrFull
static bool Ctr_CheckIfCtrNameExistsInIns (const char *FieldName,const char *Name,long CtrCod,long InsCod)
{
char Query[256+Ctr_MAX_LENGTH_CENTRE_FULL_NAME];
char Query[256 + Ctr_MAX_LENGTH_CENTRE_FULL_NAME];
/***** Get number of centres with a name from database *****/
sprintf (Query,"SELECT COUNT(*) FROM centres"
@ -1992,7 +1993,7 @@ void Ctr_ChangeCtrWWW (void)
extern const char *Txt_The_new_web_address_is_X;
extern const char *Txt_You_can_not_leave_the_web_address_empty;
struct Centre *Ctr;
char NewWWW[Cns_MAX_LENGTH_WWW+1];
char NewWWW[Cns_MAX_LENGTH_WWW + 1];
Ctr = &Gbl.Ctrs.EditingCtr;
@ -2033,7 +2034,7 @@ void Ctr_ChangeCtrWWWInConfig (void)
{
extern const char *Txt_The_new_web_address_is_X;
extern const char *Txt_You_can_not_leave_the_web_address_empty;
char NewWWW[Cns_MAX_LENGTH_WWW+1];
char NewWWW[Cns_MAX_LENGTH_WWW + 1];
/***** Get parameters from form *****/
/* Get the new WWW for the centre */
@ -2062,9 +2063,10 @@ void Ctr_ChangeCtrWWWInConfig (void)
/**************** Update database changing old WWW by new WWW ****************/
/*****************************************************************************/
static void Ctr_UpdateCtrWWWDB (long CtrCod,const char NewWWW[Cns_MAX_LENGTH_WWW+1])
static void Ctr_UpdateCtrWWWDB (long CtrCod,
const char NewWWW[Cns_MAX_LENGTH_WWW + 1])
{
char Query[256+Cns_MAX_LENGTH_WWW];
char Query[256 + Cns_MAX_LENGTH_WWW];
/***** Update database changing old WWW by new WWW *****/
sprintf (Query,"UPDATE centres SET WWW='%s' WHERE CtrCod='%ld'",
@ -2081,7 +2083,7 @@ void Ctr_ChangeCtrStatus (void)
extern const char *Txt_The_status_of_the_centre_X_has_changed;
struct Centre *Ctr;
char Query[256];
char UnsignedNum[10+1];
char UnsignedNum[10 + 1];
Ctr_Status_t Status;
Ctr_StatusTxt_t StatusTxt;
@ -2245,17 +2247,17 @@ void Ctr_RequestPhoto (void)
void Ctr_ReceivePhoto (void)
{
extern const char *Txt_Wrong_file_type;
char Path[PATH_MAX+1];
char Path[PATH_MAX + 1];
struct Param *Param;
char FileNameImgSrc[PATH_MAX+1];
char FileNameImgSrc[PATH_MAX + 1];
char *PtrExtension;
size_t LengthExtension;
char MIMEType[Brw_MAX_BYTES_MIME_TYPE + 1];
char PathImgPriv[PATH_MAX+1];
char FileNameImgTmp[PATH_MAX+1]; // Full name (including path and .jpg) of the destination temporary file
char FileNameImg[PATH_MAX+1]; // Full name (including path and .jpg) of the destination file
char PathImgPriv[PATH_MAX + 1];
char FileNameImgTmp[PATH_MAX + 1]; // Full name (including path and .jpg) of the destination temporary file
char FileNameImg[PATH_MAX + 1]; // Full name (including path and .jpg) of the destination file
bool WrongType = false;
char Command[1024+PATH_MAX*2];
char Command[1024 + PATH_MAX * 2];
int ReturnCode;
/***** Copy in disk the file received *****/
@ -2364,8 +2366,8 @@ void Ctr_ReceivePhoto (void)
void Ctr_ChangeCtrPhotoAttribution (void)
{
char Query[256+Ctr_MAX_LENGTH_PHOTO_ATTRIBUTION];
char NewPhotoAttribution[Ctr_MAX_LENGTH_PHOTO_ATTRIBUTION+1];
char Query[256 + Ctr_MAX_LENGTH_PHOTO_ATTRIBUTION];
char NewPhotoAttribution[Ctr_MAX_LENGTH_PHOTO_ATTRIBUTION + 1];
/***** Get parameters from form *****/
/* Get the new photo attribution for the centre */
@ -2731,9 +2733,9 @@ static void Ctr_RecFormRequestOrCreateCtr (unsigned Status)
static void Ctr_CreateCentre (struct Centre *Ctr,unsigned Status)
{
extern const char *Txt_Created_new_centre_X;
char Query[512+
Ctr_MAX_LENGTH_CENTRE_SHRT_NAME+
Ctr_MAX_LENGTH_CENTRE_FULL_NAME+
char Query[512 +
Ctr_MAX_LENGTH_CENTRE_SHRT_NAME +
Ctr_MAX_LENGTH_CENTRE_FULL_NAME +
Cns_MAX_LENGTH_WWW];
/***** Create a new centre *****/

6
swad_centre.h
View File

@ -54,9 +54,9 @@ typedef enum
#define Ctr_MAX_CENTRES_PER_USR 10 // Used in list of my centres
#define Ctr_MAX_LENGTH_CENTRE_SHRT_NAME 32
#define Ctr_MAX_LENGTH_CENTRE_FULL_NAME 127
#define Ctr_MAX_LENGTH_PHOTO_ATTRIBUTION (4*1024)
#define Ctr_MAX_LENGTH_CENTRE_SHRT_NAME 32
#define Ctr_MAX_LENGTH_CENTRE_FULL_NAME 127
#define Ctr_MAX_LENGTH_PHOTO_ATTRIBUTION (4 * 1024)
struct Centre
{

4
swad_changelog.h
View File

@ -191,13 +191,15 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.126.4 (2017-01-27)"
#define Log_PLATFORM_VERSION "SWAD 16.127 (2017-01-28)"
#define CSS_FILE "swad16.123.css"
#define JS_FILE "swad16.123.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 16.127: Jan 28, 2017 Code refactoring. (212118 lines)
Version 16.126.6: Jan 27, 2017 Fixed bug related with list of students. (212098 lines)
Version 16.126.5: Jan 27, 2017 Changes in permissions to view/change another user's data. (212093 lines)
Version 16.126.4: Jan 27, 2017 Code refactoring related to permissions to view/change another user's data. (212105 lines)
Version 16.126.3: Jan 27, 2017 Fixed bug in search of user, reported by Javier Fernández Baldomero. (212086 lines)

12
swad_chat.c
View File

@ -60,7 +60,7 @@ extern struct Globals Gbl;
/*****************************************************************************/
static void Cht_WriteLinkToChat1 (const char *RoomCode,const char *RoomShortName,const char *RoomFullName,
unsigned Level,bool IsLastItemInLevel[1+Cht_CHAT_MAX_LEVELS]);
unsigned Level,bool IsLastItemInLevel[1 + Cht_CHAT_MAX_LEVELS]);
static void Cht_WriteLinkToChat2 (const char *RoomCode,const char *RoomFullName);
static unsigned Cht_GetNumUsrsInChatRoom (const char *RoomCode);
@ -100,7 +100,7 @@ void Cht_ShowListOfAvailableChatRooms (void)
extern const char *Txt_Teachers_ABBREVIATION;
extern const char *Txt_Degree;
extern const char *Txt_Course;
bool IsLastItemInLevel[1+Cht_CHAT_MAX_LEVELS];
bool IsLastItemInLevel[1 + Cht_CHAT_MAX_LEVELS];
unsigned NumMyDeg;
struct Degree Deg;
struct Course Crs;
@ -108,9 +108,9 @@ void Cht_ShowListOfAvailableChatRooms (void)
MYSQL_ROW row;
unsigned long NumRow;
unsigned long NumRows;
char ThisRoomCode [MAX_LENGTH_ROOM_CODE +1];
char ThisRoomShrtName[MAX_LENGTH_ROOM_SHRT_NAME+1];
char ThisRoomFullName[MAX_LENGTH_ROOM_FULL_NAME+1];
char ThisRoomCode [MAX_LENGTH_ROOM_CODE + 1];
char ThisRoomShrtName[MAX_LENGTH_ROOM_SHRT_NAME + 1];
char ThisRoomFullName[MAX_LENGTH_ROOM_FULL_NAME + 1];
/***** Fill the list with the degrees I belong to *****/
Usr_GetMyDegrees ();
@ -295,7 +295,7 @@ void Cht_ShowListOfChatRoomsWithUsrs (void)
/*****************************************************************************/
static void Cht_WriteLinkToChat1 (const char *RoomCode,const char *RoomShortName,const char *RoomFullName,
unsigned Level,bool IsLastItemInLevel[1+Cht_CHAT_MAX_LEVELS])
unsigned Level,bool IsLastItemInLevel[1 + Cht_CHAT_MAX_LEVELS])
{
extern const char *The_ClassForm[The_NUM_THEMES];

4
swad_config.c
View File

@ -73,7 +73,7 @@ void Cfg_GetConfigFromFile (void)
size_t Length;
char *Config;
const char *Ptr;
char Str[Cfg_MAX_BYTES_STR+1];
char Str[Cfg_MAX_BYTES_STR + 1];
/***** Read config from file to string *****/
/* Open config file */
@ -86,7 +86,7 @@ void Cfg_GetConfigFromFile (void)
fseek (FileCfg,0L,SEEK_SET);
/* Allocate memory for buffer */
if ((Config = (char *) malloc (Length+1)) == NULL)
if ((Config = (char *) malloc (Length + 1)) == NULL)
{
fclose (FileCfg);
Lay_ShowErrorAndExit ("Not enough memory for config.");

58
swad_config.h
View File

@ -83,7 +83,7 @@
#define Cfg_DEFAULT_COLUMNS Lay_SHOW_BOTH_COLUMNS
#define Cfg_TIME_TO_SEND_PENDING_NOTIF ((time_t)(30UL*60UL)) // After these seconds after first pending notification, all the pending notifications are sent by email
#define Cfg_TIME_TO_SEND_PENDING_NOTIF ((time_t) (30UL * 60UL)) // After these seconds after first pending notification, all the pending notifications are sent by email
#define Cfg_GOOGLE_ANALYTICS ""
@ -124,7 +124,7 @@
#define Cfg_DEFAULT_COLUMNS Lay_SHOW_BOTH_COLUMNS
#define Cfg_TIME_TO_SEND_PENDING_NOTIF ((time_t)(30UL*60UL)) // After these seconds after first pending notification, all the pending notifications are sent by email
#define Cfg_TIME_TO_SEND_PENDING_NOTIF ((time_t) (30UL * 60UL)) // After these seconds after first pending notification, all the pending notifications are sent by email
/* Google Analytics without cookies.
* This code comes from http://stackoverflow.com/a/19995629
@ -182,7 +182,7 @@
#define Cfg_DEFAULT_COLUMNS Lay_SHOW_BOTH_COLUMNS
#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 email
#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 email
#define Cfg_GOOGLE_ANALYTICS "<script type=\"text/javascript\">" \
" (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){" \
@ -237,7 +237,7 @@
#define Cfg_DEFAULT_COLUMNS Lay_SHOW_BOTH_COLUMNS
#define Cfg_TIME_TO_SEND_PENDING_NOTIF ((time_t)(30UL*60UL)) // After these seconds after first pending notification, all the pending notifications are sent by email
#define Cfg_TIME_TO_SEND_PENDING_NOTIF ((time_t) (30UL * 60UL)) // After these seconds after first pending notification, all the pending notifications are sent by email
#define Cfg_GOOGLE_ANALYTICS ""
@ -451,50 +451,50 @@
#define Cfg_DAYS_IN_RECENT_LOG 8 // Only accesses in these last days + 1 are stored in recent log.
// Important!!! Must be 1 <= Cfg_DAYS_IN_RECENT_LOG <= 29
#define Cfg_TIMES_PER_SECOND_REFRESH_CONNECTED 2 // Execute this CGI to refresh connected users about these times per second
#define Cfg_MIN_TIME_TO_REFRESH_CONNECTED ((time_t)( 60UL)) // Refresh period of connected users in seconds
#define Cfg_MAX_TIME_TO_REFRESH_CONNECTED ((time_t)( 15UL*60UL)) // Refresh period of connected users in seconds
#define Cfg_MIN_TIME_TO_REFRESH_CONNECTED ((time_t)( 60UL)) // Refresh period of connected users in seconds
#define Cfg_MAX_TIME_TO_REFRESH_CONNECTED ((time_t)( 15UL * 60UL)) // Refresh period of connected users in seconds
#define Cfg_TIME_TO_CLOSE_SESSION_FROM_LAST_REFRESH ((time_t)(Cfg_MAX_TIME_TO_REFRESH_CONNECTED * 2)) // After these seconds without refresh of connected users, session is closed
#define Cfg_TIME_TO_CLOSE_SESSION_FROM_LAST_CLICK ((time_t)( 2*60UL*60UL)) // After these seconds without user's clicks, session is closed
#define Cfg_TIME_TO_CLOSE_SESSION_FROM_LAST_CLICK ((time_t)( 2 * 60UL * 60UL)) // After these seconds without user's clicks, session is closed
#define Cfg_TIME_TO_REFRESH_LAST_CLICKS ((time_t)( 500UL)) // Refresh period of last clicks in miliseconds
#define Cfg_TIME_TO_REFRESH_LAST_CLICKS ((time_t)( 500UL)) // Refresh period of last clicks in miliseconds
#define Cfg_TIME_TO_REFRESH_SOCIAL_TIMELINE ((time_t)( 30UL*1000UL)) // Refresh period of social timeline in miliseconds
#define Cfg_TIME_TO_REFRESH_SOCIAL_TIMELINE ((time_t)( 30UL * 1000UL)) // Refresh period of social timeline in miliseconds
#define Cfg_TIME_TO_CHANGE_BANNER ((time_t)( 5UL*60UL)) // After these seconds, change banner
#define Cfg_TIME_TO_CHANGE_BANNER ((time_t)( 5UL * 60UL)) // After these seconds, change banner
#define Cfg_NUMBER_OF_BANNERS 1 // Number of banners to show simultaneously
#define Cfg_TIME_TO_DELETE_WEB_SERVICE_KEY ((time_t)( 7UL*24UL*60UL*60UL)) // After these seconds, a web service key is removed
#define Cfg_TIME_TO_DELETE_WEB_SERVICE_KEY ((time_t)( 7UL * 24UL * 60UL * 60UL)) // After these seconds, a web service key is removed
#define Cfg_TIME_TO_DELETE_HTML_OUTPUT ((time_t)( 30UL*60UL)) // Remove the HTML output files older than these seconds
#define Cfg_TIME_TO_DELETE_HTML_OUTPUT ((time_t)( 30UL * 60UL)) // Remove the HTML output files older than these seconds
#define Cfg_TIME_TO_ABORT_FILE_UPLOAD ((time_t)( 55UL*60UL)) // After these seconds uploading data, abort upload.
#define Cfg_TIME_TO_ABORT_FILE_UPLOAD ((time_t)( 55UL * 60UL)) // After these seconds uploading data, abort upload.
#define Cfg_TIME_TO_DELETE_BROWSER_TMP_FILES ((time_t)( 2UL*60UL*60UL)) // Temporary files are deleted after these seconds
#define Cfg_TIME_TO_DELETE_BROWSER_EXPANDED_FOLDERS ((time_t)( 7UL*24UL*60UL*60UL)) // Past these seconds, remove expired expanded folders
#define Cfg_TIME_TO_DELETE_BROWSER_CLIPBOARD ((time_t)( 15UL*60UL)) // Paths older than these seconds are removed from clipboard
#define Cfg_TIME_TO_DELETE_BROWSER_ZIP_FILES ((time_t)( 2UL*60UL*60UL)) // Temporary zip files are deleted after these seconds
#define Cfg_TIME_TO_DELETE_BROWSER_TMP_FILES ((time_t)( 2UL * 60UL * 60UL)) // Temporary files are deleted after these seconds
#define Cfg_TIME_TO_DELETE_BROWSER_EXPANDED_FOLDERS ((time_t)( 7UL * 24UL * 60UL * 60UL)) // Past these seconds, remove expired expanded folders
#define Cfg_TIME_TO_DELETE_BROWSER_CLIPBOARD ((time_t)( 15UL * 60UL)) // Paths older than these seconds are removed from clipboard
#define Cfg_TIME_TO_DELETE_BROWSER_ZIP_FILES ((time_t)( 2UL * 60UL * 60UL)) // Temporary zip files are deleted after these seconds
#define Cfg_TIME_TO_DELETE_MARKS_TMP_FILES ((time_t)( 2UL*60UL*60UL)) // Temporary files with students' marks are deleted after these seconds
#define Cfg_TIME_TO_DELETE_MARKS_TMP_FILES ((time_t)( 2UL * 60UL * 60UL)) // Temporary files with students' marks are deleted after these seconds
#define Cfg_TIME_TO_DELETE_PARAMS_TO_COMMANDS ((time_t)( 15UL*60UL)) // Temporary files with params to commands are deleted after these seconds
#define Cfg_TIME_TO_DELETE_PARAMS_TO_COMMANDS ((time_t)( 15UL * 60UL)) // Temporary files with params to commands are deleted after these seconds
#define Cfg_TIME_TO_DELETE_IMAGES_TMP_FILES ((time_t)( 2UL*60UL*60UL)) // Temporary files related to images after these seconds
#define Cfg_TIME_TO_DELETE_PHOTOS_TMP_FILES ((time_t)( 2UL*60UL*60UL)) // Temporary files related to photos after these seconds
#define Cfg_TIME_TO_DELETE_IMAGES_TMP_FILES ((time_t)( 2UL * 60UL * 60UL)) // Temporary files related to images after these seconds
#define Cfg_TIME_TO_DELETE_PHOTOS_TMP_FILES ((time_t)( 2UL * 60UL * 60UL)) // Temporary files related to photos after these seconds
#define Cfg_TIME_TO_DELETE_TEST_TMP_FILES ((time_t)( 2UL*60UL*60UL)) // Temporary files related to imported test questions after these seconds
#define Cfg_TIME_TO_DELETE_TEST_TMP_FILES ((time_t)( 2UL * 60UL * 60UL)) // Temporary files related to imported test questions after these seconds
#define Cfg_TIME_TO_DELETE_ENROLLMENT_REQUESTS ((time_t)( 30UL*24UL*60UL*60UL)) // Past these seconds, remove expired enrollment requests
#define Cfg_TIME_TO_DELETE_ENROLLMENT_REQUESTS ((time_t)(30UL * 24UL * 60UL * 60UL)) // Past these seconds, remove expired enrollment requests
#define Cfg_TIME_TO_DELETE_THREAD_CLIPBOARD ((time_t)( 15UL*60UL)) // Threads older than these seconds are removed from clipboard
#define Cfg_TIME_TO_DELETE_THREAD_CLIPBOARD ((time_t)( 15UL * 60UL)) // Threads older than these seconds are removed from clipboard
#define Cfg_TIME_TO_DELETE_OLD_PENDING_PASSWORDS ((time_t)( 24UL*60UL*60UL)) // Past these seconds, remove expired pending passwords
#define Cfg_TIME_TO_DELETE_OLD_PENDING_EMAILS ((time_t)( 24UL*60UL*60UL)) // Past these seconds, remove expired pending emails
#define Cfg_TIME_TO_DELETE_OLD_PENDING_PASSWORDS ((time_t)( 24UL * 60UL * 60UL)) // Past these seconds, remove expired pending passwords
#define Cfg_TIME_TO_DELETE_OLD_PENDING_EMAILS ((time_t)( 24UL * 60UL * 60UL)) // Past these seconds, remove expired pending emails
#define Cfg_TIME_TO_DELETE_IP_PREFS ((time_t)( 7UL*24UL*60UL*60UL)) // Past these seconds, remove expired IP preferences
#define Cfg_TIME_TO_DELETE_IP_PREFS ((time_t)( 7UL * 24UL * 60UL * 60UL)) // Past these seconds, remove expired IP preferences
#define Cfg_TIME_TO_DELETE_OLD_NOTIF ((time_t)( 30UL*24UL*60UL*60UL)) // Past these seconds, remove expired notifications
#define Cfg_TIME_TO_DELETE_OLD_NOTIF ((time_t)(30UL * 24UL * 60UL * 60UL)) // Past these seconds, remove expired notifications
#define Cfg_MIN_TIME_TO_RECOMPUTE_AVG_PHOTO ((time_t)( 12UL*60UL*60UL)) // After these seconds, users can recompute the average photos of a degree
#define Cfg_MIN_TIME_TO_RECOMPUTE_AVG_PHOTO ((time_t)( 12UL * 60UL * 60UL)) // After these seconds, users can recompute the average photos of a degree
/*****************************************************************************/
/***************************** Public prototypes *****************************/

12
swad_connected.c
View File

@ -175,7 +175,7 @@ void Con_ShowLastClicks (void)
void Con_GetAndShowLastClicks (void)
{
extern struct Act_Actions Act_Actions[Act_NUM_ACTIONS];
extern Act_Action_t Act_FromActCodToAction[1+Act_MAX_ACTION_COD];
extern Act_Action_t Act_FromActCodToAction[1 + Act_MAX_ACTION_COD];
extern const char *Txt_Click;
extern const char *Txt_ELAPSED_TIME;
extern const char *Txt_Role;
@ -1072,7 +1072,7 @@ static void Con_WriteRowConnectedUsrOnRightColumn (Rol_Role_t Role)
{
extern const char *Txt_View_record_for_this_course;
bool ShowPhoto;
char PhotoURL[PATH_MAX+1];
char PhotoURL[PATH_MAX + 1];
const char *Font = (Gbl.Usrs.Connected.Lst[Gbl.Usrs.Connected.NumUsr].ThisCrs ? "CON_CRS" :
"CON");
struct UsrData UsrDat;
@ -1094,7 +1094,7 @@ static void Con_WriteRowConnectedUsrOnRightColumn (Rol_Role_t Role)
// is dynamically updated via AJAX
Usr_PutParamUsrCodEncrypted (UsrDat.EncryptedUsrCod);
Act_LinkFormSubmitUnique (UsrDat.FullName,NULL);
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (&UsrDat,PhotoURL);
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (&UsrDat,PhotoURL);
Pho_ShowUsrPhoto (&UsrDat,ShowPhoto ? PhotoURL :
NULL,
"PHOTO21x28",Pho_ZOOM,false);
@ -1150,7 +1150,7 @@ static void Con_ShowConnectedUsrsCurrentLocationOneByOneOnMainZone (Rol_Role_t R
bool ThisCrs;
time_t TimeDiff;
bool ShowPhoto;
char PhotoURL[PATH_MAX+1];
char PhotoURL[PATH_MAX + 1];
const char *Font;
struct UsrData UsrDat;
bool PutLinkToRecord = (Gbl.CurrentCrs.Crs.CrsCod > 0 &&
@ -1286,7 +1286,7 @@ static void Con_ShowConnectedUsrsCurrentLocationOneByOneOnMainZone (Rol_Role_t R
"<td class=\"LEFT_MIDDLE COLOR%u\""
" style=\"width:22px;\">",
Gbl.RowEvenOdd);
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (&UsrDat,PhotoURL);
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (&UsrDat,PhotoURL);
Pho_ShowUsrPhoto (&UsrDat,ShowPhoto ? PhotoURL :
NULL,
"PHOTO21x28",Pho_ZOOM,false);
@ -1338,7 +1338,7 @@ static void Con_ShowConnectedUsrsCurrentLocationOneByOneOnMainZone (Rol_Role_t R
static void Con_WriteHoursMinutesSecondsFromSeconds (time_t Seconds)
{
time_t Hours = Seconds / (60*60);
time_t Hours = Seconds / (60 * 60);
time_t Minutes = (Seconds / 60) % 60;
Seconds %= 60;

6
swad_constant.h
View File

@ -37,14 +37,14 @@
#define Cns_MAX_LENGTH_IP (16 - 1) // Max. bytes of an IP address
#define Cns_MAX_LENGTH_DATE (4+1+2+1+2)
#define Cns_MAX_LENGTH_DATE (4 + 1 + 2 + 1 + 2)
#define Cns_MAX_BYTES_DATE 19 // Examples: "20030614143857", "14/06/2003 14:38:57"
#define Cns_MAX_LENGTH_SUBJECT (256 - 1)
#define Cns_MAX_BYTES_SUBJECT (Cns_MAX_LENGTH_SUBJECT * Str_MAX_CHARACTER)
#define Cns_MAX_BYTES_TEXT ( 64*1024 - 1) // Used for subjects and other medium texts
#define Cns_MAX_BYTES_LONG_TEXT (256*1024 - 1) // Used for big contents
#define Cns_MAX_BYTES_TEXT ( 64 * 1024 - 1) // Used for subjects and other medium texts
#define Cns_MAX_BYTES_LONG_TEXT (256 * 1024 - 1) // Used for big contents
#define Cns_MAX_LENGTH_STRING (128 - 1)
#define Cns_MAX_BYTES_STRING (128 - 1)

56
swad_country.c
View File

@ -80,7 +80,7 @@ static void Cty_PutParamOtherCtyCod (long CtyCod);
static long Cty_GetParamOtherCtyCod (void);
static bool Cty_CheckIfNumericCountryCodeExists (long CtyCod);
static bool Cty_CheckIfAlpha2CountryCodeExists (const char Alpha2[2+1]);
static bool Cty_CheckIfAlpha2CountryCodeExists (const char Alpha2[2 + 1]);
static bool Cty_CheckIfCountryNameExists (Txt_Language_t Language,const char *Name,long CtyCod);
static void Cty_PutFormToCreateCountry (void);
static void Cty_PutHeadCountries (void);
@ -93,7 +93,7 @@ static void Cty_CreateCountry (struct Country *Cty);
void Cty_SeeCtyWithPendingInss (void)
{
extern const char *Hlp_SYSTEM_Pending;
extern const char *Txt_STR_LANG_ID[1+Txt_NUM_LANGUAGES];
extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES];
extern const char *Txt_Countries_with_pending_institutions;
extern const char *Txt_Country;
extern const char *Txt_Institutions_ABBREVIATION;
@ -214,7 +214,7 @@ static void Cty_Configuration (bool PrintView)
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Country;
extern const char *Txt_Shortcut;
extern const char *Txt_STR_LANG_ID[1+Txt_NUM_LANGUAGES];
extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES];
extern const char *Txt_QR_code;
extern const char *Txt_Institutions;
extern const char *Txt_Institutions_of_COUNTRY_X;
@ -812,7 +812,7 @@ void Cty_DrawCountryMap (struct Country *Cty,const char *Class)
bool Cty_CheckIfCountryMapExists (struct Country *Cty)
{
char PathMap[PATH_MAX+1];
char PathMap[PATH_MAX + 1];
sprintf (PathMap,"%s/%s/%s/%s/%s.png",
Cfg_PATH_SWAD_PUBLIC,
@ -889,7 +889,7 @@ void Cty_WriteScriptGoogleGeochart (void)
static void Cty_GetParamCtyOrderType (void)
{
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
unsigned UnsignedNum;
Par_GetParToText ("Order",UnsignedStr,10);
@ -934,7 +934,7 @@ void Cty_EditCountries (void)
void Cty_GetListCountries (Cty_GetExtraData_t GetExtraData)
{
extern const char *Txt_STR_LANG_ID[1+Txt_NUM_LANGUAGES];
extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES];
char StrField[32];
char SubQueryNam1[Cty_MAX_LENGTH_SUBQUERY_CTYS + 1];
char SubQueryNam2[Cty_MAX_LENGTH_SUBQUERY_CTYS + 1];
@ -1071,7 +1071,8 @@ void Cty_GetListCountries (Cty_GetExtraData_t GetExtraData)
}
/* Get number of users who claim to belong to this country */
if (sscanf (row[1+Txt_NUM_LANGUAGES*2+1],"%u",&Cty->NumUsrsWhoClaimToBelongToCty) != 1)
if (sscanf (row[1 + Txt_NUM_LANGUAGES * 2 + 1],"%u",
&Cty->NumUsrsWhoClaimToBelongToCty) != 1)
Cty->NumUsrsWhoClaimToBelongToCty = 0;
/* Get number of institutions in this country */
@ -1106,7 +1107,7 @@ void Cty_GetListCountries (Cty_GetExtraData_t GetExtraData)
void Cty_WriteSelectorOfCountry (void)
{
extern const char *Txt_Country;
extern const char *Txt_STR_LANG_ID[1+Txt_NUM_LANGUAGES];
extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES];
char Query[512];
MYSQL_RES *mysql_res;
MYSQL_ROW row;
@ -1197,7 +1198,7 @@ void Cty_WriteCountryName (long CtyCod,const char *Class)
bool Cty_GetDataOfCountryByCod (struct Country *Cty,Cty_GetExtraData_t GetExtraData)
{
extern const char *Txt_Another_country;
extern const char *Txt_STR_LANG_ID[1+Txt_NUM_LANGUAGES];
extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES];
char StrField[32];
char SubQueryNam1[Cty_MAX_LENGTH_SUBQUERY_CTYS + 1];
char SubQueryNam2[Cty_MAX_LENGTH_SUBQUERY_CTYS + 1];
@ -1326,7 +1327,8 @@ bool Cty_GetDataOfCountryByCod (struct Country *Cty,Cty_GetExtraData_t GetExtraD
}
/* Get number of users who claim to belong to this country */
if (sscanf (row[Txt_NUM_LANGUAGES*2+1],"%u",&Cty->NumUsrsWhoClaimToBelongToCty) != 1)
if (sscanf (row[Txt_NUM_LANGUAGES * 2 + 1],"%u",
&Cty->NumUsrsWhoClaimToBelongToCty) != 1)
Cty->NumUsrsWhoClaimToBelongToCty = 0;
/* Get number of user in courses of this institution */
@ -1353,7 +1355,7 @@ bool Cty_GetDataOfCountryByCod (struct Country *Cty,Cty_GetExtraData_t GetExtraD
void Cty_GetCountryName (long CtyCod,char CtyName[Cty_MAX_BYTES_COUNTRY_NAME + 1])
{
extern const char *Txt_STR_LANG_ID[1+Txt_NUM_LANGUAGES];
extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES];
char Query[128];
MYSQL_RES *mysql_res;
MYSQL_ROW row;
@ -1456,7 +1458,7 @@ static void Cty_ListCountriesForEdition (void)
{
extern const char *Hlp_SYSTEM_Countries;
extern const char *Txt_Countries;
extern const char *Txt_STR_LANG_NAME[1+Txt_NUM_LANGUAGES];
extern const char *Txt_STR_LANG_NAME[1 + Txt_NUM_LANGUAGES];
unsigned NumCty;
struct Country *Cty;
Txt_Language_t Lan;
@ -1599,10 +1601,10 @@ long Cty_GetAndCheckParamOtherCtyCod (void)
static long Cty_GetParamOtherCtyCod (void)
{
char LongStr[1+10+1];
char LongStr[1 + 10 + 1];
/***** Get parameter with code of country *****/
Par_GetParToText ("OthCtyCod",LongStr,1+10);
Par_GetParToText ("OthCtyCod",LongStr,1 + 10);
return Str_ConvertStrCodToLongCod (LongStr);
}
@ -1657,11 +1659,11 @@ void Cty_RenameCountry (void)
extern const char *Txt_You_can_not_leave_the_name_of_the_country_X_empty;
extern const char *Txt_The_country_X_already_exists;
extern const char *Txt_The_country_X_has_been_renamed_as_Y;
extern const char *Txt_STR_LANG_ID[1+Txt_NUM_LANGUAGES];
extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES];
extern const char *Txt_The_name_of_the_country_X_has_not_changed;
char Query[512];
struct Country *Cty;
char NewCtyName[Cty_MAX_BYTES_COUNTRY_NAME+1];
char NewCtyName[Cty_MAX_BYTES_COUNTRY_NAME + 1];
Txt_Language_t Language;
Cty = &Gbl.Ctys.EditingCty;
@ -1744,7 +1746,7 @@ static bool Cty_CheckIfNumericCountryCodeExists (long CtyCod)
/*************** Check if an alphabetic country code exists ******************/
/*****************************************************************************/
static bool Cty_CheckIfAlpha2CountryCodeExists (const char Alpha2[2+1])
static bool Cty_CheckIfAlpha2CountryCodeExists (const char Alpha2[2 + 1])
{
char Query[512];
@ -1760,7 +1762,7 @@ static bool Cty_CheckIfAlpha2CountryCodeExists (const char Alpha2[2+1])
static bool Cty_CheckIfCountryNameExists (Txt_Language_t Language,const char *Name,long CtyCod)
{
extern const char *Txt_STR_LANG_ID[1+Txt_NUM_LANGUAGES];
extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES];
char Query[512];
/***** Get number of countries with a name from database *****/
@ -1777,10 +1779,10 @@ static bool Cty_CheckIfCountryNameExists (Txt_Language_t Language,const char *Na
void Cty_ChangeCtyWWW (void)
{
extern const char *Txt_The_new_web_address_is_X;
extern const char *Txt_STR_LANG_ID[1+Txt_NUM_LANGUAGES];
char Query[256+Cns_MAX_LENGTH_WWW];
extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES];
char Query[256 + Cns_MAX_LENGTH_WWW];
struct Country *Cty;
char NewWWW[Cns_MAX_LENGTH_WWW+1];
char NewWWW[Cns_MAX_LENGTH_WWW + 1];
Txt_Language_t Language;
Cty = &Gbl.Ctys.EditingCty;
@ -1820,8 +1822,8 @@ void Cty_ChangeCtyWWW (void)
void Cty_ChangeCtyMapAttribution (void)
{
char Query[256+Cty_MAX_LENGTH_MAP_ATTRIBUTION];
char NewMapAttribution[Cty_MAX_LENGTH_MAP_ATTRIBUTION+1];
char Query[256 + Cty_MAX_LENGTH_MAP_ATTRIBUTION];
char NewMapAttribution[Cty_MAX_LENGTH_MAP_ATTRIBUTION + 1];
/***** Get parameters from form *****/
/* Get the new map attribution for the country */
@ -1845,8 +1847,8 @@ static void Cty_PutFormToCreateCountry (void)
{
extern const char *Hlp_SYSTEM_Countries;
extern const char *Txt_New_country;
extern const char *Txt_STR_LANG_NAME[1+Txt_NUM_LANGUAGES];
extern const char *Txt_STR_LANG_ID[1+Txt_NUM_LANGUAGES];
extern const char *Txt_STR_LANG_NAME[1 + Txt_NUM_LANGUAGES];
extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES];
extern const char *Txt_Create_country;
struct Country *Cty;
Txt_Language_t Lan;
@ -1996,7 +1998,7 @@ void Cty_RecFormNewCountry (void)
extern const char *Txt_The_numerical_code_X_already_exists;
extern const char *Txt_The_alphabetical_code_X_is_not_correct;
extern const char *Txt_The_alphabetical_code_X_already_exists;
extern const char *Txt_STR_LANG_ID[1+Txt_NUM_LANGUAGES];
extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES];
extern const char *Txt_The_country_X_already_exists;
extern const char *Txt_You_must_specify_the_name_of_the_new_country_in_all_languages;
char ParamName[32];
@ -2098,7 +2100,7 @@ void Cty_RecFormNewCountry (void)
static void Cty_CreateCountry (struct Country *Cty)
{
extern const char *Txt_STR_LANG_ID[1+Txt_NUM_LANGUAGES];
extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES];
extern const char *Txt_Created_new_country_X;
Txt_Language_t Lan;
char StrField[32];

4
swad_country.h
View File

@ -37,8 +37,8 @@
/************************** Public types and constants ***********************/
/*****************************************************************************/
#define Cty_MAX_BYTES_COUNTRY_NAME 255
#define Cty_MAX_LENGTH_MAP_ATTRIBUTION (4*1024)
#define Cty_MAX_BYTES_COUNTRY_NAME 255
#define Cty_MAX_LENGTH_MAP_ATTRIBUTION (4 * 1024)
#define Cty_MAX_COUNTRS_PER_USR 10 // Used in list of my countries

46
swad_course.c
View File

@ -163,12 +163,12 @@ static void Crs_Configuration (bool PrintView)
extern const char *Txt_Course;
extern const char *Txt_Short_name;
extern const char *Txt_Year_OF_A_DEGREE;
extern const char *Txt_YEAR_OF_DEGREE[1+Deg_MAX_YEARS_PER_DEGREE];
extern const char *Txt_YEAR_OF_DEGREE[1 + Deg_MAX_YEARS_PER_DEGREE];
extern const char *Txt_Not_applicable;
extern const char *Txt_Institutional_code;
extern const char *Txt_Internal_code;
extern const char *Txt_Shortcut;
extern const char *Txt_STR_LANG_ID[1+Txt_NUM_LANGUAGES];
extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES];
extern const char *Txt_QR_code;
extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
extern const char *Txt_Indicators;
@ -542,8 +542,8 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
unsigned NumDegs;
unsigned NumCrs;
unsigned NumCrss;
char ActTxt[Act_MAX_LENGTH_ACTION_TXT+1];
char PathRelRSSFile[PATH_MAX+1];
char ActTxt[Act_MAX_LENGTH_ACTION_TXT + 1];
char PathRelRSSFile[PATH_MAX + 1];
const char *ClassNormal;
char ClassHighlight[64];
@ -1268,7 +1268,7 @@ static bool Crs_ListCoursesOfAYearForSeeing (unsigned Year)
{
extern const char *Txt_COURSE_With_users;
extern const char *Txt_COURSE_Without_users;
extern const char *Txt_YEAR_OF_DEGREE[1+Deg_MAX_YEARS_PER_DEGREE];
extern const char *Txt_YEAR_OF_DEGREE[1 + Deg_MAX_YEARS_PER_DEGREE];
extern const char *Txt_Go_to_X;
extern const char *Txt_COURSE_STATUS[Crs_NUM_STATUS_TXT];
unsigned NumCrs;
@ -1415,7 +1415,7 @@ static void Crs_ListCoursesForEdition (void)
static void Crs_ListCoursesOfAYearForEdition (unsigned Year)
{
extern const char *Txt_YEAR_OF_DEGREE[1+Deg_MAX_YEARS_PER_DEGREE];
extern const char *Txt_YEAR_OF_DEGREE[1 + Deg_MAX_YEARS_PER_DEGREE];
extern const char *Txt_COURSE_STATUS[Crs_NUM_STATUS_TXT];
struct Course *Crs;
unsigned YearAux;
@ -1653,7 +1653,7 @@ static void Crs_PutFormToCreateCourse (void)
{
extern const char *Hlp_DEGREE_Courses;
extern const char *Txt_New_course_of_DEGREE_X;
extern const char *Txt_YEAR_OF_DEGREE[1+Deg_MAX_YEARS_PER_DEGREE];
extern const char *Txt_YEAR_OF_DEGREE[1 + Deg_MAX_YEARS_PER_DEGREE];
extern const char *Txt_COURSE_STATUS[Crs_NUM_STATUS_TXT];
extern const char *Txt_Create_course;
struct Course *Crs;
@ -1886,7 +1886,7 @@ static void Crs_RecFormRequestOrCreateCrs (unsigned Status)
extern const char *Txt_The_course_X_already_exists;
extern const char *Txt_You_must_specify_the_short_name_and_the_full_name_of_the_new_course;
extern const char *Txt_The_year_X_is_not_allowed;
extern const char *Txt_YEAR_OF_DEGREE[1+Deg_MAX_YEARS_PER_DEGREE];
extern const char *Txt_YEAR_OF_DEGREE[1 + Deg_MAX_YEARS_PER_DEGREE];
struct Course *Crs;
struct Degree Deg;
@ -1943,7 +1943,7 @@ static void Crs_RecFormRequestOrCreateCrs (unsigned Status)
static void Crs_GetParamsNewCourse (struct Course *Crs)
{
char YearStr[2+1];
char YearStr[2 + 1];
/***** Get parameters of the course from form *****/
/* Get institutional code */
@ -2201,7 +2201,7 @@ void Crs_RemoveCourseCompletely (long CrsCod)
static void Crs_EmptyCourseCompletely (long CrsCod)
{
struct Course Crs;
char PathRelCrs[PATH_MAX+1];
char PathRelCrs[PATH_MAX + 1];
char Query[512];
/***** Get course data *****/
@ -2331,7 +2331,7 @@ void Crs_ChangeInsCrsCodInConfig (void)
extern const char *Txt_The_institutional_code_of_the_course_X_has_changed_to_Y;
extern const char *Txt_The_institutional_code_of_the_course_X_has_not_changed;
extern const char *Txt_You_dont_have_permission_to_edit_this_course;
char NewInstitutionalCrsCod[Crs_LENGTH_INSTITUTIONAL_CRS_COD+1];
char NewInstitutionalCrsCod[Crs_LENGTH_INSTITUTIONAL_CRS_COD + 1];
/***** Get institutional code from form *****/
Par_GetParToText ("InsCrsCod",NewInstitutionalCrsCod,Crs_LENGTH_INSTITUTIONAL_CRS_COD);
@ -2358,7 +2358,7 @@ void Crs_ChangeInsCrsCod (void)
extern const char *Txt_The_institutional_code_of_the_course_X_has_changed_to_Y;
extern const char *Txt_The_institutional_code_of_the_course_X_has_not_changed;
extern const char *Txt_You_dont_have_permission_to_edit_this_course;
char NewInstitutionalCrsCod[Crs_LENGTH_INSTITUTIONAL_CRS_COD+1];
char NewInstitutionalCrsCod[Crs_LENGTH_INSTITUTIONAL_CRS_COD + 1];
struct Course *Crs;
Crs = &Gbl.Degs.EditingCrs;
@ -2400,7 +2400,7 @@ void Crs_ChangeInsCrsCod (void)
void Crs_ChangeCrsDegInConfig (void)
{
extern const char *Txt_In_the_year_X_of_the_degree_Y_already_existed_a_course_with_the_name_Z;
extern const char *Txt_YEAR_OF_DEGREE[1+Deg_MAX_YEARS_PER_DEGREE];
extern const char *Txt_YEAR_OF_DEGREE[1 + Deg_MAX_YEARS_PER_DEGREE];
extern const char *Txt_The_course_X_has_been_moved_to_the_degree_Y;
struct Degree NewDeg;
@ -2482,10 +2482,10 @@ static void Crs_UpdateCrsDegDB (long CrsCod,long DegCod)
void Crs_ChangeCrsYearInConfig (void)
{
extern const char *Txt_The_course_X_already_exists_in_year_Y;
extern const char *Txt_YEAR_OF_DEGREE[1+Deg_MAX_YEARS_PER_DEGREE];
extern const char *Txt_YEAR_OF_DEGREE[1 + Deg_MAX_YEARS_PER_DEGREE];
extern const char *Txt_The_year_of_the_course_X_has_changed;
extern const char *Txt_The_year_X_is_not_allowed;
char YearStr[2+1];
char YearStr[2 + 1];
unsigned NewYear;
/***** Get parameter with year/semester *****/
@ -2533,13 +2533,13 @@ void Crs_ChangeCrsYearInConfig (void)
void Crs_ChangeCrsYear (void)
{
extern const char *Txt_The_course_X_already_exists_in_year_Y;
extern const char *Txt_YEAR_OF_DEGREE[1+Deg_MAX_YEARS_PER_DEGREE];
extern const char *Txt_YEAR_OF_DEGREE[1 + Deg_MAX_YEARS_PER_DEGREE];
extern const char *Txt_The_year_of_the_course_X_has_changed;
extern const char *Txt_The_year_X_is_not_allowed;
extern const char *Txt_You_dont_have_permission_to_edit_this_course;
struct Course *Crs;
struct Degree Deg;
char YearStr[2+1];
char YearStr[2 + 1];
unsigned NewYear;
Crs = &Gbl.Degs.EditingCrs;
@ -2680,7 +2680,7 @@ static void Crs_RenameCourse (struct Course *Crs,Cns_ShrtOrFullName_t ShrtOrFull
const char *FieldName = NULL; // Initialized to avoid warning
unsigned MaxLength = 0; // Initialized to avoid warning
char *CurrentCrsName = NULL; // Initialized to avoid warning
char NewCrsName[Crs_MAX_LENGTH_COURSE_FULL_NAME+1];
char NewCrsName[Crs_MAX_LENGTH_COURSE_FULL_NAME + 1];
switch (ShrtOrFullName)
{
@ -2764,7 +2764,7 @@ void Crs_ChangeCrsStatus (void)
extern const char *Txt_The_status_of_the_course_X_has_changed;
struct Course *Crs;
char Query[256];
char UnsignedNum[10+1];
char UnsignedNum[10 + 1];
Crs_Status_t Status;
Crs_StatusTxt_t StatusTxt;
@ -2985,10 +2985,10 @@ static long Crs_GetAndCheckParamOtherCrsCod (void)
static long Crs_GetParamOtherCrsCod (void)
{
char LongStr[1+10+1];
char LongStr[1 + 10 + 1];
/***** Get parameter with code of course *****/
Par_GetParToText ("OthCrsCod",LongStr,1+10);
Par_GetParToText ("OthCrsCod",LongStr,1 + 10);
return Str_ConvertStrCodToLongCod (LongStr);
}
@ -3175,7 +3175,7 @@ static void Crs_WriteRowCrsData (unsigned NumCrs,MYSQL_ROW row,bool WriteColumnA
extern const char *Txt_Enrollment_confirmed;
extern const char *Txt_Enrollment_not_confirmed;
extern const char *Txt_Go_to_X;
extern const char *Txt_YEAR_OF_DEGREE[1+Deg_MAX_YEARS_PER_DEGREE];
extern const char *Txt_YEAR_OF_DEGREE[1 + Deg_MAX_YEARS_PER_DEGREE];
struct Degree Deg;
long CrsCod;
unsigned NumTchs;
@ -3373,7 +3373,7 @@ void Crs_RemoveOldCrss (void)
{
extern const char *Txt_Eliminating_X_courses_whithout_users_and_with_more_than_Y_months_without_access;
extern const char *Txt_X_courses_have_been_eliminated;
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
unsigned MonthsWithoutAccess;
unsigned long SecondsWithoutAccess;
char Query[1024];

35
swad_cryptography.c
View File

@ -76,7 +76,8 @@ extern const char Str_BIN_TO_BASE64URL[64];
/*****************************************************************************/
// Pointers to PlainText and EncryptedText can point to the same place
void Cry_EncryptSHA256Base64 (const char *PlainText,char EncryptedText[Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64+1])
void Cry_EncryptSHA256Base64 (const char *PlainText,
char EncryptedText[Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64 + 1])
{
int i,j;
unsigned char digest256[SHA256_DIGEST_SIZE];
@ -89,17 +90,17 @@ void Cry_EncryptSHA256Base64 (const char *PlainText,char EncryptedText[Cry_LENGT
i < BYTES_SHA256_ENCRYPTION;
i += 3) // 256 bits, 32 bytes
{
EncryptedText[j++] = Str_BIN_TO_BASE64URL [(digest256[ i ] & 0xFC) >> 2];
EncryptedText[j++] = Str_BIN_TO_BASE64URL [ (digest256[ i ] & 0xFC) >> 2];
if (i == (BYTES_SHA256_ENCRYPTION-2)) // i == 30, j == 42, last character to fill in encrypted text
{
EncryptedText[j++] = Str_BIN_TO_BASE64URL [((digest256[ i ] & 0x03) << 4) | ((digest256[i+1] & 0xF0) >> 4)];
EncryptedText[ j ] = Str_BIN_TO_BASE64URL [((digest256[i+1] & 0x0F) << 2) ];
EncryptedText[j++] = Str_BIN_TO_BASE64URL [((digest256[ i ] & 0x03) << 4) | ((digest256[i + 1] & 0xF0) >> 4)];
EncryptedText[ j ] = Str_BIN_TO_BASE64URL [((digest256[i + 1] & 0x0F) << 2) ];
}
else
{
EncryptedText[j++] = Str_BIN_TO_BASE64URL [((digest256[ i ] & 0x03) << 4) | ((digest256[i+1] & 0xF0) >> 4)];
EncryptedText[j++] = Str_BIN_TO_BASE64URL [((digest256[i+1] & 0x0F) << 2) | ((digest256[i+2] & 0xC0) >> 6)];
EncryptedText[j++] = Str_BIN_TO_BASE64URL [ (digest256[i+2] & 0x3F) ];
EncryptedText[j++] = Str_BIN_TO_BASE64URL [((digest256[ i ] & 0x03) << 4) | ((digest256[i + 1] & 0xF0) >> 4)];
EncryptedText[j++] = Str_BIN_TO_BASE64URL [((digest256[i + 1] & 0x0F) << 2) | ((digest256[i + 2] & 0xC0) >> 6)];
EncryptedText[j++] = Str_BIN_TO_BASE64URL [ (digest256[i + 2] & 0x3F) ];
}
}
EncryptedText[Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64] = '\0';
@ -110,9 +111,11 @@ void Cry_EncryptSHA256Base64 (const char *PlainText,char EncryptedText[Cry_LENGT
/*****************************************************************************/
// Pointers to PlainText and EncryptedText can point to the same place
void Cry_EncryptSHA512Base64 (const char *PlainText,char EncryptedText[Cry_LENGTH_ENCRYPTED_STR_SHA512_BASE64+1])
void Cry_EncryptSHA512Base64 (const char *PlainText,
char EncryptedText[Cry_LENGTH_ENCRYPTED_STR_SHA512_BASE64 + 1])
{
int i,j;
int i;
int j;
unsigned char digest512[SHA512_DIGEST_SIZE];
/* Encrypt function */
@ -123,14 +126,14 @@ void Cry_EncryptSHA512Base64 (const char *PlainText,char EncryptedText[Cry_LENGT
i < BYTES_SHA512_ENCRYPTION;
i += 3) // 512 bits, 64 bytes
{
EncryptedText[j++] = Str_BIN_TO_BASE64URL [(digest512[ i ] & 0xFC) >> 2];
EncryptedText[j++] = Str_BIN_TO_BASE64URL [ (digest512[ i ] & 0xFC) >> 2];
if (i == (BYTES_SHA512_ENCRYPTION-1)) // i == 63, j == 85, last character to fill in encrypted text
EncryptedText[ j ] = Str_BIN_TO_BASE64URL [(digest512[ i ] & 0x03) << 4];
EncryptedText[ j ] = Str_BIN_TO_BASE64URL [ (digest512[ i ] & 0x03) << 4];
else
{
EncryptedText[j++] = Str_BIN_TO_BASE64URL [((digest512[ i ] & 0x03) << 4) | ((digest512[i+1] & 0xF0) >> 4)];
EncryptedText[j++] = Str_BIN_TO_BASE64URL [((digest512[i+1] & 0x0F) << 2) | ((digest512[i+2] & 0xC0) >> 6)];
EncryptedText[j++] = Str_BIN_TO_BASE64URL [ (digest512[i+2] & 0x3F) ];
EncryptedText[j++] = Str_BIN_TO_BASE64URL [((digest512[ i ] & 0x03) << 4) | ((digest512[i + 1] & 0xF0) >> 4)];
EncryptedText[j++] = Str_BIN_TO_BASE64URL [((digest512[i + 1] & 0x0F) << 2) | ((digest512[i + 2] & 0xC0) >> 6)];
EncryptedText[j++] = Str_BIN_TO_BASE64URL [ (digest512[i + 2] & 0x3F) ];
}
}
EncryptedText[Cry_LENGTH_ENCRYPTED_STR_SHA512_BASE64] = '\0';
@ -140,10 +143,10 @@ void Cry_EncryptSHA512Base64 (const char *PlainText,char EncryptedText[Cry_LENGT
/*** Create a unique name encrypted, different each time function is called **/
/*****************************************************************************/
void Cry_CreateUniqueNameEncrypted (char UniqueNameEncrypted[Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64+1])
void Cry_CreateUniqueNameEncrypted (char UniqueNameEncrypted[Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64 + 1])
{
static unsigned NumCall = 0; // When this function is called several times in the same execution of the program, each time a new name is created
char UniqueNamePlain[Cns_MAX_LENGTH_IP+1+10+1+10+1+10+1];
char UniqueNamePlain[Cns_MAX_LENGTH_IP + 1 + 10 + 1 + 10 + 1 + 10 + 1];
NumCall++;
sprintf (UniqueNamePlain,"%s-%lx-%x-%x",

8
swad_cryptography.h
View File

@ -42,9 +42,11 @@
/***************************** Public prototypes *****************************/
/*****************************************************************************/
void Cry_EncryptSHA256Base64 (const char *PlainText,char EncryptedText[Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64+1]);
void Cry_EncryptSHA512Base64 (const char *PlainText,char EncryptedText[Cry_LENGTH_ENCRYPTED_STR_SHA512_BASE64+1]);
void Cry_EncryptSHA256Base64 (const char *PlainText,
char EncryptedText[Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64 + 1]);
void Cry_EncryptSHA512Base64 (const char *PlainText,
char EncryptedText[Cry_LENGTH_ENCRYPTED_STR_SHA512_BASE64 + 1]);
void Cry_CreateUniqueNameEncrypted (char UniqueNameEncrypted[Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64+1]);
void Cry_CreateUniqueNameEncrypted (char UniqueNameEncrypted[Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64 + 1]);
#endif

2
swad_database.c
View File

@ -3003,7 +3003,7 @@ void DB_FreeMySQLResult (MYSQL_RES **mysql_res)
void DB_ExitOnMySQLError (const char *Message)
{
char BigErrorMsg[1024*1024];
char BigErrorMsg[1024 * 1024];
sprintf (BigErrorMsg,"Database error: %s (%s).",
Message,mysql_error (&Gbl.mysql));

20
swad_date.c
View File

@ -44,7 +44,7 @@ extern struct Globals Gbl;
/**************************** Private constants ******************************/
/*****************************************************************************/
const unsigned Dat_NumDaysMonth[1+12] =
const unsigned Dat_NumDaysMonth[1 + 12] =
{
0,
31, // 1: January
@ -519,10 +519,10 @@ void Dat_WriteFormClientLocalDateTimeFromTimeUTC (const char *Id,
time_t Dat_GetTimeUTCFromForm (const char *ParamName)
{
char LongStr[1+10+1];
char LongStr[1 + 10 + 1];
/**** Get time ****/
Par_GetParToText (ParamName,LongStr,1+10);
Par_GetParToText (ParamName,LongStr,1 + 10);
return Dat_GetUNIXTimeFromStr (LongStr);
}
@ -553,13 +553,13 @@ void Dat_PutHiddenParBrowserTZDiff (void)
// when a fixed amount (for example +01:00) is used as destination time zone,
// because this amount may be different before and after the DST change
void Dat_GetBrowserTimeZone (char BrowserTimeZone[Dat_MAX_BYTES_TIME_ZONE+1])
void Dat_GetBrowserTimeZone (char BrowserTimeZone[Dat_MAX_BYTES_TIME_ZONE + 1])
{
char Query[512];
MYSQL_RES *mysql_res;
MYSQL_ROW row;
bool TZNameIsUsable = false;
char IntStr[1+10+1];
char IntStr[1 + 10 + 1];
int ClientUTCMinusLocal; // Time difference between UTC time and client local time, in minutes
/***** 1. Get client time zone name *****/
@ -594,7 +594,7 @@ void Dat_GetBrowserTimeZone (char BrowserTimeZone[Dat_MAX_BYTES_TIME_ZONE+1])
// We get client TZ difference using JavaScript getTimezoneOffset() method
// getTimezoneOffset() returns UTC-time - browser-local-time, in minutes.
// For example, if browser time zone is GMT+2, -120 will be returned.
Par_GetParToText ("BrowserTZDiff",IntStr,1+10);
Par_GetParToText ("BrowserTZDiff",IntStr,1 + 10);
if (sscanf (IntStr,"%d",&ClientUTCMinusLocal) != 1)
ClientUTCMinusLocal = 0;
@ -726,7 +726,7 @@ void Dat_WriteFormDate (unsigned FirstYear,unsigned LastYear,
void Dat_GetDateFromForm (const char *ParamNameDay,const char *ParamNameMonth,const char *ParamNameYear,
unsigned *Day,unsigned *Month,unsigned *Year)
{
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
/**** Get day ****/
Par_GetParToText (ParamNameDay,UnsignedStr,10);
@ -1265,9 +1265,9 @@ void Dat_CalculateWeekOfYear (struct Date *Date)
(0) Monday | December, 30 of Year |
(1) Tuesday | December, 29 of Year |
(2) Wednesday | December, 28 of Year |
(3) Thursday | January, 3 of Year+1 |
(4) Friday | January, 4 of Year+1 |
(5) Saturday | January, 5 of Year+1 |
(3) Thursday | January, 3 of Year + 1 |
(4) Friday | January, 4 of Year + 1 |
(5) Saturday | January, 5 of Year + 1 |
(6) Sunday | December, 31 of Year |
*/
int DayThatFirstWeekStarts[7] = {1,0,-1,-2,4,3,2};

6
swad_date.h
View File

@ -35,7 +35,7 @@
/***************************** Public constants ******************************/
/*****************************************************************************/
#define Dat_SECONDS_IN_ONE_MONTH (30UL*24UL*60UL*60UL)
#define Dat_SECONDS_IN_ONE_MONTH (30UL * 24UL * 60UL * 60UL)
#define Dat_MAX_BYTES_TIME_ZONE 256
@ -67,7 +67,7 @@ struct DateTime
{
struct Date Date;
struct Time Time;
char YYYYMMDDHHMMSS[4+2+2+2+2+2+1];
char YYYYMMDDHHMMSS[4 + 2 + 2 + 2 + 2 + 2 + 1];
};
#define Dat_NUM_TIME_STATUS 3
@ -121,7 +121,7 @@ void Dat_WriteFormClientLocalDateTimeFromTimeUTC (const char *Id,
time_t Dat_GetTimeUTCFromForm (const char *ParamName);
void Dat_PutHiddenParBrowserTZDiff (void);
void Dat_GetBrowserTimeZone (char BrowserTimeZone[Dat_MAX_BYTES_TIME_ZONE+1]);
void Dat_GetBrowserTimeZone (char BrowserTimeZone[Dat_MAX_BYTES_TIME_ZONE + 1]);
void Dat_WriteFormDate (unsigned FirstYear,unsigned LastYear,
const char *Id,

26
swad_degree.c
View File

@ -108,7 +108,7 @@ static void Deg_GetDataOfDegreeFromRow (struct Degree *Deg,MYSQL_ROW row);
static void Deg_RenameDegree (struct Degree *Deg,Cns_ShrtOrFullName_t ShrtOrFullName);
static bool Deg_CheckIfDegNameExistsInCtr (const char *FieldName,const char *Name,long DegCod,long CtrCod);
static void Deg_UpdateDegCtrDB (long DegCod,long CtrCod);
static void Deg_UpdateDegWWWDB (long DegCod,const char NewWWW[Cns_MAX_LENGTH_WWW+1]);
static void Deg_UpdateDegWWWDB (long DegCod,const char NewWWW[Cns_MAX_LENGTH_WWW + 1]);
/*****************************************************************************/
/********** List pending institutions, centres, degrees and courses **********/
@ -296,7 +296,7 @@ static void Deg_Configuration (bool PrintView)
extern const char *Txt_Short_name;
extern const char *Txt_Web;
extern const char *Txt_Shortcut;
extern const char *Txt_STR_LANG_ID[1+Txt_NUM_LANGUAGES];
extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES];
extern const char *Txt_Courses;
extern const char *Txt_Courses_of_DEGREE_X;
extern const char *Txt_QR_code;
@ -1165,7 +1165,7 @@ unsigned Deg_ConvStrToYear (const char *StrYear)
static void Deg_CreateDegree (struct Degree *Deg,unsigned Status)
{
extern const char *Txt_Created_new_degree_X;
char Query[512+
char Query[512 +
Deg_MAX_LENGTH_DEGREE_SHRT_NAME +
Deg_MAX_LENGTH_DEGREE_FULL_NAME +
Cns_MAX_LENGTH_WWW];
@ -1660,10 +1660,10 @@ long Deg_GetAndCheckParamOtherDegCod (void)
static long Deg_GetParamOtherDegCod (void)
{
char LongStr[1+10+1];
char LongStr[1 + 10 + 1];
/***** Get parameter with code of degree *****/
Par_GetParToText ("OthDegCod",LongStr,1+10);
Par_GetParToText ("OthDegCod",LongStr,1 + 10);
return Str_ConvertStrCodToLongCod (LongStr);
}
@ -1854,7 +1854,7 @@ void Deg_RemoveDegreeCompletely (long DegCod)
MYSQL_ROW row;
unsigned long NumRow,NumRows;
long CrsCod;
char PathDeg[PATH_MAX+1];
char PathDeg[PATH_MAX + 1];
/***** Get courses of a degree from database *****/
sprintf (Query,"SELECT CrsCod FROM courses"
@ -1950,12 +1950,12 @@ static void Deg_RenameDegree (struct Degree *Deg,Cns_ShrtOrFullName_t ShrtOrFull
extern const char *Txt_The_degree_X_already_exists;
extern const char *Txt_The_name_of_the_degree_X_has_changed_to_Y;
extern const char *Txt_The_name_of_the_degree_X_has_not_changed;
char Query[512+Deg_MAX_LENGTH_DEGREE_FULL_NAME];
char Query[512 + Deg_MAX_LENGTH_DEGREE_FULL_NAME];
const char *ParamName = NULL; // Initialized to avoid warning
const char *FieldName = NULL; // Initialized to avoid warning
unsigned MaxLength = 0; // Initialized to avoid warning
char *CurrentDegName = NULL; // Initialized to avoid warning
char NewDegName[Deg_MAX_LENGTH_DEGREE_FULL_NAME+1];
char NewDegName[Deg_MAX_LENGTH_DEGREE_FULL_NAME + 1];
switch (ShrtOrFullName)
{
@ -2124,7 +2124,7 @@ void Deg_ChangeDegWWW (void)
extern const char *Txt_The_new_web_address_is_X;
extern const char *Txt_You_can_not_leave_the_web_address_empty;
struct Degree *Deg;
char NewWWW[Cns_MAX_LENGTH_WWW+1];
char NewWWW[Cns_MAX_LENGTH_WWW + 1];
Deg = &Gbl.Degs.EditingDeg;
@ -2164,7 +2164,7 @@ void Deg_ChangeDegWWWInConfig (void)
{
extern const char *Txt_The_new_web_address_is_X;
extern const char *Txt_You_can_not_leave_the_web_address_empty;
char NewWWW[Cns_MAX_LENGTH_WWW+1];
char NewWWW[Cns_MAX_LENGTH_WWW + 1];
/***** Get parameters from form *****/
/* Get the new WWW for the degree */
@ -2193,9 +2193,9 @@ void Deg_ChangeDegWWWInConfig (void)
/**************** Update database changing old WWW by new WWW ****************/
/*****************************************************************************/
static void Deg_UpdateDegWWWDB (long DegCod,const char NewWWW[Cns_MAX_LENGTH_WWW+1])
static void Deg_UpdateDegWWWDB (long DegCod,const char NewWWW[Cns_MAX_LENGTH_WWW + 1])
{
char Query[256+Cns_MAX_LENGTH_WWW];
char Query[256 + Cns_MAX_LENGTH_WWW];
/***** Update database changing old WWW by new WWW *****/
sprintf (Query,"UPDATE degrees SET WWW='%s' WHERE DegCod='%ld'",
@ -2212,7 +2212,7 @@ void Deg_ChangeDegStatus (void)
extern const char *Txt_The_status_of_the_degree_X_has_changed;
struct Degree *Deg;
char Query[256];
char UnsignedNum[10+1];
char UnsignedNum[10 + 1];
Deg_Status_t Status;
Deg_StatusTxt_t StatusTxt;

8
swad_degree_type.c
View File

@ -426,7 +426,7 @@ static void DT_PutHeadDegreeTypesForEdition (void)
static void DT_CreateDegreeType (struct DegreeType *DegTyp)
{
extern const char *Txt_Created_new_type_of_degree_X;
char Query[128+Deg_MAX_LENGTH_DEGREE_TYPE_NAME];
char Query[128 + Deg_MAX_LENGTH_DEGREE_TYPE_NAME];
/***** Create a new degree type *****/
sprintf (Query,"INSERT INTO deg_types SET DegTypName='%s'",
@ -598,10 +598,10 @@ static void DT_PutParamOtherDegTypCod (long DegTypCod)
long DT_GetParamOtherDegTypCod (void)
{
char LongStr[1+10+1];
char LongStr[1 + 10 + 1];
/***** Get parameter with code of degree type *****/
Par_GetParToText ("OthDegTypCod",LongStr,1+10);
Par_GetParToText ("OthDegTypCod",LongStr,1 + 10);
return Str_ConvertStrCodToLongCod (LongStr);
}
@ -728,7 +728,7 @@ void DT_RenameDegreeType (void)
extern const char *Txt_The_name_of_the_type_of_degree_X_has_not_changed;
struct DegreeType *DegTyp;
char Query[1024];
char NewNameDegTyp[Deg_MAX_LENGTH_DEGREE_TYPE_NAME+1];
char NewNameDegTyp[Deg_MAX_LENGTH_DEGREE_TYPE_NAME + 1];
DegTyp = &Gbl.Degs.EditingDegTyp;

10
swad_department.c
View File

@ -193,7 +193,7 @@ void Dpt_SeeDepts (void)
static void Dpt_GetParamDptOrderType (void)
{
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
unsigned UnsignedNum;
Par_GetParToText ("Order",UnsignedStr,10);
@ -616,10 +616,10 @@ static void Dpt_PutParamDptCod (long DptCod)
long Dpt_GetParamDptCod (void)
{
char LongStr[1+10+1];
char LongStr[1 + 10 + 1];
/***** Get parameter with code of department *****/
Par_GetParToText ("DptCod",LongStr,1+10);
Par_GetParToText ("DptCod",LongStr,1 + 10);
return Str_ConvertStrCodToLongCod (LongStr);
}
@ -826,8 +826,8 @@ void Dpt_ChangeDptWWW (void)
extern const char *Txt_The_new_web_address_is_X;
extern const char *Txt_You_can_not_leave_the_web_address_empty;
struct Department *Dpt;
char Query[256+Cns_MAX_LENGTH_WWW];
char NewWWW[Cns_MAX_LENGTH_WWW+1];
char Query[256 + Cns_MAX_LENGTH_WWW];
char NewWWW[Cns_MAX_LENGTH_WWW + 1];
Dpt = &Gbl.Dpts.EditingDpt;

14
swad_enrollment.c
View File

@ -421,7 +421,7 @@ void Enr_UpdateUsrData (struct UsrData *UsrDat)
extern const char *The_ThemeId[The_NUM_THEMES];
extern const char *Ico_IconSetId[Ico_NUM_ICON_SETS];
extern const char *Pri_VisibilityDB[Pri_NUM_OPTIONS_PRIVACY];
extern const char *Txt_STR_LANG_ID[1+Txt_NUM_LANGUAGES];
extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES];
extern const char *Usr_StringsSexDB[Usr_NUM_SEXS];
char BirthdayStrDB[Usr_BIRTHDAY_STR_DB_LENGTH + 1];
char Query[2048];
@ -711,7 +711,7 @@ void Enr_RemoveOldUsrs (void)
{
extern const char *Txt_Eliminating_X_users_who_were_not_enrolled_in_any_course_and_with_more_than_Y_months_without_access_to_Z;
extern const char *Txt_X_users_have_been_eliminated;
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
unsigned MonthsWithoutAccess;
time_t SecondsWithoutAccess;
char Query[1024];
@ -1246,7 +1246,7 @@ static void Enr_ReceiveFormUsrsCrs (Rol_Role_t Role)
extern const char *Txt_No_user_has_been_enrolled;
extern const char *Txt_One_user_has_been_enrolled;
extern const char *Txt_X_users_have_been_enrolled_including_possible_repetitions;
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
unsigned UnsignedNum;
struct
{
@ -1381,7 +1381,7 @@ static void Enr_ReceiveFormUsrsCrs (Rol_Role_t Role)
}
/***** Get list of users' IDs *****/
if ((ListUsrsIDs = (char *) malloc (ID_MAX_BYTES_LIST_USRS_IDS+1)) == NULL)
if ((ListUsrsIDs = (char *) malloc (ID_MAX_BYTES_LIST_USRS_IDS + 1)) == NULL)
Lay_ShowErrorAndExit ("Not enough memory to store users' IDs.");
Par_GetParToText ("UsrsIDs",ListUsrsIDs,ID_MAX_BYTES_LIST_USRS_IDS);
@ -1854,7 +1854,7 @@ void Enr_SignUpInCrs (void)
char Query[512];
MYSQL_RES *mysql_res;
MYSQL_ROW row;
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
Rol_Role_t RoleFromForm;
long ReqCod = -1L;
unsigned NumUsrsToBeNotifiedByEMail;
@ -2166,7 +2166,7 @@ static void Enr_ShowEnrollmentRequestsGivenRoles (unsigned RolesSelected)
bool UsrExists;
bool UsrBelongsToCrs;
bool ShowPhoto = false;
char PhotoURL[PATH_MAX+1];
char PhotoURL[PATH_MAX + 1];
Rol_Role_t DesiredRole;
/***** Remove expired enrollment requests *****/
@ -2749,7 +2749,7 @@ static void Enr_ShowEnrollmentRequestsGivenRoles (unsigned RolesSelected)
/***** User photo *****/
fprintf (Gbl.F.Out,"<td class=\"DAT CENTER_TOP\""
" style=\"width:22px;\">");
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (&UsrDat,PhotoURL);
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (&UsrDat,PhotoURL);
Pho_ShowUsrPhoto (&UsrDat,ShowPhoto ? PhotoURL :
NULL,
"PHOTO21x28",Pho_ZOOM,false);

32
swad_exam.c
View File

@ -116,7 +116,7 @@ void Exa_PutFrmEditAExamAnnouncement (void)
static long Exa_GetParamsExamAnnouncement (void)
{
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
long ExaCod;
/***** Get the code of the exam announcement *****/
@ -545,7 +545,7 @@ void Exa_GetDateToHighlight (void)
{
/***** Get the date (in YYYY-MM-DD format)
of the exam announcements to highlight *****/
Par_GetParToText ("Date",Gbl.ExamAnns.HighlightDate,4+1+2+1+2);
Par_GetParToText ("Date",Gbl.ExamAnns.HighlightDate,4 + 1 + 2 + 1 + 2);
}
/*****************************************************************************/
@ -750,7 +750,7 @@ static long Exa_AddExamAnnouncementToDB (void)
long ExaCod;
/***** Add exam announcement *****/
if ((Query = malloc (512+2*Cns_MAX_BYTES_STRING+7*Cns_MAX_BYTES_TEXT)) == NULL)
if ((Query = malloc (512 + 2 * Cns_MAX_BYTES_STRING + 7 * Cns_MAX_BYTES_TEXT)) == NULL)
Lay_ShowErrorAndExit ("Not enough memory to query database.");
sprintf (Query,"INSERT INTO exam_announcements "
"(CrsCod,Status,NumNotif,CrsFullName,Year,ExamSession,"
@ -794,7 +794,7 @@ static void Exa_ModifyExamAnnouncementInDB (void)
char *Query;
/***** Modify exam announcement *****/
if ((Query = malloc (512+2*Cns_MAX_BYTES_STRING+7*Cns_MAX_BYTES_TEXT)) == NULL)
if ((Query = malloc (512 + 2 * Cns_MAX_BYTES_STRING + 7 * Cns_MAX_BYTES_TEXT)) == NULL)
Lay_ShowErrorAndExit ("Not enough memory to query database.");
sprintf (Query,"UPDATE exam_announcements"
" SET CrsFullName='%s',Year='%u',ExamSession='%s',"
@ -1007,7 +1007,7 @@ static void Exa_ShowExamAnnouncement (Exa_TypeViewExamAnnouncement_t TypeViewExa
{
extern const char *Hlp_ASSESSMENT_Announcements_new_announcement;
extern const char *Hlp_ASSESSMENT_Announcements_edit_announcement;
extern const char *Txt_YEAR_OF_DEGREE[1+Deg_MAX_YEARS_PER_DEGREE];
extern const char *Txt_YEAR_OF_DEGREE[1 + Deg_MAX_YEARS_PER_DEGREE];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_EXAM_ANNOUNCEMENT;
extern const char *Txt_EXAM_ANNOUNCEMENT_Course;
@ -1033,7 +1033,7 @@ static void Exa_ShowExamAnnouncement (Exa_TypeViewExamAnnouncement_t TypeViewExa
const char *StyleForm = "CONV_NEG";
const char *StyleNormal = "CONV";
struct Instit Ins;
char StrExamDate[Cns_MAX_LENGTH_DATE+1];
char StrExamDate[Cns_MAX_LENGTH_DATE + 1];
unsigned Year,Hour,Minute;
const char *ClassExaAnnouncement[Exa_NUM_VIEWS][Exa_NUM_STATUS] =
{
@ -1611,22 +1611,18 @@ void Exa_PutHiddenParamExaCod (long ExaCod)
static long Exa_GetParamExaCod (void)
{
char LongStr[1+10+1]; // String that holds the exam announcement code
long ExaCod;
char LongStr[1 + 10 + 1]; // String that holds the exam announcement code
/* Get notice code */
Par_GetParToText ("ExaCod",LongStr,1+10);
if (sscanf (LongStr,"%ld",&ExaCod) != 1)
ExaCod = -1L;
return ExaCod;
Par_GetParToText ("ExaCod",LongStr,1 + 10);
return Str_ConvertStrCodToLongCod (LongStr);
}
/*****************************************************************************/
/************ Get summary and content about an exam announcement *************/
/*****************************************************************************/
// This function may be called inside a web service, so don't report error
// MaxChars must be > 3+(2+Cns_MAX_LENGTH_DATE+6)
// MaxChars must be > 3 + (2 + Cns_MAX_LENGTH_DATE + 6)
void Exa_GetSummaryAndContentExamAnnouncement (char SummaryStr[Cns_MAX_BYTES_TEXT + 1],
char **ContentStr,
@ -1652,7 +1648,7 @@ void Exa_GetSummaryAndContentExamAnnouncement (char SummaryStr[Cns_MAX_BYTES_TEX
/* Name of the course */
if (MaxChars)
Str_LimitLengthHTMLStr (Gbl.ExamAnns.ExaDat.CrsFullName,
MaxChars-(2+Cns_MAX_LENGTH_DATE+6));
MaxChars - (2 + Cns_MAX_LENGTH_DATE + 6));
/* Date of exam */
sprintf (SummaryStr,"%s, %04u-%02u-%02u %2u:%02u",
@ -1675,7 +1671,7 @@ static void Exa_GetNotifContentExamAnnouncement (char **ContentStr)
{
extern const char *Txt_Institution;
extern const char *Txt_Degree;
extern const char *Txt_YEAR_OF_DEGREE[1+Deg_MAX_YEARS_PER_DEGREE];
extern const char *Txt_YEAR_OF_DEGREE[1 + Deg_MAX_YEARS_PER_DEGREE];
extern const char *Txt_EXAM_ANNOUNCEMENT_Course;
extern const char *Txt_EXAM_ANNOUNCEMENT_Year_or_semester;
extern const char *Txt_EXAM_ANNOUNCEMENT_Session;
@ -1693,9 +1689,9 @@ static void Exa_GetNotifContentExamAnnouncement (char **ContentStr)
struct Course Crs;
struct Degree Deg;
struct Instit Ins;
char StrExamDate[Cns_MAX_LENGTH_DATE+1];
char StrExamDate[Cns_MAX_LENGTH_DATE + 1];
if ((*ContentStr = (char *) malloc (Cns_MAX_BYTES_TEXT*8)) == NULL)
if ((*ContentStr = (char *) malloc (Cns_MAX_BYTES_TEXT * 8)) == NULL)
Lay_ShowErrorAndExit ("Error allocating memory for notification content.");
(*ContentStr)[0] = '\0'; // Return nothing on error

8
swad_file.c
View File

@ -72,7 +72,7 @@ extern struct Globals Gbl;
void Fil_CreateFileForHTMLOutput (void)
{
char PathHTMLOutputPriv[PATH_MAX+1];
char PathHTMLOutputPriv[PATH_MAX + 1];
/***** Check if exists the directory for HTML output. If not exists, create it *****/
sprintf (PathHTMLOutputPriv,"%s/%s",Cfg_PATH_SWAD_PRIVATE,Cfg_FOLDER_OUT);
@ -130,7 +130,7 @@ bool Fil_ReadStdinIntoTmpFile (void)
TmpFileSize++)
if (TmpFileSize < Fil_MAX_FILE_SIZE)
{
if (!(TmpFileSize % (64ULL*1024ULL))) // Check timeout from time to time
if (!(TmpFileSize % (64ULL * 1024ULL))) // Check timeout from time to time
if (time (NULL) - Gbl.StartExecutionTimeUTC >= Cfg_TIME_TO_ABORT_FILE_UPLOAD)
TimeExceeded = true;
fputc (fgetc (stdin),Gbl.F.Tmp);
@ -441,7 +441,7 @@ void Fil_RemoveTree (const char *Path)
struct stat FileStatus;
struct dirent **FileList;
int NumFile,NumFiles;
char PathFileRel[PATH_MAX+1];
char PathFileRel[PATH_MAX + 1];
bool Error;
if (Fil_CheckIfPathExists (Path))
@ -505,7 +505,7 @@ void Fil_RemoveOldTmpFiles (const char *Path,time_t TimeToRemove,bool RemoveDire
struct dirent **FileList;
int NumFile;
int NumFiles;
char Path2[PATH_MAX+1];
char Path2[PATH_MAX + 1];
struct stat FileStatus;
if (lstat (Path,&FileStatus)) // On success ==> 0 is returned

2
swad_file.h
View File

@ -42,7 +42,7 @@
// Maximum allowed size (in bytes) of a file when uploading it.
// Must be < 2 GiB, because off_t type is of type long int
#define Fil_MAX_FILE_SIZE (1536ULL*1024ULL*1024ULL) // 1.5 GiB
#define Fil_MAX_FILE_SIZE (1536ULL * 1024ULL * 1024ULL) // 1.5 GiB
// Global files
struct Files

162
swad_file_browser.c
View File

@ -1042,7 +1042,7 @@ static const Act_Action_t Brw_ActRecDatFile[Brw_NUM_TYPES_FILE_BROWSER] =
};
/* All quotas must be multiple of 1 GiB (Gibibyte)*/
#define Brw_GiB (1024ULL*1024ULL*1024ULL)
#define Brw_GiB (1024ULL * 1024ULL * 1024ULL)
/* Maximum quotas for each type of file browser */
#define Brw_MAX_QUOTA_DOCUM_INS (64ULL*Brw_GiB)
@ -2296,11 +2296,11 @@ void Brw_GetParAndInitFileBrowser (void)
static long Brw_GetGrpSettings (void)
{
char LongStr[1+10+1];
char LongStr[1 + 10 + 1];
long GrpCod;
/***** Get parameter with group code *****/
if (Par_GetParToText ("GrpCod",LongStr,1+10))
if (Par_GetParToText ("GrpCod",LongStr,1 + 10))
{
if ((GrpCod = Str_ConvertStrCodToLongCod (LongStr)) <= 0)
GrpCod = -1L;
@ -2413,10 +2413,10 @@ void Brw_PutHiddenParamFilCod (long FilCod)
long Brw_GetParamFilCod (void)
{
char LongStr[1+10+1];
char LongStr[1 + 10 + 1];
/***** Get parameter with code of file *****/
Par_GetParToText ("FilCod",LongStr,1+10);
Par_GetParToText ("FilCod",LongStr,1 + 10);
return Str_ConvertStrCodToLongCod (LongStr);
}
@ -2546,7 +2546,7 @@ void Brw_InitializeFileBrowser (void)
static void Brw_SetPathFileBrowser (void)
{
char Path[PATH_MAX+1];
char Path[PATH_MAX + 1];
/***** Reset paths. An empty path means that
we don't have to create that directory *****/
@ -2698,7 +2698,7 @@ bool Brw_CheckIfExistsFolderAssigmentForAnyUsr (const char *FolderName)
unsigned NumUsrs;
unsigned NumUsr;
long UsrCod;
char PathFolder[PATH_MAX+1];
char PathFolder[PATH_MAX + 1];
bool FolderExists = false;
/***** Get all the users belonging to current course from database *****/
@ -2746,7 +2746,7 @@ static void Brw_CreateFoldersAssignmentsIfNotExist (long ZoneUsrCod)
MYSQL_RES *mysql_res;
MYSQL_ROW row;
unsigned long NumRows,NumRow;
char PathFolderAsg[PATH_MAX+1];
char PathFolderAsg[PATH_MAX + 1];
/***** Get assignment folders from database *****/
// Old behaviour (only create assignment folder if assignment is open) is obsolete since 2015-11-10
@ -2792,10 +2792,10 @@ bool Brw_UpdateFoldersAssigmentsIfExistForAllUsrs (const char *OldFolderName,con
unsigned NumUsrs;
unsigned NumUsr;
long UsrCod;
char OldPath[PATH_MAX+1];
char NewPath[PATH_MAX+1];
char PathOldFolder[PATH_MAX+1];
char PathNewFolder[PATH_MAX+1];
char OldPath[PATH_MAX + 1];
char NewPath[PATH_MAX + 1];
char PathOldFolder[PATH_MAX + 1];
char PathNewFolder[PATH_MAX + 1];
bool RenamingIsPossible = true;
unsigned NumUsrsError = 0;
unsigned NumUsrsSuccess = 0;
@ -2913,7 +2913,7 @@ void Brw_RemoveFoldersAssignmentsIfExistForAllUsrs (const char *FolderName)
unsigned NumUsrs;
unsigned NumUsr;
long UsrCod;
char PathFolder[PATH_MAX+1];
char PathFolder[PATH_MAX + 1];
/***** Get all the users belonging to current course from database *****/
sprintf (Query,"SELECT UsrCod FROM crs_usr WHERE CrsCod='%ld'",
@ -3391,11 +3391,11 @@ static void Brw_ShowDataOwnerAsgWrk (struct UsrData *UsrDat)
{
extern const char *Txt_View_record_for_this_course;
bool ShowPhoto;
char PhotoURL[PATH_MAX+1];
char PhotoURL[PATH_MAX + 1];
/***** Show user's photo *****/
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\" style=\"width:64px;\">");
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (UsrDat,PhotoURL);
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (UsrDat,PhotoURL);
Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL :
NULL,
"PHOTO60x80",Pho_ZOOM,false);
@ -4705,7 +4705,7 @@ void Brw_PutHiddenParamFullTreeIfSelected (void)
static bool Brw_GetFullTreeFromForm (void)
{
char YN[1+1];
char YN[1 + 1];
Par_GetParToText ("FullTree",YN,1);
return (Str_ConvertToUpperLetter (YN[0]) == 'Y');
@ -4780,8 +4780,8 @@ void Brw_CreateDirDownloadTmp (void)
{
static unsigned NumDir = 0; // When this function is called several times in the same execution of the program, each time a new directory is created
// This happens when the trees of assignments and works of several users are being listed
char PathFileBrowserTmpPubl[PATH_MAX+1];
char PathPubDirTmp[PATH_MAX+1];
char PathFileBrowserTmpPubl[PATH_MAX + 1];
char PathPubDirTmp[PATH_MAX + 1];
/* Example: /var/www/html/swad/tmp/SSujCNWsy4ZOdmgMKYBe0sKPAJu6szaZOQlIlJs_QIY */
@ -4980,7 +4980,7 @@ static void Brw_CalcSizeOfDirRecursive (unsigned Level,char *Path)
struct dirent **FileList;
int NumFile;
int NumFiles;
char PathFileRel[PATH_MAX+1];
char PathFileRel[PATH_MAX + 1];
struct stat FileStatus;
/***** Scan the directory *****/
@ -5036,8 +5036,8 @@ static void Brw_ListDir (unsigned Level,
int NumFiles;
int NumFileInSubdir;
int NumFilesInSubdir;
char PathFileRel[PATH_MAX+1];
char PathFileInExplTree[PATH_MAX+1];
char PathFileRel[PATH_MAX + 1];
char PathFileInExplTree[PATH_MAX + 1];
struct stat FileStatus;
Brw_ExpandTree_t ExpandTree = Brw_EXPAND_TREE_NOTHING; // Initialized to avoid warning
@ -5125,7 +5125,7 @@ static bool Brw_WriteRowFileBrowser (unsigned Level,Brw_ExpandTree_t ExpandTree,
bool LightStyle = false;
bool IsRecent = false;
struct FileMetadata FileMetadata;
char FileNameToShow[NAME_MAX+1];
char FileNameToShow[NAME_MAX + 1];
bool SeeDocsZone = Gbl.FileBrowser.Type == Brw_SHOW_DOCUM_INS ||
Gbl.FileBrowser.Type == Brw_SHOW_DOCUM_CTR ||
Gbl.FileBrowser.Type == Brw_SHOW_DOCUM_DEG ||
@ -5194,7 +5194,7 @@ static bool Brw_WriteRowFileBrowser (unsigned Level,Brw_ExpandTree_t ExpandTree,
/***** Check if is a recent file or folder *****/
// If less than a week since last modify ==> indicate the file is recent by writting its name in green
if (Gbl.StartExecutionTimeUTC < FileMetadata.Time + (7L*24L*60L*60L))
if (Gbl.StartExecutionTimeUTC < FileMetadata.Time + (7L * 24L * 60L * 60L))
IsRecent = true;
/* Style of the text in this row */
@ -5408,7 +5408,7 @@ static void Brw_PutIconsRemoveCopyPaste (unsigned Level,
static bool Brw_CheckIfCanPasteIn (unsigned Level)
{
char PathDstWithFile[PATH_MAX+1];
char PathDstWithFile[PATH_MAX + 1];
/***** If not in a folder... *****/
if (Gbl.FileBrowser.FileType != Brw_IS_FOLDER)
@ -6019,7 +6019,7 @@ static void Brw_LimitLengthFileNameToShow (Brw_FileType_t FileType,
void Brw_CreateTmpPublicLinkToPrivateFile (const char *FullPathIncludingFile,
const char *FileName)
{
char Link[PATH_MAX+1];
char Link[PATH_MAX + 1];
/***** Create, into temporary public directory, a symbolic link to file *****/
sprintf (Link,"%s/%s/%s/%s",
@ -6136,7 +6136,7 @@ static void Brw_WriteFileOrFolderPublisher (unsigned Level,unsigned long UsrCod)
extern const char *Txt_Unknown_or_without_photo;
bool ShowUsr = false;
bool ShowPhoto;
char PhotoURL[PATH_MAX+1];
char PhotoURL[PATH_MAX + 1];
struct UsrData UsrDat;
if (Level && UsrCod > 0)
@ -6153,7 +6153,7 @@ static void Brw_WriteFileOrFolderPublisher (unsigned Level,unsigned long UsrCod)
if (ShowUsr)
{
/***** Show photo *****/
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (&UsrDat,PhotoURL);
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (&UsrDat,PhotoURL);
Pho_ShowUsrPhoto (&UsrDat,ShowPhoto ? PhotoURL :
NULL,
"PHOTO15x20B",Pho_ZOOM,false);
@ -6183,7 +6183,7 @@ void Brw_AskRemFileFromTree (void)
extern const char *Txt_Remove_file;
extern const char *Txt_Remove_link;
extern const char *Txt_You_can_not_remove_this_file_or_link;
char FileNameToShow[NAME_MAX+1];
char FileNameToShow[NAME_MAX + 1];
/***** Get parameters related to file browser *****/
Brw_GetParAndInitFileBrowser ();
@ -6226,7 +6226,7 @@ void Brw_RemFileFromTree (void)
{
extern const char *Txt_FILE_X_removed;
extern const char *Txt_You_can_not_remove_this_file_or_link;
char Path[PATH_MAX+1];
char Path[PATH_MAX + 1];
struct stat FileStatus;
char FileNameToShow[NAME_MAX + 1];
@ -6278,7 +6278,7 @@ void Brw_RemFolderFromTree (void)
{
extern const char *Txt_Folder_X_removed;
extern const char *Txt_You_can_not_remove_this_folder;
char Path[PATH_MAX+1];
char Path[PATH_MAX + 1];
struct stat FileStatus;
/***** Get parameters related to file browser *****/
@ -6354,7 +6354,7 @@ static void Brw_AskConfirmRemoveFolderNotEmpty (void)
void Brw_RemSubtreeInFileBrowser (void)
{
extern const char *Txt_Folder_X_and_all_its_contents_removed;
char Path[PATH_MAX+1];
char Path[PATH_MAX + 1];
/***** Get parameters related to file browser *****/
Brw_GetParAndInitFileBrowser ();
@ -6473,7 +6473,7 @@ static void Brw_WriteCurrentClipboard (void)
struct GroupData GrpDat;
struct UsrData UsrDat;
char TxtClipboardZone[1024];
char FileNameToShow[NAME_MAX+1];
char FileNameToShow[NAME_MAX + 1];
const char *TxtFileType[Brw_NUM_FILE_TYPES] =
{
Txt_file_folder, // Brw_IS_UNKNOWN
@ -6804,7 +6804,7 @@ static void Brw_AddPathToClipboards (void)
{
long Cod = Brw_GetCodForClipboard ();
long WorksUsrCod = Brw_GetWorksUsrCodForClipboard ();
char Query[512+PATH_MAX];
char Query[512 + PATH_MAX];
/***** Add path to clipboards *****/
sprintf (Query,"INSERT INTO clipboard (UsrCod,FileBrowser,"
@ -6827,7 +6827,7 @@ static void Brw_UpdatePathInClipboard (void)
{
long Cod = Brw_GetCodForClipboard ();
long WorksUsrCod = Brw_GetWorksUsrCodForClipboard ();
char Query[512+PATH_MAX];
char Query[512 + PATH_MAX];
/***** Update path in my clipboard *****/
sprintf (Query,"UPDATE clipboard SET FileBrowser='%u',"
@ -6956,7 +6956,7 @@ static void Brw_InsertFolderInExpandedFolders (const char Path[PATH_MAX + 1])
{
long Cod = Brw_GetCodForExpandedFolders ();
long WorksUsrCod = Brw_GetWorksUsrCodForExpandedFolders ();
char Query[512+PATH_MAX];
char Query[512 + PATH_MAX];
/***** Update path time in table of expanded folders *****/
// Path must be stored with final '/'
@ -7016,7 +7016,7 @@ static void Brw_RemoveFolderFromExpandedFolders (const char Path[PATH_MAX + 1])
{
long Cod = Brw_GetCodForExpandedFolders ();
long WorksUsrCod = Brw_GetWorksUsrCodForExpandedFolders ();
char Query[512+PATH_MAX];
char Query[512 + PATH_MAX];
Brw_FileBrowser_t FileBrowserForExpandedFolders = Brw_FileBrowserForDB_expanded_folders[Gbl.FileBrowser.Type];
/***** Remove expanded folders associated to a file browser *****/
@ -7053,7 +7053,7 @@ static void Brw_RemoveAffectedExpandedFolders (const char Path[PATH_MAX + 1])
{
long Cod = Brw_GetCodForExpandedFolders ();
long WorksUsrCod = Brw_GetWorksUsrCodForExpandedFolders ();
char Query[512+PATH_MAX];
char Query[512 + PATH_MAX];
Brw_FileBrowser_t FileBrowserForExpandedFolders = Brw_FileBrowserForDB_expanded_folders[Gbl.FileBrowser.Type];
/***** Remove expanded folders associated to a file browser from a course or from a user *****/
@ -7091,7 +7091,7 @@ static void Brw_RenameAffectedExpandedFolders (Brw_FileBrowser_t FileBrowser,
const char *OldPath,const char *NewPath)
{
long Cod = Brw_GetCodForExpandedFolders ();
char Query[512+PATH_MAX*2];
char Query[512 + PATH_MAX * 2];
Brw_FileBrowser_t FileBrowserForExpandedFolders = Brw_FileBrowserForDB_expanded_folders[FileBrowser];
unsigned StartFinalSubpathNotChanged = strlen (OldPath) + 2;
@ -7158,7 +7158,7 @@ static bool Brw_GetIfExpandedTree (const char Path[PATH_MAX + 1])
{
long Cod = Brw_GetCodForExpandedFolders ();
long WorksUsrCod = Brw_GetWorksUsrCodForExpandedFolders ();
char Query[512+PATH_MAX];
char Query[512 + PATH_MAX];
Brw_FileBrowser_t FileBrowserForExpandedFolders = Brw_FileBrowserForDB_expanded_folders[Gbl.FileBrowser.Type];
/***** Get if a folder is expanded from database *****/
@ -7429,7 +7429,7 @@ static void Brw_PasteClipboard (void)
struct Degree Deg;
struct Course Crs;
struct GroupData GrpDat;
char PathOrg[PATH_MAX+1];
char PathOrg[PATH_MAX + 1];
struct Brw_NumObjects Pasted;
long FirstFilCod = -1L; // First file code of the first file or link pasted. Important: initialize here to -1L
struct FileMetadata FileMetadata;
@ -7863,7 +7863,7 @@ static bool Brw_PasteTreeIntoFolder (unsigned LevelOrg,
void Brw_ShowFormFileBrowser (void)
{
extern const char *Txt_You_can_not_create_folders_files_or_links_here;
char FileNameToShow[NAME_MAX+1];
char FileNameToShow[NAME_MAX + 1];
/***** Get parameters related to file browser *****/
Brw_GetParAndInitFileBrowser ();
@ -7958,7 +7958,7 @@ static void Brw_PutFormToUploadFilesUsingDropzone (const char *FileNameToShow)
extern const char *Txt_Upload_files;
extern const char *Txt_or_you_can_upload_new_files_to_the_folder_X;
extern const char *Txt_Select_one_or_more_files_from_your_computer_or_drag_and_drop_here;
extern const char *Txt_STR_LANG_ID[1+Txt_NUM_LANGUAGES];
extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES];
extern const char *Txt_Done;
/***** Start frame *****/
@ -8160,8 +8160,8 @@ void Brw_RecFolderFileBrowser (void)
extern const char *Txt_The_folder_X_has_been_created_inside_the_folder_Y;
extern const char *Txt_You_can_not_create_folders_here;
char Path[PATH_MAX + 1];
char PathCompleteInTreeIncludingFolder[PATH_MAX+1];
char FileNameToShow[NAME_MAX+1];
char PathCompleteInTreeIncludingFolder[PATH_MAX + 1];
char FileNameToShow[NAME_MAX + 1];
/***** Get parameters related to file browser *****/
Brw_GetParAndInitFileBrowser ();
@ -8254,10 +8254,10 @@ void Brw_RenFolderFileBrowser (void)
extern const char *Txt_The_folder_name_X_has_not_changed;
extern const char *Txt_The_folder_name_X_has_not_changed_because_there_is_already_a_folder_or_a_file_with_the_name_Y;
extern const char *Txt_You_can_not_rename_this_folder;
char OldPathInTree[PATH_MAX+1];
char NewPathInTree[PATH_MAX+1];
char OldPath[PATH_MAX+1];
char NewPath[PATH_MAX+1];
char OldPathInTree[PATH_MAX + 1];
char NewPathInTree[PATH_MAX + 1];
char OldPath[PATH_MAX + 1];
char NewPath[PATH_MAX + 1];
/***** Get parameters related to file browser *****/
Brw_GetParAndInitFileBrowser ();
@ -8273,8 +8273,8 @@ void Brw_RenFolderFileBrowser (void)
sprintf (OldPath,"%s/%s",Gbl.FileBrowser.Priv.PathAboveRootFolder,OldPathInTree);
/* Gbl.FileBrowser.NewFilFolLnkName holds the new name of the folder */
if (strlen (Gbl.FileBrowser.Priv.PathAboveRootFolder)+1+
strlen (Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk)+1+
if (strlen (Gbl.FileBrowser.Priv.PathAboveRootFolder) + 1 +
strlen (Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk) + 1 +
strlen (Gbl.FileBrowser.NewFilFolLnkName) > PATH_MAX)
Lay_ShowErrorAndExit ("Path is too long.");
sprintf (NewPathInTree,"%s/%s",Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk,Gbl.FileBrowser.NewFilFolLnkName);
@ -8409,8 +8409,8 @@ static bool Brw_RcvFileInFileBrw (Brw_UploadType_t UploadType)
struct Param *Param;
char SrcFileName[PATH_MAX + 1];
char PathUntilFileName[PATH_MAX + 1];
char Path[PATH_MAX+1];
char PathTmp[PATH_MAX+1];
char Path[PATH_MAX + 1];
char PathTmp[PATH_MAX + 1];
char PathCompleteInTreeIncludingFile[PATH_MAX + 1];
char MIMEType[Brw_MAX_BYTES_MIME_TYPE + 1];
bool AdminMarks;
@ -8837,7 +8837,7 @@ static bool Brw_CheckIfUploadIsAllowed (const char *MIMEType)
void Brw_SetDocumentAsVisible (void)
{
extern const char *Txt_FILE_FOLDER_OR_LINK_X_is_now_visible;
char FileNameToShow[NAME_MAX+1];
char FileNameToShow[NAME_MAX + 1];
/***** Get parameters related to file browser *****/
Brw_GetParAndInitFileBrowser ();
@ -8869,7 +8869,7 @@ void Brw_SetDocumentAsVisible (void)
void Brw_SetDocumentAsHidden (void)
{
extern const char *Txt_FILE_FOLDER_OR_LINK_X_is_now_hidden;
char FileNameToShow[NAME_MAX+1];
char FileNameToShow[NAME_MAX + 1];
/***** Get parameters related to file browser *****/
Brw_GetParAndInitFileBrowser ();
@ -8902,7 +8902,7 @@ bool Brw_CheckIfFileOrFolderIsSetAsHiddenInDB (Brw_FileType_t FileType,const cha
{
long Cod = Brw_GetCodForFiles ();
long ZoneUsrCod = Brw_GetZoneUsrCodForFiles ();
char Query[512+PATH_MAX];
char Query[512 + PATH_MAX];
MYSQL_RES *mysql_res;
MYSQL_ROW row;
bool IsHidden = false;
@ -8938,7 +8938,7 @@ bool Brw_CheckIfFileOrFolderIsSetAsHiddenInDB (Brw_FileType_t FileType,const cha
bool Brw_CheckIfFileOrFolderIsHidden (struct FileMetadata *FileMetadata)
{
char Query[512+PATH_MAX*2];
char Query[512 + PATH_MAX * 2];
/***** Get if a file or folder is under a hidden folder from database *****/
/*
@ -8988,7 +8988,7 @@ void Brw_ShowFileMetadata (void)
struct FileMetadata FileMetadata;
struct UsrData PublisherUsrDat;
char FileNameToShow[NAME_MAX + 1];
char URL[PATH_MAX+1];
char URL[PATH_MAX + 1];
char FileSizeStr[Fil_MAX_BYTES_FILE_SIZE_STRING + 1];
bool Found;
bool ICanView = false;
@ -9141,7 +9141,7 @@ void Brw_ShowFileMetadata (void)
if (FileHasPublisher)
{
/* Show photo */
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (&PublisherUsrDat,PhotoURL);
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (&PublisherUsrDat,PhotoURL);
Pho_ShowUsrPhoto (&PublisherUsrDat,ShowPhoto ? PhotoURL :
NULL,
"PHOTO15x20",Pho_ZOOM,false);
@ -9385,7 +9385,7 @@ void Brw_DownloadFile (void)
{
extern const char *Txt_The_file_of_folder_no_longer_exists_or_is_now_hidden;
struct FileMetadata FileMetadata;
char URL[PATH_MAX+1];
char URL[PATH_MAX + 1];
bool Found;
bool ICanView = false;
@ -9697,9 +9697,9 @@ static void Brw_WriteSmallLinkToDownloadFile (const char *URL,Brw_FileType_t Fil
void Brw_GetLinkToDownloadFile (const char *PathInTree,const char *FileName,char *URL)
{
char FullPathIncludingFile[PATH_MAX+1];
char FullPathIncludingFile[PATH_MAX + 1];
FILE *FileURL;
char URLWithSpaces[PATH_MAX+1];
char URLWithSpaces[PATH_MAX + 1];
/***** Construct absolute path to file in the private directory *****/
sprintf (FullPathIncludingFile,"%s/%s/%s",
@ -9867,7 +9867,7 @@ void Brw_ChgFileMetadata (void)
static bool Brw_GetParamPublicFile (void)
{
char YN[1+1];
char YN[1 + 1];
Par_GetParToText ("PublicFile",YN,1);
return (Str_ConvertToUpperLetter (YN[0]) == 'Y');
@ -9879,7 +9879,7 @@ static bool Brw_GetParamPublicFile (void)
static Brw_License_t Brw_GetParLicense (void)
{
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
unsigned UnsignedNum;
/* Get file license from form */
@ -9904,7 +9904,7 @@ long Brw_GetFilCodByPath (const char *Path,bool OnlyIfPublic)
{
long Cod = Brw_GetCodForFiles ();
long ZoneUsrCod = Brw_GetZoneUsrCodForFiles ();
char Query[256+PATH_MAX];
char Query[256 + PATH_MAX];
MYSQL_RES *mysql_res;
MYSQL_ROW row;
long FilCod;
@ -9945,7 +9945,7 @@ void Brw_GetFileMetadataByPath (struct FileMetadata *FileMetadata)
{
long Cod = Brw_GetCodForFiles ();
long ZoneUsrCod = Brw_GetZoneUsrCodForFiles ();
char Query[512+PATH_MAX];
char Query[512 + PATH_MAX];
MYSQL_RES *mysql_res;
MYSQL_ROW row;
unsigned UnsignedNum;
@ -10206,7 +10206,7 @@ void Brw_GetFileMetadataByCod (struct FileMetadata *FileMetadata)
bool Brw_GetFileTypeSizeAndDate (struct FileMetadata *FileMetadata)
{
char Path[PATH_MAX+1];
char Path[PATH_MAX + 1];
struct stat FileStatus;
sprintf (Path,"%s/%s",Gbl.FileBrowser.Priv.PathAboveRootFolder,
@ -10470,7 +10470,7 @@ static bool Brw_GetIfFolderHasPublicFiles (const char Path[PATH_MAX + 1])
{
long Cod = Brw_GetCodForFiles ();
long ZoneUsrCod = Brw_GetZoneUsrCodForFiles ();
char Query[512+PATH_MAX];
char Query[512 + PATH_MAX];
/***** Get if a file or folder is public from database *****/
sprintf (Query,"SELECT COUNT(*) FROM files"
@ -10525,7 +10525,7 @@ static void Brw_ChangeFileOrFolderHiddenInDB (const char Path[PATH_MAX + 1],bool
{
long Cod = Brw_GetCodForFiles ();
long ZoneUsrCod = Brw_GetZoneUsrCodForFiles ();
char Query[512+PATH_MAX];
char Query[512 + PATH_MAX];
/***** Mark file as hidden in database *****/
sprintf (Query,"UPDATE files SET Hidden='%c'"
@ -10548,7 +10548,7 @@ static void Brw_ChangeFilePublicInDB (long PublisherUsrCod,const char *Path,
{
long Cod = Brw_GetCodForFiles ();
long ZoneUsrCod = Brw_GetZoneUsrCodForFiles ();
char Query[512+PATH_MAX];
char Query[512 + PATH_MAX];
/***** Change publisher, public and license of file in database *****/
sprintf (Query,"UPDATE files SET PublisherUsrCod='%ld',Public='%c',License='%u'"
@ -10709,7 +10709,7 @@ long Brw_AddPathToDB (long PublisherUsrCod,Brw_FileType_t FileType,
{
long Cod = Brw_GetCodForFiles ();
long ZoneUsrCod = Brw_GetZoneUsrCodForFiles ();
char Query[512+PATH_MAX];
char Query[512 + PATH_MAX];
/***** Add path to the database *****/
sprintf (Query,"INSERT INTO files (FileBrowser,Cod,ZoneUsrCod,"
@ -10735,7 +10735,7 @@ static void Brw_RemoveOneFileOrFolderFromDB (const char Path[PATH_MAX + 1])
{
long Cod = Brw_GetCodForFiles ();
long ZoneUsrCod = Brw_GetZoneUsrCodForFiles ();
char Query[512+PATH_MAX];
char Query[512 + PATH_MAX];
Brw_FileBrowser_t FileBrowser = Brw_FileBrowserForDB_files[Gbl.FileBrowser.Type];
/***** Set possible notifications as removed.
@ -10780,7 +10780,7 @@ static void Brw_RemoveChildrenOfFolderFromDB (const char Path[PATH_MAX + 1])
{
long Cod = Brw_GetCodForFiles ();
long ZoneUsrCod = Brw_GetZoneUsrCodForFiles ();
char Query[512+PATH_MAX];
char Query[512 + PATH_MAX];
Brw_FileBrowser_t FileBrowser = Brw_FileBrowserForDB_files[Gbl.FileBrowser.Type];
/***** Set possible notifications as removed.
@ -10826,7 +10826,7 @@ static void Brw_RenameOneFolderInDB (const char OldPath[PATH_MAX + 1],
{
long Cod = Brw_GetCodForFiles ();
long ZoneUsrCod = Brw_GetZoneUsrCodForFiles ();
char Query[512+PATH_MAX*2];
char Query[512 + PATH_MAX * 2];
/***** Update file or folder in table of common files *****/
sprintf (Query,"UPDATE files SET Path='%s'"
@ -10847,7 +10847,7 @@ static void Brw_RenameChildrenFilesOrFoldersInDB (const char OldPath[PATH_MAX +
{
long Cod = Brw_GetCodForFiles ();
long ZoneUsrCod = Brw_GetZoneUsrCodForFiles ();
char Query[512+PATH_MAX*2];
char Query[512 + PATH_MAX * 2];
unsigned StartFinalSubpathNotChanged = strlen (OldPath) + 2;
/***** Update children of a folder in table of files *****/
@ -10968,7 +10968,7 @@ static bool Brw_CheckIfICanCreateIntoFolder (unsigned Level)
static bool Brw_CheckIfICanModifySharedFileOrFolder (void)
{
long Cod = Brw_GetCodForFiles ();
char Query[512+PATH_MAX*2];
char Query[512 + PATH_MAX * 2];
MYSQL_RES *mysql_res;
MYSQL_ROW row;
unsigned long NumRows;
@ -11068,7 +11068,7 @@ void Brw_RemoveGrpZonesVerbose (struct GroupData *GrpDat)
void Brw_RemoveGrpZones (long CrsCod,long GrpCod)
{
char PathGrpFileZones[PATH_MAX+1];
char PathGrpFileZones[PATH_MAX + 1];
/***** Set notifications about files in this group zone as removed *****/
Ntf_MarkNotifFilesInGroupAsRemoved (GrpCod);
@ -11089,7 +11089,7 @@ void Brw_RemoveGrpZones (long CrsCod,long GrpCod)
void Brw_RemoveUsrWorksInCrs (struct UsrData *UsrDat,struct Course *Crs,Cns_QuietOrVerbose_t QuietOrVerbose)
{
extern const char *Txt_Works_of_X_in_Y_removed;
char PathUsrInCrs[PATH_MAX+1];
char PathUsrInCrs[PATH_MAX + 1];
/***** Remove user's works in the course from database *****/
Brw_RemoveWrkFilesFromDB (Crs->CrsCod,UsrDat->UsrCod);
@ -11158,7 +11158,7 @@ void Brw_RemoveUsrWorksInAllCrss (struct UsrData *UsrDat,Cns_QuietOrVerbose_t Qu
/*****************************************************************************/
// This function may be called inside a web service, so don't report error
#define Brw_MAX_BYTES_FILE_CONTENT_STR (100 + NAME_MAX + 100 + PATH_MAX + 100+(Usr_MAX_BYTES_NAME + 1) * 3 + 100 + Fil_MAX_BYTES_FILE_SIZE_STRING)
#define Brw_MAX_BYTES_FILE_CONTENT_STR (100 + NAME_MAX + 100 + PATH_MAX + 100 + (Usr_MAX_BYTES_NAME + 1) * 3 + 100 + Fil_MAX_BYTES_FILE_SIZE_STRING)
void Brw_GetSummaryAndContentOfFile (char SummaryStr[Cns_MAX_BYTES_TEXT + 1],char **ContentStr,
long FilCod,unsigned MaxChars,bool GetContent)
@ -11645,7 +11645,7 @@ void Brw_RemoveOldFilesBriefcase (void)
extern const char *Txt_Files_removed;
extern const char *Txt_Links_removed;
extern const char *Txt_Folders_removed;
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
unsigned Months;
struct Brw_NumObjects Removed;
@ -11722,8 +11722,8 @@ static void Brw_ScanDirRemovingOldFiles (unsigned Level,
struct dirent **FileList;
int NumFile;
int NumFiles;
char PathFileRel[PATH_MAX+1];
char PathFileInExplTree[PATH_MAX+1];
char PathFileRel[PATH_MAX + 1];
char PathFileInExplTree[PATH_MAX + 1];
struct stat FolderStatus;
struct stat FileStatus;

6
swad_file_browser.h
View File

@ -150,9 +150,9 @@ struct FileMetadata
#define Brw_INTERNAL_NAME_ROOT_FOLDER_MARKS "calificaciones" // TODO: It should be "mrk"
#define Brw_INTERNAL_NAME_ROOT_FOLDER_BRIEF "maletin" // TODO: It should be "brf"
#define Brw_MIN_MONTHS_TO_REMOVE_OLD_FILES 3 // 3 months
#define Brw_DEF_MONTHS_TO_REMOVE_OLD_FILES 6 // 6 months
#define Brw_MAX_MONTHS_IN_BRIEFCASE (1*12) // 1 year
#define Brw_MIN_MONTHS_TO_REMOVE_OLD_FILES 3 // 3 months
#define Brw_DEF_MONTHS_TO_REMOVE_OLD_FILES 6 // 6 months
#define Brw_MAX_MONTHS_IN_BRIEFCASE (1 * 12) // 1 year
/*****************************************************************************/
/***************************** Public prototypes *****************************/

12
swad_follow.c
View File

@ -176,7 +176,7 @@ void Fol_SuggestWhoToFollow (void)
" WHERE UsrCod NOT IN"
" (SELECT FollowedCod FROM usr_follow"
" WHERE FollowerCod='%ld')"
// Get only Fol_MAX_USRS_TO_FOLLOW_SUGGESTED*2 users
// Get only Fol_MAX_USRS_TO_FOLLOW_SUGGESTED * 2 users
" ORDER BY RAND() LIMIT %u"
")"
" UNION "
@ -211,7 +211,7 @@ void Fol_SuggestWhoToFollow (void)
Gbl.Usrs.Me.UsrDat.UsrCod,
Pri_VisibilityDB[Pri_VISIBILITY_USER ],
Gbl.Usrs.Me.UsrDat.UsrCod,
Fol_MAX_USRS_TO_FOLLOW_SUGGESTED*2, // 2/3 likely known users
Fol_MAX_USRS_TO_FOLLOW_SUGGESTED * 2, // 2/3 likely known users
Gbl.Usrs.Me.UsrDat.UsrCod,
Pri_VisibilityDB[Pri_VISIBILITY_SYSTEM],
@ -683,14 +683,14 @@ static void Fol_ShowFollowedOrFollower (struct UsrData *UsrDat)
extern const char *Txt_Unfollow;
extern const char *Txt_Follow;
bool ShowPhoto;
char PhotoURL[PATH_MAX+1];
bool Visible = Pri_ShowIsAllowed (UsrDat->ProfileVisibility,UsrDat);
char PhotoURL[PATH_MAX + 1];
bool Visible = Pri_ShowingIsAllowed (UsrDat->ProfileVisibility,UsrDat);
/***** Show user's photo *****/
fprintf (Gbl.F.Out,"<td class=\"FOLLOW_USR_PHOTO\">");
if (Visible)
{
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (UsrDat,PhotoURL);
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (UsrDat,PhotoURL);
Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL :
NULL,
"PHOTO60x80",Pho_ZOOM,false);
@ -774,7 +774,7 @@ void Fol_FollowUsr (void)
if (Usr_GetParamOtherUsrCodEncryptedAndGetUsrData ())
{
// Follow only if I can view his/her public profile
if (Pri_ShowIsAllowed (Gbl.Usrs.Other.UsrDat.ProfileVisibility,&Gbl.Usrs.Other.UsrDat))
if (Pri_ShowingIsAllowed (Gbl.Usrs.Other.UsrDat.ProfileVisibility,&Gbl.Usrs.Other.UsrDat))
// Follow only if I do not follow him/her
if (!Fol_CheckUsrIsFollowerOf (Gbl.Usrs.Me.UsrDat.UsrCod,
Gbl.Usrs.Other.UsrDat.UsrCod))

87
swad_forum.c
View File

@ -295,17 +295,21 @@ static void For_PutParamForumOrder (void);
static void For_PutFormWhichForums (void);
static void For_WriteLinkToTopLevelOfForums (void);
static void For_PutParamsForumInsDegCrs (void);
static void For_WriteLinksToGblForums (bool IsLastItemInLevel[1+For_FORUM_MAX_LEVELS]);
static void For_WriteLinksToGblForums (bool IsLastItemInLevel[1 + For_FORUM_MAX_LEVELS]);
static void For_WriteLinksToPlatformForums (bool IsLastForum,
bool IsLastItemInLevel[1+For_FORUM_MAX_LEVELS]);
static long For_WriteLinksToInsForums (long InsCod,bool IsLastIns,bool IsLastItemInLevel[1+For_FORUM_MAX_LEVELS]);
static long For_WriteLinksToCtrForums (long CtrCod,bool IsLastCtr,bool IsLastItemInLevel[1+For_FORUM_MAX_LEVELS]);
static long For_WriteLinksToDegForums (long DegCod,bool IsLastDeg,bool IsLastItemInLevel[1+For_FORUM_MAX_LEVELS]);
static long For_WriteLinksToCrsForums (long CrsCod,bool IsLastCrs,bool IsLastItemInLevel[1+For_FORUM_MAX_LEVELS]);
bool IsLastItemInLevel[1 + For_FORUM_MAX_LEVELS]);
static long For_WriteLinksToInsForums (long InsCod,bool IsLastIns,
bool IsLastItemInLevel[1 + For_FORUM_MAX_LEVELS]);
static long For_WriteLinksToCtrForums (long CtrCod,bool IsLastCtr,
bool IsLastItemInLevel[1 + For_FORUM_MAX_LEVELS]);
static long For_WriteLinksToDegForums (long DegCod,bool IsLastDeg,
bool IsLastItemInLevel[1 + For_FORUM_MAX_LEVELS]);
static long For_WriteLinksToCrsForums (long CrsCod,bool IsLastCrs,
bool IsLastItemInLevel[1 + For_FORUM_MAX_LEVELS]);
static void For_WriteLinkToAForum (For_ForumType_t ForumType,bool ShowNumOfPosts,
unsigned Level,bool IsLastItemInLevel[1+For_FORUM_MAX_LEVELS]);
unsigned Level,bool IsLastItemInLevel[1 + For_FORUM_MAX_LEVELS]);
static void For_WriteLinkToForum (For_ForumType_t ForumType,Act_Action_t NextAct,const char *Icon,const char *ForumName,bool ShowNumOfPosts,
unsigned Level,bool IsLastItemInLevel[1+For_FORUM_MAX_LEVELS]);
unsigned Level,bool IsLastItemInLevel[1 + For_FORUM_MAX_LEVELS]);
static unsigned For_GetNumOfThreadsInForumNewerThan (For_ForumType_t ForumType,const char *Time);
static unsigned For_GetNumOfUnreadPostsInThr (long ThrCod,unsigned NumPostsInThr);
static unsigned For_GetNumOfPostsInThrNewerThan (long ThrCod,const char *Time);
@ -467,7 +471,7 @@ static long For_InsertForumPst (long ThrCod,long UsrCod,
if ((Query = malloc (512 +
strlen (Subject) +
strlen (Content) +
Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64+
Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64 +
Img_MAX_BYTES_TITLE)) == NULL)
Lay_ShowErrorAndExit ("Not enough memory to store database query.");
@ -952,7 +956,7 @@ static void For_ShowThreadPosts (long ThrCod,char LastSubject[Cns_MAX_BYTES_SUBJ
extern const char *Txt_There_are_new_posts;
extern const char *Txt_No_new_posts;
extern const char *Txt_Posts;
bool IsLastItemInLevel[1+For_FORUM_MAX_LEVELS];
bool IsLastItemInLevel[1 + For_FORUM_MAX_LEVELS];
struct ForumThread Thr;
char Query[1024];
MYSQL_RES *mysql_res;
@ -1738,7 +1742,7 @@ void For_ShowForumList (void)
extern const char *Hlp_SOCIAL_Forums;
extern const char *Txt_Forums;
bool ICanMoveThreads = (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM); // If I have permission to move threads...
bool IsLastItemInLevel[1+For_FORUM_MAX_LEVELS];
bool IsLastItemInLevel[1 + For_FORUM_MAX_LEVELS];
unsigned NumMyIns;
MYSQL_RES *mysql_resCtr;
MYSQL_RES *mysql_resDeg;
@ -1957,7 +1961,7 @@ static void For_WriteLinkToTopLevelOfForums (void)
/************************* Write links to global forums **********************/
/*****************************************************************************/
static void For_WriteLinksToGblForums (bool IsLastItemInLevel[1+For_FORUM_MAX_LEVELS])
static void For_WriteLinksToGblForums (bool IsLastItemInLevel[1 + For_FORUM_MAX_LEVELS])
{
/***** Link to forum global *****/
IsLastItemInLevel[1] = false;
@ -1977,7 +1981,7 @@ static void For_WriteLinksToGblForums (bool IsLastItemInLevel[1+For_FORUM_MAX_LE
/*****************************************************************************/
static void For_WriteLinksToPlatformForums (bool IsLastForum,
bool IsLastItemInLevel[1+For_FORUM_MAX_LEVELS])
bool IsLastItemInLevel[1 + For_FORUM_MAX_LEVELS])
{
bool ICanSeeTeacherForum;
@ -2003,7 +2007,8 @@ static void For_WriteLinksToPlatformForums (bool IsLastForum,
/*****************************************************************************/
// Returns institution code
static long For_WriteLinksToInsForums (long InsCod,bool IsLastIns,bool IsLastItemInLevel[1+For_FORUM_MAX_LEVELS])
static long For_WriteLinksToInsForums (long InsCod,bool IsLastIns,
bool IsLastItemInLevel[1 + For_FORUM_MAX_LEVELS])
{
bool ICanSeeTeacherForum;
@ -2036,7 +2041,8 @@ static long For_WriteLinksToInsForums (long InsCod,bool IsLastIns,bool IsLastIte
/*****************************************************************************/
// Returns centre code
static long For_WriteLinksToCtrForums (long CtrCod,bool IsLastCtr,bool IsLastItemInLevel[1+For_FORUM_MAX_LEVELS])
static long For_WriteLinksToCtrForums (long CtrCod,bool IsLastCtr,
bool IsLastItemInLevel[1 + For_FORUM_MAX_LEVELS])
{
bool ICanSeeTeacherForum;
@ -2069,7 +2075,8 @@ static long For_WriteLinksToCtrForums (long CtrCod,bool IsLastCtr,bool IsLastIte
/*****************************************************************************/
// Returns degree code
static long For_WriteLinksToDegForums (long DegCod,bool IsLastDeg,bool IsLastItemInLevel[1+For_FORUM_MAX_LEVELS])
static long For_WriteLinksToDegForums (long DegCod,bool IsLastDeg,
bool IsLastItemInLevel[1 + For_FORUM_MAX_LEVELS])
{
bool ICanSeeTeacherForum;
@ -2102,7 +2109,8 @@ static long For_WriteLinksToDegForums (long DegCod,bool IsLastDeg,bool IsLastIte
/*****************************************************************************/
// Returns course code
static long For_WriteLinksToCrsForums (long CrsCod,bool IsLastCrs,bool IsLastItemInLevel[1+For_FORUM_MAX_LEVELS])
static long For_WriteLinksToCrsForums (long CrsCod,bool IsLastCrs,
bool IsLastItemInLevel[1 + For_FORUM_MAX_LEVELS])
{
bool ICanSeeTeacherForum;
@ -2135,7 +2143,8 @@ static long For_WriteLinksToCrsForums (long CrsCod,bool IsLastCrs,bool IsLastIte
/*****************************************************************************/
static void For_WriteLinkToAForum (For_ForumType_t ForumType,bool ShowNumOfPosts,
unsigned Level,bool IsLastItemInLevel[1+For_FORUM_MAX_LEVELS])
unsigned Level,
bool IsLastItemInLevel[1 + For_FORUM_MAX_LEVELS])
{
char Icon[512];
char ForumName[For_MAX_BYTES_FORUM_NAME + 1];
@ -2199,9 +2208,9 @@ void For_SetForumName (For_ForumType_t ForumType,
Txt_Language_t Language,bool UseHTMLEntities)
{
extern const char *Txt_General;
extern const char *Txt_General_NO_HTML[1+Txt_NUM_LANGUAGES];
extern const char *Txt_General_NO_HTML[1 + Txt_NUM_LANGUAGES];
extern const char *Txt_only_teachers;
extern const char *Txt_only_teachers_NO_HTML[1+Txt_NUM_LANGUAGES];
extern const char *Txt_only_teachers_NO_HTML[1 + Txt_NUM_LANGUAGES];
switch (ForumType)
{
@ -2270,7 +2279,7 @@ void For_SetForumName (For_ForumType_t ForumType,
/*****************************************************************************/
static void For_WriteLinkToForum (For_ForumType_t ForumType,Act_Action_t NextAct,const char *Icon,const char *ForumName,bool ShowNumOfPosts,
unsigned Level,bool IsLastItemInLevel[1+For_FORUM_MAX_LEVELS])
unsigned Level,bool IsLastItemInLevel[1 + For_FORUM_MAX_LEVELS])
{
extern struct Act_Actions Act_Actions[Act_NUM_ACTIONS];
extern const char *The_ClassForm[The_NUM_THEMES];
@ -2281,7 +2290,7 @@ static void For_WriteLinkToForum (For_ForumType_t ForumType,Act_Action_t NextAct
unsigned NumThrsWithNewPosts;
unsigned NumPosts;
const char *Style;
char ActTxt[Act_MAX_LENGTH_ACTION_TXT+1];
char ActTxt[Act_MAX_LENGTH_ACTION_TXT + 1];
/***** Get number of threads and number of posts *****/
NumThrs = For_GetNumThrsInForum (ForumType);
@ -2529,7 +2538,7 @@ void For_ShowForumThrs (void)
extern const char *Txt_Unread_BR_msgs;
extern const char *Txt_WriBRters;
extern const char *Txt_ReaBRders;
bool IsLastItemInLevel[1+For_FORUM_MAX_LEVELS];
bool IsLastItemInLevel[1 + For_FORUM_MAX_LEVELS];
char SubQuery[256];
char Query[2048];
MYSQL_RES *mysql_res;
@ -3718,9 +3727,9 @@ void For_ShowThrPsts (void)
void For_GetParamsForum (void)
{
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
unsigned UnsignedNum;
char LongStr[1+10+1];
char LongStr[1 + 10 + 1];
/***** Get which forums I want to see *****/
Par_GetParToText ("WhichForum",UnsignedStr,10);
@ -3737,22 +3746,22 @@ void For_GetParamsForum (void)
Gbl.Forum.SelectedOrderType = For_DEFAULT_ORDER;
/***** Get parameter with code of institution *****/
Par_GetParToText ("ForInsCod",LongStr,1+10);
Par_GetParToText ("ForInsCod",LongStr,1 + 10);
Gbl.Forum.Ins.InsCod = Str_ConvertStrCodToLongCod (LongStr);
Ins_GetDataOfInstitutionByCod (&Gbl.Forum.Ins,Ins_GET_BASIC_DATA);
/***** Get parameter with code of institution *****/
Par_GetParToText ("ForCtrCod",LongStr,1+10);
Par_GetParToText ("ForCtrCod",LongStr,1 + 10);
Gbl.Forum.Ctr.CtrCod = Str_ConvertStrCodToLongCod (LongStr);
Ctr_GetDataOfCentreByCod (&Gbl.Forum.Ctr);
/***** Get parameter with code of degree *****/
Par_GetParToText ("ForDegCod",LongStr,1+10);
Par_GetParToText ("ForDegCod",LongStr,1 + 10);
Gbl.Forum.Deg.DegCod = Str_ConvertStrCodToLongCod (LongStr);
Deg_GetDataOfDegreeByCod (&Gbl.Forum.Deg);
/***** Get parameter with code of course *****/
Par_GetParToText ("ForCrsCod",LongStr,1+10);
Par_GetParToText ("ForCrsCod",LongStr,1 + 10);
Gbl.Forum.Crs.CrsCod = Str_ConvertStrCodToLongCod (LongStr);
Crs_GetDataOfCourseByCod (&Gbl.Forum.Crs);
}
@ -3772,11 +3781,11 @@ void For_PutHiddenParamThrCod (long ThrCod)
static long For_GetParamThrCod (void)
{
char StrThrCod[1+10+1]; // String that holds the thread code
char StrThrCod[1 + 10 + 1]; // String that holds the thread code
long ThrCod;
/* Get thread code */
Par_GetParToText ("ThrCod",StrThrCod,1+10);
Par_GetParToText ("ThrCod",StrThrCod,1 + 10);
if (sscanf (StrThrCod,"%ld",&ThrCod) != 1)
Lay_ShowErrorAndExit ("Wrong thread code.");
@ -3798,11 +3807,11 @@ static void For_PutHiddenParamPstCod (long PstCod)
static long For_GetParamPstCod (void)
{
char StrPstCod[1+10+1]; // String that holds the post code
char StrPstCod[1 + 10 + 1]; // String that holds the post code
long PstCod;
/* Get post code */
Par_GetParToText ("PstCod",StrPstCod,1+10);
Par_GetParToText ("PstCod",StrPstCod,1 + 10);
if (sscanf (StrPstCod,"%ld",&PstCod) != 1)
Lay_ShowErrorAndExit ("Wrong post code.");
@ -3924,7 +3933,7 @@ void For_RecForumPst (void)
long PstCod = 0;
unsigned NumUsrsToBeNotifiedByEMail;
struct SocialPublishing SocPub;
char Content[Cns_MAX_BYTES_LONG_TEXT+1];
char Content[Cns_MAX_BYTES_LONG_TEXT + 1];
struct Image Image;
/***** Get order type, degree and course of the forum *****/
@ -4063,8 +4072,8 @@ void For_DelPst (void)
long PstCod,ThrCod;
struct UsrData UsrDat;
time_t CreatTimeUTC; // Creation time of a message
char Subject[Cns_MAX_BYTES_SUBJECT+1];
char OriginalContent[Cns_MAX_BYTES_LONG_TEXT+1];
char Subject[Cns_MAX_BYTES_SUBJECT + 1];
char OriginalContent[Cns_MAX_BYTES_LONG_TEXT + 1];
struct Image Image;
bool ThreadDeleted = false;
@ -4186,7 +4195,7 @@ void For_DelThr (void)
extern const char *Txt_Thread_X_removed;
extern const char *Txt_Thread_removed;
long ThrCod;
char Subject[Cns_MAX_BYTES_SUBJECT+1];
char Subject[Cns_MAX_BYTES_SUBJECT + 1];
/***** Get order type, degree and course of the forum *****/
For_GetParamsForum ();
@ -4231,7 +4240,7 @@ void For_CutThr (void)
extern const char *Txt_Thread_X_marked_to_be_moved;
extern const char *Txt_Thread_marked_to_be_moved;
long ThrCod;
char Subject[Cns_MAX_BYTES_SUBJECT+1];
char Subject[Cns_MAX_BYTES_SUBJECT + 1];
/***** Get order type, degree and course of the forum *****/
For_GetParamsForum ();
@ -4271,7 +4280,7 @@ void For_PasteThr (void)
extern const char *Txt_Thread_X_moved_to_this_forum;
extern const char *Txt_Thread_moved_to_this_forum;
long ThrCod;
char Subject[Cns_MAX_BYTES_SUBJECT+1];
char Subject[Cns_MAX_BYTES_SUBJECT + 1];
/***** Get order type, degree and course of the forum *****/
For_GetParamsForum ();

38
swad_global.h
View File

@ -86,8 +86,8 @@ struct Globals
{
struct
{
char DatabasePassword[Cfg_MAX_BYTES_DATABASE_PASSWORD+1];
char SMTPPassword[Cfg_MAX_BYTES_SMTP_PASSWORD+1];
char DatabasePassword[Cfg_MAX_BYTES_DATABASE_PASSWORD + 1];
char SMTPPassword[Cfg_MAX_BYTES_SMTP_PASSWORD + 1];
} Config;
struct Files F;
MYSQL mysql;
@ -96,7 +96,7 @@ struct Globals
{
int Num; // Number of form, used in form submit links
char Id[32]; // Identifier string used in forms
char UniqueId[32+Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64+10+1]; // Unique identifier string used in forms
char UniqueId[32 + Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64 + 10 + 1]; // Unique identifier string used in forms
bool Inside; // Set to true inside a form to avoid nested forms
} Form;
bool Error;
@ -114,8 +114,8 @@ struct Globals
Act_CONT_DATA (if CONTENT_TYPE==multipart/form-data) */
struct
{
char StrWithoutCRLF[Par_MAX_LENGTH_BOUNDARY_WITH_CR_LF+1];
char StrWithCRLF [Par_MAX_LENGTH_BOUNDARY_WITH_CR_LF+1];
char StrWithoutCRLF[Par_MAX_LENGTH_BOUNDARY_WITH_CR_LF + 1];
char StrWithCRLF [Par_MAX_LENGTH_BOUNDARY_WITH_CR_LF + 1];
size_t LengthWithoutCRLF;
size_t LengthWithCRLF;
} Boundary;
@ -185,7 +185,7 @@ struct Globals
const char *XMLPtr;
struct
{
char FileName[PATH_MAX+1];
char FileName[PATH_MAX + 1];
} HTMLOutput;
struct
{
@ -397,7 +397,7 @@ struct Globals
time_t TimeDiff;
} Lst[Cfg_MAX_CONNECTED_SHOWN];
} Connected;
char FileNamePhoto[NAME_MAX+1]; // File name (with no path and no .jpg) of the temporary file with the selected face
char FileNamePhoto[NAME_MAX + 1]; // File name (with no path and no .jpg) of the temporary file with the selected face
bool Error; // To signal that an error has happened
Enr_RegRemOneUsrAction_t RegRemAction; // Enrollment action
} Usrs;
@ -444,9 +444,9 @@ struct Globals
struct
{
struct Course Crs;
char PathPriv[PATH_MAX+1]; // Absolute path to the private directory of the course
char PathRelPubl[PATH_MAX+1]; // Relative path to the public directory of the course
char PathURLPubl[PATH_MAX+1]; // Abolute URL to the public part of the course
char PathPriv[PATH_MAX + 1]; // Absolute path to the private directory of the course
char PathRelPubl[PATH_MAX + 1]; // Relative path to the public directory of the course
char PathURLPubl[PATH_MAX + 1]; // Abolute URL to the public part of the course
struct
{
unsigned NumGrps;
@ -480,17 +480,17 @@ struct Globals
} CurrentCrs;
struct
{
char PathDir[PATH_MAX+1];
char PathDir[PATH_MAX + 1];
unsigned NumItem;
bool EditionIsActive;
Syl_WhichSyllabus_t WhichSyllabus;
} Syllabus;
struct
{
struct Date *Lst; // List of dates of exam announcements
struct Date *Lst; // List of dates of exam announcements
unsigned NumExaAnns; // Number of announcements of exam in the list
long HighlightExaCod; // Exam announcement to be highlighted
char HighlightDate[4+1+2+1+2+1]; // Date with exam announcements to be highlighted (in YYYY-MM-DD format)
long HighlightExaCod; // Exam announcement to be highlighted
char HighlightDate[4 + 1 + 2 + 1 + 2 + 1]; // Date with exam announcements to be highlighted (in YYYY-MM-DD format)
struct ExamData ExaDat;
bool NewExamAnnouncement;
} ExamAnns;
@ -597,7 +597,7 @@ struct Globals
} Courses[Crs_MAX_COURSES_PER_USR]; // Distinct courses in my messages sent or received
long FilterCrsCod; // Show only messages sent from this course code
char FilterCrsShrtName[Crs_MAX_LENGTH_COURSE_SHRT_NAME + 1];
char FilterFromTo[Usr_MAX_LENGTH_USR_NAME_OR_SURNAME*3 + 1]; // Show only messages from/to these users
char FilterFromTo[Usr_MAX_LENGTH_USR_NAME_OR_SURNAME * 3 + 1]; // Show only messages from/to these users
char FilterContent[Msg_MAX_LENGTH_FILTER_CONTENT + 1]; // Show only messages that match this content
bool ShowOnlyUnreadMsgs; // Show only unread messages (this option is applicable only for received messages)
long ExpandedMsgCod; // The current expanded message code
@ -622,8 +622,8 @@ struct Globals
unsigned Column;
TT_ClassType_t ClassType;
unsigned Duration;
char Place[TT_MAX_BYTES_PLACE+1];
char Group[TT_MAX_BYTES_GROUP+1];
char Place[TT_MAX_BYTES_PLACE + 1];
char Group[TT_MAX_BYTES_GROUP + 1];
long GrpCod; // Group code (-1 if no group selected)
struct
{
@ -706,8 +706,8 @@ struct Globals
unsigned long RowsPerPage;
long DegTypCod;
long DptCod;
char StrIndicatorsSelected[Ind_MAX_SIZE_INDICATORS_SELECTED+1];
bool IndicatorsSelected[1+Ind_NUM_INDICATORS];
char StrIndicatorsSelected[Ind_MAX_SIZE_INDICATORS_SELECTED + 1];
bool IndicatorsSelected[1 + Ind_NUM_INDICATORS];
struct
{
Pho_AvgPhotoTypeOfAverage_t TypeOfAverage;

42
swad_group.c
View File

@ -342,7 +342,7 @@ void Grp_PutParamsCodGrps (void)
void Grp_GetParCodsSeveralGrpsToShowUsrs (void)
{
char YN[1+1];
char YN[1 + 1];
struct ListCodGrps LstGrpsIBelong;
unsigned NumGrp;
@ -417,7 +417,7 @@ void Grp_GetParCodsSeveralGrps (void)
for (Ptr = ParamLstCodGrps, NumGrp = 0;
*Ptr;
NumGrp++)
Par_GetNextStrUntilSeparParamMult (&Ptr,LongStr,1+10);
Par_GetNextStrUntilSeparParamMult (&Ptr,LongStr,1 + 10);
Gbl.CurrentCrs.Grps.LstGrpsSel.NumGrps = NumGrp;
if (Gbl.CurrentCrs.Grps.LstGrpsSel.NumGrps) // If I have selected groups...
@ -429,7 +429,7 @@ void Grp_GetParCodsSeveralGrps (void)
*Ptr;
NumGrp++)
{
Par_GetNextStrUntilSeparParamMult (&Ptr,LongStr,1+10);
Par_GetNextStrUntilSeparParamMult (&Ptr,LongStr,1 + 10);
Gbl.CurrentCrs.Grps.LstGrpsSel.GrpCods[NumGrp] = Str_ConvertStrCodToLongCod (LongStr);
}
}
@ -3084,7 +3084,7 @@ void Grp_RecFormNewGrpTyp (void)
{
extern const char *Txt_The_type_of_group_X_already_exists;
extern const char *Txt_You_must_specify_the_name_of_the_new_type_of_group;
char YN[1+1];
char YN[1 + 1];
/***** Get parameters from form *****/
/* Get the name of group type */
@ -3146,7 +3146,7 @@ void Grp_RecFormNewGrp (void)
{
extern const char *Txt_The_group_X_already_exists;
extern const char *Txt_You_must_specify_the_name_of_the_new_group;
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
/***** Get parameters from form *****/
if ((Gbl.CurrentCrs.Grps.GrpTyp.GrpTypCod = Grp_GetParamGrpTypCod ()) > 0) // Group type valid
@ -3691,7 +3691,7 @@ void Grp_ChangeMandatGrpTyp (void)
extern const char *Txt_The_enrollment_of_students_into_groups_of_type_X_is_now_mandatory;
extern const char *Txt_The_enrollment_of_students_into_groups_of_type_X_is_now_voluntary;
char Query[1024];
char YN[1+1];
char YN[1 + 1];
bool NewMandatoryEnrollment;
/***** Get parameters of the form *****/
@ -3746,7 +3746,7 @@ void Grp_ChangeMultiGrpTyp (void)
extern const char *Txt_Now_each_student_can_belong_to_multiple_groups_of_type_X;
extern const char *Txt_Now_each_student_can_only_belong_to_a_group_of_type_X;
char Query[1024];
char YN[1+1];
char YN[1 + 1];
bool NewMultipleEnrollment;
/***** Get parameters from the form *****/
@ -3842,7 +3842,7 @@ void Grp_ChangeMaxStdsGrp (void)
struct GroupData GrpDat;
char Query[1024];
unsigned NewMaxStds;
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
/***** Get parameters of the form *****/
/* Get group code */
@ -3924,7 +3924,7 @@ void Grp_RenameGroupType (void)
extern const char *Txt_The_type_of_group_X_has_been_renamed_as_Y;
extern const char *Txt_The_name_of_the_type_of_group_X_has_not_changed;
char Query[1024];
char NewNameGrpTyp[Grp_MAX_LENGTH_GROUP_TYPE_NAME+1];
char NewNameGrpTyp[Grp_MAX_LENGTH_GROUP_TYPE_NAME + 1];
/***** Get parameters from form *****/
/* Get the code of the group type */
@ -4064,10 +4064,10 @@ void Grp_RenameGroup (void)
static long Grp_GetParamGrpTypCod (void)
{
char LongStr[1+10+1];
char LongStr[1 + 10 + 1];
/***** Get parameter with code of group type *****/
Par_GetParToText ("GrpTypCod",LongStr,1+10);
Par_GetParToText ("GrpTypCod",LongStr,1 + 10);
return Str_ConvertStrCodToLongCod (LongStr);
}
@ -4077,10 +4077,10 @@ static long Grp_GetParamGrpTypCod (void)
static long Grp_GetParamGrpCod (void)
{
char LongStr[1+10+1];
char LongStr[1 + 10 + 1];
/***** Get parameter with group code *****/
Par_GetParToText ("GrpCod",LongStr,1+10);
Par_GetParToText ("GrpCod",LongStr,1 + 10);
return Str_ConvertStrCodToLongCod (LongStr);
}
@ -4109,8 +4109,8 @@ void Grp_PutParamGrpCod (long GrpCod)
void Grp_GetLstCodsGrpWanted (struct ListCodGrps *LstGrpsWanted)
{
unsigned NumGrpTyp;
char Param[8+10+1];
char LongStr[1+10+1];
char Param[8 + 10 + 1];
char LongStr[1 + 10 + 1];
char **LstStrCodGrps;
const char *Ptr;
unsigned NumGrpWanted;
@ -4126,19 +4126,21 @@ void Grp_GetLstCodsGrpWanted (struct ListCodGrps *LstGrpsWanted)
NumGrpTyp++)
{
/***** Allocate memory for the list of group codes of this type *****/
if ((LstStrCodGrps[NumGrpTyp] = (char *) malloc ((1+10+1) * Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].NumGrps)) == NULL)
if ((LstStrCodGrps[NumGrpTyp] = (char *) malloc ((size_t) ((1 + 10 + 1) *
Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].NumGrps))) == NULL)
Lay_ShowErrorAndExit ("Not enough memory to store codes of groups in which a user wants to be enrolled.");
/***** Get the multiple parameter code of group of this type *****/
sprintf (Param,"GrpCod%ld",Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].GrpTypCod);
Par_GetParMultiToText (Param,LstStrCodGrps[NumGrpTyp],((1+10+1) * Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].NumGrps) - 1);
Par_GetParMultiToText (Param,LstStrCodGrps[NumGrpTyp],
((1 + 10 + 1) * Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].NumGrps) - 1);
if (LstStrCodGrps[NumGrpTyp][0])
{
/***** Count the number of groups selected of this type of LstCodGrps[NumGrpTyp] *****/
for (Ptr = LstStrCodGrps[NumGrpTyp], NumGrpWanted = 0;
*Ptr;
NumGrpWanted++)
Par_GetNextStrUntilSeparParamMult (&Ptr,LongStr,1+10);
Par_GetNextStrUntilSeparParamMult (&Ptr,LongStr,1 + 10);
/***** Add the number of groups selected of this type to the number of groups selected total *****/
LstGrpsWanted->NumGrps += NumGrpWanted;
@ -4162,7 +4164,7 @@ void Grp_GetLstCodsGrpWanted (struct ListCodGrps *LstGrpsWanted)
*Ptr;
NumGrpWanted++)
{
Par_GetNextStrUntilSeparParamMult (&Ptr,LongStr,1+10);
Par_GetNextStrUntilSeparParamMult (&Ptr,LongStr,1 + 10);
LstGrpsWanted->GrpCods[NumGrpWanted] = Str_ConvertStrCodToLongCod (LongStr);
}
/* Free memory used by the list of group codes of this type */
@ -4258,7 +4260,7 @@ void Grp_ShowFormToSelWhichGrps (Act_Action_t Action,void (*FuncParams) ())
void Grp_GetParamWhichGrps (void)
{
static bool FirstTime = true;
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
unsigned UnsignedNum;
if (FirstTime)

10
swad_holiday.c
View File

@ -181,7 +181,7 @@ void Hld_SeeHolidays (void)
static void Hld_GetParamHldOrderType (void)
{
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
unsigned UnsignedNum;
Par_GetParToText ("Order",UnsignedStr,10);
@ -443,7 +443,7 @@ static void Hld_GetDataOfHolidayByCod (struct Holiday *Hld)
static Hld_HolidayType_t Hld_GetParamHldType (void)
{
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
Par_GetParToText ("HldTyp",UnsignedStr,10);
return Hld_GetTypeOfHoliday (UnsignedStr);
@ -622,10 +622,10 @@ static void Hld_PutParamHldCod (long HldCod)
long Hld_GetParamHldCod (void)
{
char LongStr[1+10+1];
char LongStr[1 + 10 + 1];
/***** Get parameter with code of holiday *****/
Par_GetParToText ("HldCod",LongStr,1+10);
Par_GetParToText ("HldCod",LongStr,1 + 10);
return Str_ConvertStrCodToLongCod (LongStr);
}
@ -847,7 +847,7 @@ void Hld_RenameHoliday (void)
extern const char *Txt_The_name_of_the_holiday_X_has_not_changed;
char Query[512];
struct Holiday *Hld;
char NewHldName[Hld_MAX_LENGTH_HOLIDAY_NAME+1];
char NewHldName[Hld_MAX_LENGTH_HOLIDAY_NAME + 1];
Hld = &Gbl.Hlds.EditingHld;

2
swad_icon.c
View File

@ -147,7 +147,7 @@ void Ico_ChangeIconSet (void)
Ico_IconSet_t Ico_GetParamIconSet (void)
{
char IconSetId[Ico_MAX_BYTES_ICON_SET_ID+1];
char IconSetId[Ico_MAX_BYTES_ICON_SET_ID + 1];
Ico_IconSet_t IconSet;
Par_GetParToText ("IconSet",IconSetId,Ico_MAX_BYTES_ICON_SET_ID);

30
swad_image.c
View File

@ -259,8 +259,8 @@ void Img_GetImageFromForm (int NumImgInForm,struct Image *Image,
void (*GetImageFromDB) (int NumImgInForm,struct Image *Image))
{
struct ParamUploadImg ParamUploadImg;
char Title[Img_MAX_BYTES_TITLE+1];
char URL[Img_MAX_BYTES_URL+1];
char Title[Img_MAX_BYTES_TITLE + 1];
char URL[Img_MAX_BYTES_URL + 1];
size_t Length;
/***** Set names of parameters depending on number of image in form *****/
@ -374,7 +374,7 @@ void Img_SetParamNames (struct ParamUploadImg *ParamUploadImg,int NumImgInForm)
Img_Action_t Img_GetImageActionFromForm (const char *ParamAction)
{
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
unsigned UnsignedNum;
/***** Get parameter with the action to perform on image *****/
@ -395,13 +395,13 @@ Img_Action_t Img_GetImageActionFromForm (const char *ParamAction)
void Img_GetAndProcessImageFileFromForm (struct Image *Image,const char *ParamFile)
{
struct Param *Param;
char FileNameImgSrc[PATH_MAX+1];
char FileNameImgSrc[PATH_MAX + 1];
char *PtrExtension;
size_t LengthExtension;
char MIMEType[Brw_MAX_BYTES_MIME_TYPE + 1];
char PathImgPriv[PATH_MAX+1];
char FileNameImgOrig[PATH_MAX+1]; // Full name of original uploaded file
char FileNameImgTmp[PATH_MAX+1]; // Full name of temporary processed file
char PathImgPriv[PATH_MAX + 1];
char FileNameImgOrig[PATH_MAX + 1]; // Full name of original uploaded file
char FileNameImgTmp[PATH_MAX + 1]; // Full name of temporary processed file
bool WrongType = false;
/***** Rest image file status *****/
@ -478,7 +478,7 @@ static void Img_ProcessImage (struct Image *Image,
const char *FileNameImgOriginal,
const char *FileNameImgProcessed)
{
char Command[1024+PATH_MAX*2];
char Command[1024 + PATH_MAX * 2];
int ReturnCode;
sprintf (Command,"convert %s -resize '%ux%u>' -quality %u %s",
@ -508,9 +508,9 @@ static void Img_ProcessImage (struct Image *Image,
void Img_MoveImageToDefinitiveDirectory (struct Image *Image)
{
char PathImgPriv[PATH_MAX+1];
char FileNameImgTmp[PATH_MAX+1]; // Full name of temporary processed file
char FileNameImg[PATH_MAX+1]; // Full name of definitive processed file
char PathImgPriv[PATH_MAX + 1];
char FileNameImgTmp[PATH_MAX + 1]; // Full name of temporary processed file
char FileNameImg[PATH_MAX + 1]; // Full name of definitive processed file
/***** Create subdirectory if it does not exist *****/
sprintf (PathImgPriv,"%s/%s/%c%c",
@ -546,9 +546,9 @@ void Img_ShowImage (struct Image *Image,
const char *ClassContainer,const char *ClassImg)
{
extern const char *Txt_Image_not_found;
char FileNameImgPriv[PATH_MAX+1];
char FullPathImgPriv[PATH_MAX+1];
char URL[PATH_MAX+1];
char FileNameImgPriv[PATH_MAX + 1];
char FullPathImgPriv[PATH_MAX + 1];
char URL[PATH_MAX + 1];
bool PutLink;
/***** If no image to show ==> nothing to do *****/
@ -621,7 +621,7 @@ void Img_ShowImage (struct Image *Image,
void Img_RemoveImageFile (const char *ImageName)
{
char FullPathImgPriv[PATH_MAX+1];
char FullPathImgPriv[PATH_MAX + 1];
if (ImageName[0])
{

18
swad_indicator.c
View File

@ -66,9 +66,9 @@ static unsigned Ind_GetTableOfCourses (MYSQL_RES **mysql_res);
static bool Ind_GetIfShowBigList (unsigned NumCrss);
static void Ind_PutButtonToConfirmIWantToSeeBigList (unsigned NumCrss);
static void Ind_GetNumCoursesWithIndicators (unsigned NumCrssWithIndicatorYes[1+Ind_NUM_INDICATORS],
static void Ind_GetNumCoursesWithIndicators (unsigned NumCrssWithIndicatorYes[1 + Ind_NUM_INDICATORS],
unsigned NumCrss,MYSQL_RES *mysql_res);
static void Ind_ShowNumCoursesWithIndicators (unsigned NumCrssWithIndicatorYes[1+Ind_NUM_INDICATORS],
static void Ind_ShowNumCoursesWithIndicators (unsigned NumCrssWithIndicatorYes[1 + Ind_NUM_INDICATORS],
unsigned NumCrss,bool PutForm);
static void Ind_ShowTableOfCoursesWithIndicators (Ind_IndicatorsLayout_t IndicatorsLayout,
unsigned NumCrss,MYSQL_RES *mysql_res);
@ -95,7 +95,7 @@ void Ind_ReqIndicatorsCourses (void)
extern const char *Txt_Show_more_details;
MYSQL_RES *mysql_res;
unsigned NumCrss;
unsigned NumCrssWithIndicatorYes[1+Ind_NUM_INDICATORS];
unsigned NumCrssWithIndicatorYes[1 + Ind_NUM_INDICATORS];
unsigned NumCrssToList;
unsigned Ind;
@ -237,7 +237,7 @@ void Ind_ShowIndicatorsCourses (void)
{
MYSQL_RES *mysql_res;
unsigned NumCrss;
unsigned NumCrssWithIndicatorYes[1+Ind_NUM_INDICATORS];
unsigned NumCrssWithIndicatorYes[1 + Ind_NUM_INDICATORS];
/***** Get parameters *****/
Ind_GetParamsIndicators ();
@ -266,7 +266,7 @@ static void Ind_GetParamNumIndicators (void)
{
unsigned Ind;
const char *Ptr;
char LongStr[1+10+1];
char LongStr[1 + 10 + 1];
long Indicator;
/***** Get parameter multiple with list of indicators selected *****/
@ -287,7 +287,7 @@ static void Ind_GetParamNumIndicators (void)
)
{
/* Get next indicator selected */
Par_GetNextStrUntilSeparParamMult (&Ptr,LongStr,1+10);
Par_GetNextStrUntilSeparParamMult (&Ptr,LongStr,1 + 10);
Indicator = Str_ConvertStrCodToLongCod (LongStr);
/* Set each indicator in list StrIndicatorsSelected as selected */
@ -494,7 +494,7 @@ static unsigned Ind_GetTableOfCourses (MYSQL_RES **mysql_res)
static bool Ind_GetIfShowBigList (unsigned NumCrss)
{
bool ShowBigList;
char YN[1+1];
char YN[1 + 1];
/***** If list of courses is too big... *****/
if (NumCrss <= Cfg_MIN_NUM_COURSES_TO_CONFIRM_SHOW_BIG_LIST)
@ -543,7 +543,7 @@ static void Ind_PutButtonToConfirmIWantToSeeBigList (unsigned NumCrss)
/** Get vector with numbers of courses with 0, 1, 2... indicators set to yes */
/*****************************************************************************/
static void Ind_GetNumCoursesWithIndicators (unsigned NumCrssWithIndicatorYes[1+Ind_NUM_INDICATORS],
static void Ind_GetNumCoursesWithIndicators (unsigned NumCrssWithIndicatorYes[1 + Ind_NUM_INDICATORS],
unsigned NumCrss,MYSQL_RES *mysql_res)
{
MYSQL_ROW row;
@ -580,7 +580,7 @@ static void Ind_GetNumCoursesWithIndicators (unsigned NumCrssWithIndicatorYes[1+
/** Show table with numbers of courses with 0, 1, 2... indicators set to yes */
/*****************************************************************************/
static void Ind_ShowNumCoursesWithIndicators (unsigned NumCrssWithIndicatorYes[1+Ind_NUM_INDICATORS],
static void Ind_ShowNumCoursesWithIndicators (unsigned NumCrssWithIndicatorYes[1 + Ind_NUM_INDICATORS],
unsigned NumCrss,bool PutForm)
{
extern const char *Txt_Indicators;

2
swad_indicator.h
View File

@ -32,7 +32,7 @@
/*****************************************************************************/
#define Ind_NUM_INDICATORS 5
#define Ind_MAX_SIZE_INDICATORS_SELECTED ((1+Ind_NUM_INDICATORS)*(10+1))
#define Ind_MAX_SIZE_INDICATORS_SELECTED ((1 + Ind_NUM_INDICATORS) * (10 + 1))
struct Ind_IndicatorsCrs
{

86
swad_info.c
View File

@ -669,7 +669,7 @@ void Inf_ChangeIHaveReadInfo (void)
static bool Inf_GetMustBeReadFromForm (void)
{
char YN[1+1];
char YN[1 + 1];
/***** Get a parameter that indicates if info must be read by students ******/
Par_GetParToText ("MustBeRead",YN,1);
@ -682,7 +682,7 @@ static bool Inf_GetMustBeReadFromForm (void)
static bool Inf_GetIfIHaveReadFromForm (void)
{
char YN[1+1];
char YN[1 + 1];
/***** Get a parameter that indicates if I have read a course info ******/
Par_GetParToText ("IHaveRead",YN,1);
@ -758,8 +758,8 @@ void Inf_RemoveUsrFromCrsInfoRead (long UsrCod,long CrsCod)
static bool Inf_CheckPage (long CrsCod,Inf_InfoType_t InfoType)
{
char PathRelDirHTML[PATH_MAX+1];
char PathRelFileHTML[PATH_MAX+1];
char PathRelDirHTML[PATH_MAX + 1];
char PathRelFileHTML[PATH_MAX + 1];
// TODO !!!!!!!!!!!! If the page is hosted in server ==> it should be created a temporary public directory
// and host the page in a private directory !!!!!!!!!!!!!!!!!
@ -788,9 +788,9 @@ static bool Inf_CheckPage (long CrsCod,Inf_InfoType_t InfoType)
static bool Inf_CheckAndShowPage (void)
{
char PathRelDirHTML[PATH_MAX+1];
char PathRelFileHTML[PATH_MAX+1];
char URL[PATH_MAX+1];
char PathRelDirHTML[PATH_MAX + 1];
char PathRelFileHTML[PATH_MAX + 1];
char URL[PATH_MAX + 1];
// TODO !!!!!!!!!!!! If the page is hosted in server ==> it should be created a temporary public directory
// and host the page in a private directory !!!!!!!!!!!!!!!!!
@ -844,8 +844,8 @@ static void Inf_BuildPathPage (long CrsCod,Inf_InfoType_t InfoType,char *PathDir
int Inf_WritePageIntoHTMLBuffer (char **HTMLBuffer)
{
char PathRelDirHTML[PATH_MAX+1];
char PathRelFileHTML[PATH_MAX+1];
char PathRelDirHTML[PATH_MAX + 1];
char PathRelFileHTML[PATH_MAX + 1];
FILE *FileHTML;
bool FileExists = false;
size_t Length;
@ -882,7 +882,7 @@ int Inf_WritePageIntoHTMLBuffer (char **HTMLBuffer)
fseek (FileHTML,0L,SEEK_SET);
/* Allocate memory for buffer */
if ((*HTMLBuffer = (char *) malloc (Length+1)) == NULL)
if ((*HTMLBuffer = (char *) malloc (Length + 1)) == NULL)
{
fclose (FileHTML);
Lay_ShowErrorAndExit ("Not enough memory for buffer.");
@ -915,7 +915,7 @@ int Inf_WritePageIntoHTMLBuffer (char **HTMLBuffer)
static bool Inf_CheckURL (long CrsCod,Inf_InfoType_t InfoType)
{
char PathFile[PATH_MAX+1];
char PathFile[PATH_MAX + 1];
FILE *FileURL;
/***** Build path to file containing URL *****/
@ -943,7 +943,7 @@ static bool Inf_CheckURL (long CrsCod,Inf_InfoType_t InfoType)
static bool Inf_CheckAndShowURL (void)
{
char PathFile[PATH_MAX+1];
char PathFile[PATH_MAX + 1];
FILE *FileURL;
/***** Build path to file containing URL *****/
@ -983,9 +983,9 @@ static void Inf_BuildPathURL (long CrsCod,Inf_InfoType_t InfoType,char *PathFile
/*****************************************************************************/
// This function is called only from web service
void Inf_WriteURLIntoTxtBuffer (char TxtBuffer[Cns_MAX_LENGTH_WWW+1])
void Inf_WriteURLIntoTxtBuffer (char TxtBuffer[Cns_MAX_LENGTH_WWW + 1])
{
char PathFile[PATH_MAX+1];
char PathFile[PATH_MAX + 1];
FILE *FileURL;
/***** Initialize buffer *****/
@ -1283,7 +1283,7 @@ void Inf_FormToSendURL (Inf_InfoSrc_t InfoSrc)
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_URL;
extern const char *Txt_Send_URL;
char PathFile[PATH_MAX+1];
char PathFile[PATH_MAX + 1];
FILE *FileURL;
/***** Build path to file containing URL *****/
@ -1448,7 +1448,7 @@ static Inf_InfoType_t Inf_AsignInfoType (void)
Inf_InfoSrc_t Inf_GetInfoSrcFromForm (void)
{
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
int InfoSrcInt;
Inf_InfoSrc_t InfoSrc;
@ -1675,7 +1675,7 @@ Inf_InfoSrc_t Inf_ConvertFromStrDBToInfoSrc (const char *StrInfoSrcDB)
static void Inf_SetInfoTxtIntoDB (const char *InfoTxtHTML,const char *InfoTxtMD)
{
char Query[256+Cns_MAX_BYTES_LONG_TEXT];
char Query[256 + Cns_MAX_BYTES_LONG_TEXT];
/***** Insert or replace info source for a specific type of course information *****/
sprintf (Query,"REPLACE INTO crs_info_txt"
@ -1761,7 +1761,7 @@ static bool Inf_CheckPlainTxt (long CrsCod,Inf_InfoType_t InfoType)
static bool Inf_CheckAndShowPlainTxt (void)
{
extern const char *Txt_INFO_TITLE[Inf_NUM_INFO_TYPES];
char TxtHTML[Cns_MAX_BYTES_LONG_TEXT+1];
char TxtHTML[Cns_MAX_BYTES_LONG_TEXT + 1];
bool ICanEdit = (Gbl.Usrs.Me.LoggedRole == Rol_TEACHER ||
Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM);
const char *Help[Inf_NUM_INFO_TYPES] =
@ -2000,7 +2000,7 @@ int Inf_WritePlainTextIntoHTMLBuffer (char **HTMLBuffer)
Length = (size_t) ftell (FileHTMLTmp);
/***** Allocate memory for buffer *****/
if ((*HTMLBuffer = (char *) malloc (Length+1)) == NULL)
if ((*HTMLBuffer = (char *) malloc (Length + 1)) == NULL)
{
fclose (FileHTMLTmp);
unlink (FileNameHTMLTmp);
@ -2037,17 +2037,17 @@ void Inf_EditPlainTxtInfo (void)
{
extern const char *Txt_INFO_TITLE[Inf_NUM_INFO_TYPES];
extern const char *Txt_Save;
char TxtHTML[Cns_MAX_BYTES_LONG_TEXT+1];
char TxtHTML[Cns_MAX_BYTES_LONG_TEXT + 1];
const char *HelpEdit[Inf_NUM_INFO_TYPES] =
{
Hlp_COURSE_Information_edit, // Inf_INTRODUCTION
Hlp_COURSE_Guide_edit, // Inf_TEACHING_GUIDE
Hlp_COURSE_Syllabus_edit, // Inf_LECTURES
Hlp_COURSE_Syllabus_edit, // Inf_PRACTICALS
Hlp_COURSE_Bibliography_edit, // Inf_BIBLIOGRAPHY
Hlp_COURSE_FAQ_edit, // Inf_FAQ
Hlp_COURSE_Links_edit, // Inf_LINKS
Hlp_ASSESSMENT_System_edit, // Inf_ASSESSMENT
Hlp_COURSE_Information_edit, // Inf_INTRODUCTION
Hlp_COURSE_Guide_edit, // Inf_TEACHING_GUIDE
Hlp_COURSE_Syllabus_edit, // Inf_LECTURES
Hlp_COURSE_Syllabus_edit, // Inf_PRACTICALS
Hlp_COURSE_Bibliography_edit, // Inf_BIBLIOGRAPHY
Hlp_COURSE_FAQ_edit, // Inf_FAQ
Hlp_COURSE_Links_edit, // Inf_LINKS
Hlp_ASSESSMENT_System_edit, // Inf_ASSESSMENT
};
/***** Set info type *****/
@ -2088,17 +2088,17 @@ void Inf_EditRichTxtInfo (void)
{
extern const char *Txt_INFO_TITLE[Inf_NUM_INFO_TYPES];
extern const char *Txt_Save;
char TxtHTML[Cns_MAX_BYTES_LONG_TEXT+1];
char TxtHTML[Cns_MAX_BYTES_LONG_TEXT + 1];
const char *HelpEdit[Inf_NUM_INFO_TYPES] =
{
Hlp_COURSE_Information_edit, // Inf_INTRODUCTION
Hlp_COURSE_Guide_edit, // Inf_TEACHING_GUIDE
Hlp_COURSE_Syllabus_edit, // Inf_LECTURES
Hlp_COURSE_Syllabus_edit, // Inf_PRACTICALS
Hlp_COURSE_Bibliography_edit, // Inf_BIBLIOGRAPHY
Hlp_COURSE_FAQ_edit, // Inf_FAQ
Hlp_COURSE_Links_edit, // Inf_LINKS
Hlp_ASSESSMENT_System_edit, // Inf_ASSESSMENT
Hlp_COURSE_Information_edit, // Inf_INTRODUCTION
Hlp_COURSE_Guide_edit, // Inf_TEACHING_GUIDE
Hlp_COURSE_Syllabus_edit, // Inf_LECTURES
Hlp_COURSE_Syllabus_edit, // Inf_PRACTICALS
Hlp_COURSE_Bibliography_edit, // Inf_BIBLIOGRAPHY
Hlp_COURSE_FAQ_edit, // Inf_FAQ
Hlp_COURSE_Links_edit, // Inf_LINKS
Hlp_ASSESSMENT_System_edit, // Inf_ASSESSMENT
};
/***** Set info type *****/
@ -2210,7 +2210,7 @@ void Inf_RecAndChangeRichTxtInfo (void)
void Inf_ReceiveURLInfo (void)
{
extern const char *Txt_The_URL_X_has_been_updated;
char PathFile[PATH_MAX+1];
char PathFile[PATH_MAX + 1];
FILE *FileURL;
bool URLIsOK = false;
@ -2274,12 +2274,12 @@ void Inf_ReceivePagInfo (void)
extern const char *Txt_No_file_index_html_index_htm_found_within_the_ZIP_file;
extern const char *Txt_The_file_type_should_be_HTML_or_ZIP;
struct Param *Param;
char SourceFileName[PATH_MAX+1];
char PathRelDirHTML[PATH_MAX+1];
char PathRelFileHTML[PATH_MAX+1];
char PathRelFileZIP[PATH_MAX+1];
char SourceFileName[PATH_MAX + 1];
char PathRelDirHTML[PATH_MAX + 1];
char PathRelFileHTML[PATH_MAX + 1];
char PathRelFileZIP[PATH_MAX + 1];
char MIMEType[Brw_MAX_BYTES_MIME_TYPE + 1];
char StrUnzip[100+PATH_MAX*2+1];
char StrUnzip[100 + PATH_MAX * 2 + 1];
bool WrongType = false;
bool FileIsOK = false;

34
swad_institution.c
View File

@ -86,7 +86,7 @@ static void Ins_RenameInstitution (struct Instit *Ins,Cns_ShrtOrFullName_t ShrtO
static bool Ins_CheckIfInsNameExistsInCty (const char *FieldName,const char *Name,long InsCod,long CtyCod);
static void Ins_UpdateInsNameDB (long InsCod,const char *FieldName,const char *NewInsName);
static void Ins_UpdateInsCtyDB (long InsCod,long CtyCod);
static void Ins_UpdateInsWWWDB (long InsCod,const char NewWWW[Cns_MAX_LENGTH_WWW+1]);
static void Ins_UpdateInsWWWDB (long InsCod,const char NewWWW[Cns_MAX_LENGTH_WWW + 1]);
static void Ins_PutButtonToGoToIns (struct Instit *Ins);
static void Ins_PutFormToCreateInstitution (void);
@ -282,7 +282,7 @@ static void Ins_Configuration (bool PrintView)
extern const char *Txt_Short_name;
extern const char *Txt_Web;
extern const char *Txt_Shortcut;
extern const char *Txt_STR_LANG_ID[1+Txt_NUM_LANGUAGES];
extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES];
extern const char *Txt_QR_code;
extern const char *Txt_Centres;
extern const char *Txt_Centres_of_INSTITUTION_X;
@ -908,7 +908,7 @@ static void Ins_PutHeadInstitutionsForSeeing (bool OrderSelectable)
static void Ins_GetParamInsOrderType (void)
{
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
unsigned UnsignedNum;
Par_GetParToText ("Order",UnsignedStr,10);
@ -1556,10 +1556,10 @@ long Ins_GetAndCheckParamOtherInsCod (void)
static long Ins_GetParamOtherInsCod (void)
{
char LongStr[1+10+1];
char LongStr[1 + 10 + 1];
/***** Get parameter with code of institution *****/
Par_GetParToText ("OthInsCod",LongStr,1+10);
Par_GetParToText ("OthInsCod",LongStr,1 + 10);
return Str_ConvertStrCodToLongCod (LongStr);
}
@ -1573,7 +1573,7 @@ void Ins_RemoveInstitution (void)
extern const char *Txt_Institution_X_removed;
char Query[128];
struct Instit Ins;
char PathIns[PATH_MAX+1];
char PathIns[PATH_MAX + 1];
/***** Get institution code *****/
Ins.InsCod = Ins_GetAndCheckParamOtherInsCod ();
@ -1665,7 +1665,7 @@ static void Ins_RenameInstitution (struct Instit *Ins,Cns_ShrtOrFullName_t ShrtO
const char *FieldName = NULL; // Initialized to avoid warning
unsigned MaxLength = 0; // Initialized to avoid warning
char *CurrentInsName = NULL; // Initialized to avoid warning
char NewInsName[Ins_MAX_LENGTH_INSTIT_FULL_NAME+1];
char NewInsName[Ins_MAX_LENGTH_INSTIT_FULL_NAME + 1];
switch (ShrtOrFullName)
{
@ -1733,7 +1733,7 @@ static void Ins_RenameInstitution (struct Instit *Ins,Cns_ShrtOrFullName_t ShrtO
static bool Ins_CheckIfInsNameExistsInCty (const char *FieldName,const char *Name,long InsCod,long CtyCod)
{
char Query[256+Ins_MAX_LENGTH_INSTIT_FULL_NAME];
char Query[256 + Ins_MAX_LENGTH_INSTIT_FULL_NAME];
/***** Get number of institutions in current country with a name from database *****/
sprintf (Query,"SELECT COUNT(*) FROM institutions"
@ -1748,7 +1748,7 @@ static bool Ins_CheckIfInsNameExistsInCty (const char *FieldName,const char *Nam
static void Ins_UpdateInsNameDB (long InsCod,const char *FieldName,const char *NewInsName)
{
char Query[128+Ins_MAX_LENGTH_INSTIT_FULL_NAME];
char Query[128 + Ins_MAX_LENGTH_INSTIT_FULL_NAME];
/***** Update institution changing old name by new name */
sprintf (Query,"UPDATE institutions SET %s='%s' WHERE InsCod='%ld'",
@ -1843,7 +1843,7 @@ void Ins_ChangeInsWWW (void)
extern const char *Txt_The_new_web_address_is_X;
extern const char *Txt_You_can_not_leave_the_web_address_empty;
struct Instit *Ins;
char NewWWW[Cns_MAX_LENGTH_WWW+1];
char NewWWW[Cns_MAX_LENGTH_WWW + 1];
Ins = &Gbl.Inss.EditingIns;
@ -1883,7 +1883,7 @@ void Ins_ChangeInsWWWInConfig (void)
{
extern const char *Txt_The_new_web_address_is_X;
extern const char *Txt_You_can_not_leave_the_web_address_empty;
char NewWWW[Cns_MAX_LENGTH_WWW+1];
char NewWWW[Cns_MAX_LENGTH_WWW + 1];
/***** Get parameters from form *****/
/* Get the new WWW for the institution */
@ -1912,9 +1912,9 @@ void Ins_ChangeInsWWWInConfig (void)
/**************** Update database changing old WWW by new WWW ****************/
/*****************************************************************************/
static void Ins_UpdateInsWWWDB (long InsCod,const char NewWWW[Cns_MAX_LENGTH_WWW+1])
static void Ins_UpdateInsWWWDB (long InsCod,const char NewWWW[Cns_MAX_LENGTH_WWW + 1])
{
char Query[256+Cns_MAX_LENGTH_WWW];
char Query[256 + Cns_MAX_LENGTH_WWW];
/***** Update database changing old WWW by new WWW *****/
sprintf (Query,"UPDATE institutions SET WWW='%s' WHERE InsCod='%ld'",
@ -1931,7 +1931,7 @@ void Ins_ChangeInsStatus (void)
extern const char *Txt_The_status_of_the_institution_X_has_changed;
struct Instit *Ins;
char Query[256];
char UnsignedNum[10+1];
char UnsignedNum[10 + 1];
Ins_Status_t Status;
Ins_StatusTxt_t StatusTxt;
@ -2289,9 +2289,9 @@ static void Ins_RecFormRequestOrCreateIns (unsigned Status)
static void Ins_CreateInstitution (struct Instit *Ins,unsigned Status)
{
extern const char *Txt_Created_new_institution_X;
char Query[512+
Ins_MAX_LENGTH_INSTIT_SHRT_NAME+
Ins_MAX_LENGTH_INSTIT_FULL_NAME+
char Query[512 +
Ins_MAX_LENGTH_INSTIT_SHRT_NAME +
Ins_MAX_LENGTH_INSTIT_FULL_NAME +
Cns_MAX_LENGTH_WWW];
/***** Create a new institution *****/

12
swad_layout.c
View File

@ -112,7 +112,7 @@ static void Lay_HelpTextEditor (const char *Text,const char *InlineMath,const ch
void Lay_WriteStartOfPage (void)
{
extern struct Act_Actions Act_Actions[Act_NUM_ACTIONS];
extern const char *Txt_STR_LANG_ID[1+Txt_NUM_LANGUAGES];
extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES];
extern const unsigned Txt_Current_CGI_SWAD_Language;
extern const char *The_TabOnBgColors[The_NUM_THEMES];
extern const char *Txt_NEW_YEAR_GREETING;
@ -412,7 +412,7 @@ static void Lay_WritePageTitle (void)
static void Lay_WriteRedirToMyLangOnLogIn (void)
{
extern struct Act_Actions Act_Actions[Act_NUM_ACTIONS];
extern const char *Txt_STR_LANG_ID[1+Txt_NUM_LANGUAGES];
extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES];
fprintf (Gbl.F.Out,"<meta http-equiv=\"refresh\""
" content=\"0; url='%s/%s?act=%ld&amp;ses=%s'\">",
@ -425,7 +425,7 @@ static void Lay_WriteRedirToMyLangOnLogIn (void)
static void Lay_WriteRedirToMyLangOnViewUsrAgd (void)
{
extern struct Act_Actions Act_Actions[Act_NUM_ACTIONS];
extern const char *Txt_STR_LANG_ID[1+Txt_NUM_LANGUAGES];
extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES];
fprintf (Gbl.F.Out,"<meta http-equiv=\"refresh\""
" content=\"0; url='%s/%s?act=%ld&amp;ses=%s&amp;agd=@%s'\">",
@ -638,7 +638,7 @@ static void Lay_WriteScripts (void)
static void Lay_WriteScriptInit (void)
{
extern const char *Txt_STR_LANG_ID[1+Txt_NUM_LANGUAGES];
extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES];
fprintf (Gbl.F.Out,"<script type=\"text/javascript\">\n");
@ -1817,7 +1817,7 @@ void Lay_AdvertisementMobile (void)
/*****************************************************************************/
/*********************** Indent forum or chat title **************************/
/*****************************************************************************/
// IsLastItemInLevel[] is a vector with at least 1+Level booleans
// IsLastItemInLevel[] is a vector with at least 1 + Level booleans
void Lay_IndentDependingOnLevel (unsigned Level,bool IsLastItemInLevel[])
{
@ -1888,7 +1888,7 @@ static void Lay_HelpTextEditor (const char *Text,const char *InlineMath,const ch
void Lay_StartHTMLFile (FILE *File,const char *Title)
{
extern const char *Txt_STR_LANG_ID[1+Txt_NUM_LANGUAGES];
extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES];
fprintf (File,"<!DOCTYPE html>\n"
"<html lang=\"%s\">\n"

4
swad_layout.h
View File

@ -33,10 +33,10 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Lay_MAX_BYTES_ALERT (16*1024-1) // Max. size for alert message
#define Lay_MAX_BYTES_ALERT (16 * 1024 - 1) // Max. size for alert message
// Important: the size of alert message must be enough large to store the longest message.
#define Lay_MAX_BYTES_TITLE (1024-1)
#define Lay_MAX_BYTES_TITLE (1024 - 1)
#define Lay_HIDE_BOTH_COLUMNS 0 // 00
#define Lay_SHOW_RIGHT_COLUMN 1 // 01

10
swad_link.c
View File

@ -409,10 +409,10 @@ static void Lnk_PutParamLnkCod (long LnkCod)
long Lnk_GetParamLnkCod (void)
{
char LongStr[1+10+1];
char LongStr[1 + 10 + 1];
/***** Get parameter with code of link *****/
Par_GetParToText ("LnkCod",LongStr,1+10);
Par_GetParToText ("LnkCod",LongStr,1 + 10);
return Str_ConvertStrCodToLongCod (LongStr);
}
@ -480,7 +480,7 @@ static void Lnk_RenameLink (Cns_ShrtOrFullName_t ShrtOrFullName)
const char *FieldName = NULL; // Initialized to avoid warning
unsigned MaxLength = 0; // Initialized to avoid warning
char *CurrentLnkName = NULL; // Initialized to avoid warning
char NewLnkName[Lnk_MAX_LENGTH_LINK_FULL_NAME+1];
char NewLnkName[Lnk_MAX_LENGTH_LINK_FULL_NAME + 1];
Lnk = &Gbl.Links.EditingLnk;
switch (ShrtOrFullName)
@ -579,8 +579,8 @@ void Lnk_ChangeLinkWWW (void)
extern const char *Txt_The_new_web_address_is_X;
extern const char *Txt_You_can_not_leave_the_web_address_empty;
struct Link *Lnk;
char Query[256+Cns_MAX_LENGTH_WWW];
char NewWWW[Cns_MAX_LENGTH_WWW+1];
char Query[256 + Cns_MAX_LENGTH_WWW];
char NewWWW[Cns_MAX_LENGTH_WWW + 1];
Lnk = &Gbl.Links.EditingLnk;

14
swad_logo.c
View File

@ -76,7 +76,7 @@ void Log_DrawLogo (Sco_Scope_t Scope,long Cod,const char *AltText,
NULL, // Sco_SCOPE_CRS
};
const char *Folder = NULL; // To avoid warning
char PathLogo[PATH_MAX+1];
char PathLogo[PATH_MAX + 1];
bool LogoFound = false;
long InsCod;
long CtrCod;
@ -179,7 +179,7 @@ void Log_PutIconToChangeLogo (Sco_Scope_t Scope)
Act_Action_t Action;
long Cod;
const char *Folder;
char PathLogo[PATH_MAX+1];
char PathLogo[PATH_MAX + 1];
bool LogoExists;
/***** Set variables depending on scope *****/
@ -235,7 +235,7 @@ void Log_RequestLogo (Sco_Scope_t Scope)
const char *Folder;
Act_Action_t ActionRec;
Act_Action_t ActionRem;
char PathLogo[PATH_MAX+1];
char PathLogo[PATH_MAX + 1];
/***** Set action depending on scope *****/
switch (Scope)
@ -317,11 +317,11 @@ void Log_ReceiveLogo (Sco_Scope_t Scope)
extern const char *Txt_The_file_is_not_X;
long Cod;
const char *Folder;
char Path[PATH_MAX+1];
char Path[PATH_MAX + 1];
struct Param *Param;
char FileNameLogoSrc[PATH_MAX+1];
char FileNameLogoSrc[PATH_MAX + 1];
char MIMEType[Brw_MAX_BYTES_MIME_TYPE + 1];
char FileNameLogo[PATH_MAX+1]; // Full name (including path and .png) of the destination file
char FileNameLogo[PATH_MAX + 1]; // Full name (including path and .png) of the destination file
bool WrongType = false;
/***** Set variables depending on scope *****/
@ -399,7 +399,7 @@ void Log_RemoveLogo (Sco_Scope_t Scope)
{
long Cod;
const char *Folder;
char FileNameLogo[PATH_MAX+1]; // Full name (including path and .png) of the destination file
char FileNameLogo[PATH_MAX + 1]; // Full name (including path and .png) of the destination file
/***** Set variables depending on scope *****/
switch (Scope)

30
swad_mail.c
View File

@ -81,7 +81,8 @@ static void Mai_CreateMailDomain (struct Mail *Mai);
static void Mai_RemoveEmail (struct UsrData *UsrDat);
static void Mai_RemoveEmailFromDB (long UsrCod,const char *Email);
static void Mai_NewUsrEmail (struct UsrData *UsrDat,bool ItsMe);
static void Mai_InsertMailKey (const char *Email,const char MailKey[Mai_LENGTH_EMAIL_CONFIRM_KEY+1]);
static void Mai_InsertMailKey (const char *Email,
const char MailKey[Mai_LENGTH_EMAIL_CONFIRM_KEY + 1]);
/*****************************************************************************/
/************************* List all the mail domains *************************/
@ -160,7 +161,7 @@ void Mai_SeeMailDomains (void)
static void Mai_GetParamMaiOrderType (void)
{
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
unsigned UnsignedNum;
Par_GetParToText ("Order",UnsignedStr,10);
@ -532,10 +533,10 @@ static void Mai_PutParamMaiCod (long MaiCod)
long Mai_GetParamMaiCod (void)
{
char LongStr[1+10+1];
char LongStr[1 + 10 + 1];
/***** Get parameter with code of mail *****/
Par_GetParToText ("MaiCod",LongStr,1+10);
Par_GetParToText ("MaiCod",LongStr,1 + 10);
return Str_ConvertStrCodToLongCod (LongStr);
}
@ -603,7 +604,7 @@ static void Mai_RenameMailDomain (Cns_ShrtOrFullName_t ShrtOrFullName)
const char *FieldName = NULL; // Initialized to avoid warning
unsigned MaxLength = 0; // Initialized to avoid warning
char *CurrentMaiName = NULL; // Initialized to avoid warning
char NewMaiName[Mai_MAX_LENGTH_MAIL_INFO+1];
char NewMaiName[Mai_MAX_LENGTH_MAIL_INFO + 1];
Mai = &Gbl.Mails.EditingMai;
switch (ShrtOrFullName)
@ -851,7 +852,7 @@ static void Mai_CreateMailDomain (struct Mail *Mai)
/****** List the emails of all the students to creates an email message ******/
/*****************************************************************************/
#define Mai_MAX_LENGTH_STR_ADDR (32*5000)
#define Mai_MAX_LENGTH_STR_ADDR (32 * 5000)
void Mai_ListEmails (void)
{
@ -1366,7 +1367,7 @@ static void Mai_RemoveEmail (struct UsrData *UsrDat)
{
extern const char *Txt_Email_X_removed;
extern const char *Txt_User_not_found_or_you_do_not_have_permission_;
char Email[Usr_MAX_BYTES_USR_EMAIL+1];
char Email[Usr_MAX_BYTES_USR_EMAIL + 1];
if (Usr_AsAdminICanEditOtherUsr (UsrDat))
{
@ -1448,7 +1449,7 @@ static void Mai_NewUsrEmail (struct UsrData *UsrDat,bool ItsMe)
extern const char *Txt_The_email_address_X_had_been_registered_by_another_user;
extern const char *Txt_The_email_address_entered_X_is_not_valid;
extern const char *Txt_User_not_found_or_you_do_not_have_permission_;
char NewEmail[Usr_MAX_BYTES_USR_EMAIL+1];
char NewEmail[Usr_MAX_BYTES_USR_EMAIL + 1];
if (Usr_AsAdminICanEditOtherUsr (UsrDat))
{
@ -1654,9 +1655,10 @@ void Mai_ShowMsgConfirmEmailHasBeenSent (void)
/************************* Insert mail hey in database ***********************/
/*****************************************************************************/
static void Mai_InsertMailKey (const char *Email,const char MailKey[Mai_LENGTH_EMAIL_CONFIRM_KEY+1])
static void Mai_InsertMailKey (const char *Email,
const char MailKey[Mai_LENGTH_EMAIL_CONFIRM_KEY + 1])
{
char Query[512+Mai_LENGTH_EMAIL_CONFIRM_KEY];
char Query[512 + Mai_LENGTH_EMAIL_CONFIRM_KEY];
/***** Remove expired pending emails from database *****/
sprintf (Query,"DELETE FROM pending_emails"
@ -1686,7 +1688,7 @@ void Mai_ConfirmEmail (void)
char Query[1024];
MYSQL_RES *mysql_res;
MYSQL_ROW row;
char MailKey[Mai_LENGTH_EMAIL_CONFIRM_KEY+1];
char MailKey[Mai_LENGTH_EMAIL_CONFIRM_KEY + 1];
long UsrCod;
char Email[Usr_MAX_BYTES_USR_EMAIL + 1];
bool KeyIsCorrect = false;
@ -1778,8 +1780,8 @@ void Mai_CreateFileNameMail (void)
void Mai_WriteWelcomeNoteEMail (struct UsrData *UsrDat)
{
extern const char *Txt_Dear_NO_HTML[Usr_NUM_SEXS][1+Txt_NUM_LANGUAGES];
extern const char *Txt_user_NO_HTML[Usr_NUM_SEXS][1+Txt_NUM_LANGUAGES];
extern const char *Txt_Dear_NO_HTML[Usr_NUM_SEXS][1 + Txt_NUM_LANGUAGES];
extern const char *Txt_user_NO_HTML[Usr_NUM_SEXS][1 + Txt_NUM_LANGUAGES];
fprintf (Gbl.Msg.FileMail,"%s %s:\n",
Txt_Dear_NO_HTML[UsrDat->Sex][UsrDat->Prefs.Language],
@ -1793,7 +1795,7 @@ void Mai_WriteWelcomeNoteEMail (struct UsrData *UsrDat)
void Mai_WriteFootNoteEMail (Txt_Language_t Language)
{
extern const char *Txt_Please_do_not_reply_to_this_automatically_generated_email_NO_HTML[1+Txt_NUM_LANGUAGES];
extern const char *Txt_Please_do_not_reply_to_this_automatically_generated_email_NO_HTML[1 + Txt_NUM_LANGUAGES];
fprintf (Gbl.Msg.FileMail,"%s\n"
"%s\n"

26
swad_mark.c
View File

@ -187,7 +187,7 @@ static void Mrk_GetNumRowsHeaderAndFooter (struct MarksProperties *Marks)
{
extern const Brw_FileBrowser_t Brw_FileBrowserForDB_files[Brw_NUM_TYPES_FILE_BROWSER];
long Cod = Brw_GetCodForFiles ();
char Query[512+PATH_MAX];
char Query[512 + PATH_MAX];
MYSQL_RES *mysql_res;
MYSQL_ROW row;
unsigned long NumRows;
@ -254,9 +254,9 @@ static void Mrk_ChangeNumRowsHeaderOrFooter (Brw_HeadOrFoot_t HeaderOrFooter)
{
extern const Brw_FileBrowser_t Brw_FileBrowserForDB_files[Brw_NUM_TYPES_FILE_BROWSER];
extern const char *Txt_The_number_of_rows_is_now_X;
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
long Cod;
char Query[512+PATH_MAX];
char Query[512 + PATH_MAX];
unsigned NumRows;
/***** Get parameters related to file browser *****/
@ -302,7 +302,7 @@ bool Mrk_CheckFileOfMarks (const char *Path,struct MarksProperties *Marks)
extern const char *Txt_There_are_more_than_one_table_in_the_file_of_marks;
extern const char *Txt_Table_not_found_in_the_file_of_marks;
// extern const char *Txt_X_header_rows_Y_student_rows_and_Z_footer_rows_found;
char CellContent[Mrk_MAX_BYTES_IN_CELL_CONTENT+1];
char CellContent[Mrk_MAX_BYTES_IN_CELL_CONTENT + 1];
FILE *FileAllMarks;
bool EndOfHead = false;
bool EndOfTable = false;
@ -406,7 +406,7 @@ bool Mrk_CheckFileOfMarks (const char *Path,struct MarksProperties *Marks)
static bool Mrk_CheckIfCellContainsOnlyIDs (const char *CellContent)
{
char UsrIDFromTable[ID_MAX_LENGTH_USR_ID+1];
char UsrIDFromTable[ID_MAX_LENGTH_USR_ID + 1];
const char *Ptr = CellContent;
bool UsrIDFound = false;
bool StuffNotUsrIDFound = false;
@ -445,9 +445,9 @@ static bool Mrk_GetUsrMarks (FILE *FileUsrMarks,struct UsrData *UsrDat,
{
extern const char *Txt_THE_USER_X_is_not_found_in_the_file_of_marks;
unsigned Row;
char CellContent[Mrk_MAX_BYTES_IN_CELL_CONTENT+1];
char CellContent[Mrk_MAX_BYTES_IN_CELL_CONTENT + 1];
const char *Ptr;
char UsrIDFromTable[ID_MAX_LENGTH_USR_ID+1];
char UsrIDFromTable[ID_MAX_LENGTH_USR_ID + 1];
FILE *FileAllMarks;
unsigned NumID;
bool UsrIDFound;
@ -603,10 +603,10 @@ static bool Mrk_GetUsrMarks (FILE *FileUsrMarks,struct UsrData *UsrDat,
void Mrk_ShowMyMarks (void)
{
struct MarksProperties Marks;
char FileNameUsrMarks[PATH_MAX+1];
char FileNameUsrMarks[PATH_MAX + 1];
FILE *FileUsrMarks;
char PathMarksPriv[PATH_MAX+1];
char PathPrivate[PATH_MAX+1];
char PathMarksPriv[PATH_MAX + 1];
char PathPrivate[PATH_MAX + 1];
struct UsrData *UsrDat;
bool UsrIsOK = true;
@ -855,14 +855,14 @@ void Mrk_GetNotifMyMarks (char SummaryStr[Cns_MAX_BYTES_TEXT + 1],
else
{
fclose (FileUsrMarks);
if ((*ContentStr = (char *) malloc (9+strlen (Gbl.Message)+3+1)))
if ((*ContentStr = (char *) malloc (9 + strlen (Gbl.Message) + 3 + 1)))
sprintf (*ContentStr,"<![CDATA[%s]]>",Gbl.Message);
}
}
else
{
sprintf (Gbl.Message,"%s","Can not open file with user's marks!"); // TODO: Need translation!
if ((*ContentStr = (char *) malloc (9+strlen (Gbl.Message)+3+1)))
if ((*ContentStr = (char *) malloc (9 + strlen (Gbl.Message) + 3 + 1)))
sprintf (*ContentStr,"<![CDATA[%s]]>",Gbl.Message);
}
unlink (FileNameUsrMarks); // File with marks is no longer necessary
@ -870,7 +870,7 @@ void Mrk_GetNotifMyMarks (char SummaryStr[Cns_MAX_BYTES_TEXT + 1],
else
{
sprintf (Gbl.Message,"%s","User's IDs not found!"); // TODO: Need translation!
if ((*ContentStr = (char *) malloc (9+strlen (Gbl.Message)+3+1)))
if ((*ContentStr = (char *) malloc (9 + strlen (Gbl.Message) + 3 + 1)))
sprintf (*ContentStr,"<![CDATA[%s]]>",Gbl.Message);
}
}

4
swad_menu.c
View File

@ -435,10 +435,10 @@ void Mnu_ChangeMenu (void)
Mnu_Menu_t Mnu_GetParamMenu (void)
{
char UnsignedStr[1+10+1];
char UnsignedStr[1 + 10 + 1];
unsigned UnsignedNum;
Par_GetParToText ("Menu",UnsignedStr,1+10);
Par_GetParToText ("Menu",UnsignedStr,1 + 10);
if (sscanf (UnsignedStr,"%u",&UnsignedNum) == 1)
if (UnsignedNum < Mnu_NUM_MENUS)
return (Mnu_Menu_t) UnsignedNum;

58
swad_message.c
View File

@ -173,7 +173,7 @@ static void Msg_PutFormMsgUsrs (char Content[Cns_MAX_BYTES_LONG_TEXT + 1])
extern const char *Txt_New_message;
extern const char *Txt_MSG_To;
extern const char *Txt_Send_message;
char YN[1+1];
char YN[1 + 1];
unsigned NumUsrsInCrs = 0; // Initialized to avoid warning
bool ShowUsrsInCrs = false;
bool GetUsrsInCrs;
@ -390,11 +390,11 @@ void Msg_PutHiddenParamsSubjectAndContent (void)
static void Msg_ShowOneUniqueRecipient (void)
{
char PhotoURL[PATH_MAX+1];
char PhotoURL[PATH_MAX + 1];
bool ShowPhoto;
/***** Show user's photo *****/
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (&Gbl.Usrs.Other.UsrDat,PhotoURL);
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (&Gbl.Usrs.Other.UsrDat,PhotoURL);
Pho_ShowUsrPhoto (&Gbl.Usrs.Other.UsrDat,ShowPhoto ? PhotoURL :
NULL,
"PHOTO21x28",Pho_ZOOM,false);
@ -603,7 +603,7 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (char Content[Cns_MAX_BYTES_
void Msg_PutHiddenParamAnotherRecipient (const struct UsrData *UsrDat)
{
char NicknameWithArroba[Nck_MAX_BYTES_NICKNAME_FROM_FORM+1];
char NicknameWithArroba[Nck_MAX_BYTES_NICKNAME_FROM_FORM + 1];
sprintf (NicknameWithArroba,"@%s",UsrDat->Nickname);
Par_PutHiddenParamString ("OtherRecipients",NicknameWithArroba);
@ -637,7 +637,7 @@ void Msg_RecMsgFromUsr (void)
extern const char *Txt_The_message_has_been_sent_to_1_recipient;
extern const char *Txt_The_message_has_been_sent_to_X_recipients;
extern const char *Txt_There_have_been_X_errors_in_sending_the_message;
char YN[1+1];
char YN[1 + 1];
bool IsReply;
bool RecipientHasBannedMe;
bool Replied = false;
@ -1011,10 +1011,10 @@ static void Msg_ShowNumMsgsDeleted (unsigned NumMsgs)
void Msg_GetParamMsgsCrsCod (void)
{
extern const char *Txt_any_course;
char LongStr[1+10+1];
char LongStr[1 + 10 + 1];
struct Course Crs;
Par_GetParToText ("FilterCrsCod",LongStr,1+10);
Par_GetParToText ("FilterCrsCod",LongStr,1 + 10);
Gbl.Msg.FilterCrsCod = Str_ConvertStrCodToLongCod (LongStr);
if (Gbl.Msg.FilterCrsCod > 0) // If origin course specified
{
@ -1037,7 +1037,8 @@ void Msg_GetParamMsgsCrsCod (void)
void Msg_GetParamFilterFromTo (void)
{
/***** Get "from"/"to" filter *****/
Par_GetParToText ("FilterFromTo",Gbl.Msg.FilterFromTo,Usr_MAX_LENGTH_USR_NAME_OR_SURNAME*3);
Par_GetParToText ("FilterFromTo",Gbl.Msg.FilterFromTo,
Usr_MAX_LENGTH_USR_NAME_OR_SURNAME * 3);
}
/*****************************************************************************/
@ -1047,7 +1048,8 @@ void Msg_GetParamFilterFromTo (void)
void Msg_GetParamFilterContent (void)
{
/***** Get content filter *****/
Par_GetParToText ("FilterContent",Gbl.Msg.FilterContent,Msg_MAX_LENGTH_FILTER_CONTENT);
Par_GetParToText ("FilterContent",Gbl.Msg.FilterContent,
Msg_MAX_LENGTH_FILTER_CONTENT);
}
/*****************************************************************************/
@ -1306,7 +1308,7 @@ static long Msg_InsertNewMsg (const char *Subject,const char *Content,
if ((Query = malloc (512 +
strlen (Subject) +
strlen (Content) +
Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64+
Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64 +
Img_MAX_BYTES_TITLE)) == NULL)
Lay_ShowErrorAndExit ("Not enough memory to store database query.");
@ -1350,7 +1352,7 @@ static long Msg_InsertNewMsg (const char *Subject,const char *Content,
static unsigned long Msg_DelSomeRecOrSntMsgsUsr (Msg_TypeOfMessages_t TypeOfMessages,long UsrCod,
long FilterCrsCod,const char *FilterFromToSubquery)
{
char Query[Msg_MAX_LENGTH_MESSAGES_QUERY+1];
char Query[Msg_MAX_LENGTH_MESSAGES_QUERY + 1];
MYSQL_RES *mysql_res;
MYSQL_ROW row;
unsigned long MsgNum,NumMsgs;
@ -1590,8 +1592,8 @@ static bool Msg_CheckIfReceivedMsgIsDeletedForAllItsRecipients (long MsgCod)
static unsigned Msg_GetNumUnreadMsgs (long FilterCrsCod,const char *FilterFromToSubquery)
{
char SubQuery[Msg_MAX_LENGTH_MESSAGES_QUERY+1];
char Query[Msg_MAX_LENGTH_MESSAGES_QUERY+1];
char SubQuery[Msg_MAX_LENGTH_MESSAGES_QUERY + 1];
char Query[Msg_MAX_LENGTH_MESSAGES_QUERY + 1];
/***** Get number of unread messages from database *****/
if (FilterCrsCod >= 0) // If origin course selected
@ -1684,7 +1686,7 @@ static void Msg_ShowSentOrReceivedMessages (void)
extern const char *Txt_Filter;
extern const char *Txt_Update_messages;
char FilterFromToSubquery[Msg_MAX_LENGTH_MESSAGES_QUERY + 1];
char Query[Msg_MAX_LENGTH_MESSAGES_QUERY+1];
char Query[Msg_MAX_LENGTH_MESSAGES_QUERY + 1];
MYSQL_RES *mysql_res;
MYSQL_ROW row;
unsigned long NumRow;
@ -1879,7 +1881,7 @@ static void Msg_PutLinkToViewBannedUsers(void)
static void Msg_ConstructQueryToSelectSentOrReceivedMsgs (char *Query,long UsrCod,
long FilterCrsCod,const char *FilterFromToSubquery)
{
char SubQuery[Msg_MAX_LENGTH_MESSAGES_QUERY+1];
char SubQuery[Msg_MAX_LENGTH_MESSAGES_QUERY + 1];
char *PtrQuery;
const char *StrUnreadMsg;
@ -2600,7 +2602,7 @@ void Msg_ShowFormToFilterMsgs (void)
"</td>",
The_ClassForm[Gbl.Prefs.Theme],
TxtFromTo[Gbl.Msg.TypeOfMessages],
Usr_MAX_LENGTH_USR_NAME_OR_SURNAME*3,Gbl.Msg.FilterFromTo);
Usr_MAX_LENGTH_USR_NAME_OR_SURNAME * 3,Gbl.Msg.FilterFromTo);
/***** Filter message content *****/
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">"
@ -2647,7 +2649,7 @@ static void Msg_ShowFormToShowOnlyUnreadMessages (void)
static void Msg_GetParamOnlyUnreadMsgs (void)
{
char YN[1+1];
char YN[1 + 1];
/***** Get parameter to show only unread (received) messages *****/
Par_GetParToText ("OnlyUnreadMsgs",YN,1);
@ -3126,7 +3128,7 @@ void Msg_WriteMsgAuthor (struct UsrData *UsrDat,
{
extern const char *Txt_Unknown_or_without_photo;
bool ShowPhoto = false;
char PhotoURL[PATH_MAX+1];
char PhotoURL[PATH_MAX + 1];
bool WriteAuthor = false;
/***** Start first column *****/
@ -3143,7 +3145,7 @@ void Msg_WriteMsgAuthor (struct UsrData *UsrDat,
if (WriteAuthor)
{
/***** First column with author's photo (if author has a web page, put a link to it) *****/
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (UsrDat,PhotoURL);
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (UsrDat,PhotoURL);
Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL :
NULL,
"PHOTO30x40",Pho_ZOOM,false);
@ -3284,7 +3286,7 @@ static void Msg_WriteMsgFrom (struct UsrData *UsrDat,bool Deleted)
extern const char *Txt_MSG_Sent_and_deleted;
extern const char *Txt_ROLES_SINGUL_abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
bool ShowPhoto;
char PhotoURL[PATH_MAX+1];
char PhotoURL[PATH_MAX + 1];
/***** Put an icon to show if user has read the message *****/
fprintf (Gbl.F.Out,"<table>"
@ -3304,7 +3306,7 @@ static void Msg_WriteMsgFrom (struct UsrData *UsrDat,bool Deleted)
/***** Put user's photo *****/
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\" style=\"width:30px;\">");
ShowPhoto = (Pho_ShowUsrPhotoIsAllowed (UsrDat,PhotoURL));
ShowPhoto = (Pho_ShowingUsrPhotoIsAllowed (UsrDat,PhotoURL));
Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL :
NULL,
"PHOTO21x28",Pho_ZOOM,false);
@ -3360,14 +3362,14 @@ static void Msg_WriteMsgTo (long MsgCod)
unsigned NumRecipientsKnown;
unsigned NumRecipientsUnknown;
unsigned NumRecipientsToShow;
char YN[1+1];
char YN[1 + 1];
struct UsrData UsrDat;
bool Deleted;
bool OpenByDst;
bool UsrValid;
bool ShowPhoto;
const char *Title;
char PhotoURL[PATH_MAX+1];
char PhotoURL[PATH_MAX + 1];
static const Act_Action_t ActionSee[Msg_NUM_TYPES_OF_MSGS] =
{
ActSeeRcvMsg,
@ -3454,7 +3456,7 @@ static void Msg_WriteMsgTo (long MsgCod)
/* Put user's photo */
fprintf (Gbl.F.Out,"<td class=\"CENTER_TOP\" style=\"width:30px;\">");
ShowPhoto = (UsrValid ? Pho_ShowUsrPhotoIsAllowed (&UsrDat,PhotoURL) :
ShowPhoto = (UsrValid ? Pho_ShowingUsrPhotoIsAllowed (&UsrDat,PhotoURL) :
false);
Pho_ShowUsrPhoto (&UsrDat,ShowPhoto ? PhotoURL :
NULL,
@ -3597,10 +3599,10 @@ void Msg_PutHiddenParamMsgCod (long MsgCod)
static long Msg_GetParamMsgCod (void)
{
char LongStr[1+10+1];
char LongStr[1 + 10 + 1];
/***** Get parameter with code of message *****/
Par_GetParToText ("MsgCod",LongStr,1+10);
Par_GetParToText ("MsgCod",LongStr,1 + 10);
return Str_ConvertStrCodToLongCod (LongStr);
}
@ -3777,7 +3779,7 @@ void Msg_ListBannedUsrs (void)
unsigned NumUsr,NumUsrs;
struct UsrData UsrDat;
bool ShowPhoto;
char PhotoURL[PATH_MAX+1];
char PhotoURL[PATH_MAX + 1];
/***** Get my banned users *****/
sprintf (Query,"SELECT msg_banned.FromUsrCod FROM msg_banned,usr_data"
@ -3828,7 +3830,7 @@ void Msg_ListBannedUsrs (void)
/* Show photo */
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\""
" style=\"width:30px;\">");
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (&UsrDat,PhotoURL);
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (&UsrDat,PhotoURL);
Pho_ShowUsrPhoto (&UsrDat,ShowPhoto ? PhotoURL :
NULL,
"PHOTO21x28",Pho_ZOOM,false);

10
swad_network.c
View File

@ -203,7 +203,7 @@ void Net_ShowWebsAndSocialNets (const struct UsrData *UsrDat)
MYSQL_RES *mysql_res;
MYSQL_ROW row;
Net_WebsAndSocialNetworks_t NumURL;
char URL[Cns_MAX_LENGTH_WWW+1];
char URL[Cns_MAX_LENGTH_WWW + 1];
/***** Start container *****/
fprintf (Gbl.F.Out,"<div class=\"REC_WEBS\">");
@ -295,7 +295,7 @@ void Net_ShowFormMyWebsAndSocialNets (void)
MYSQL_RES *mysql_res;
MYSQL_ROW row;
Net_WebsAndSocialNetworks_t NumURL;
char URL[Cns_MAX_LENGTH_WWW+1];
char URL[Cns_MAX_LENGTH_WWW + 1];
/***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_Webs_social_networks,
@ -392,11 +392,11 @@ void Net_UpdateMyWebsAndSocialNets (void)
static void Net_GetMyWebsAndSocialNetsFromForm (void)
{
char Query[256+Cns_MAX_LENGTH_WWW];
char UnsignedStr[10+1];
char Query[256 + Cns_MAX_LENGTH_WWW];
char UnsignedStr[10 + 1];
unsigned UnsignedNum;
Net_WebsAndSocialNetworks_t Web;
char URL[Cns_MAX_LENGTH_WWW+1];
char URL[Cns_MAX_LENGTH_WWW + 1];
/***** Get parameter with the type of web / social network *****/
Par_GetParToText ("Web",UnsignedStr,10);

10
swad_nickname.c
View File

@ -64,7 +64,7 @@ static void Nck_RemoveNicknameFromDB (const char *Nickname);
bool Nck_CheckIfNickWithArrobaIsValid (const char *NicknameWithArroba)
{
char NicknameWithoutArroba[Nck_MAX_BYTES_NICKNAME_FROM_FORM+1];
char NicknameWithoutArroba[Nck_MAX_BYTES_NICKNAME_FROM_FORM + 1];
unsigned Length;
const char *Ptr;
@ -197,7 +197,7 @@ void Nck_ShowFormChangeUsrNickname (void)
MYSQL_ROW row;
unsigned NumNicks;
unsigned NumNick;
char NicknameWithArroba[Nck_MAX_BYTES_NICKNAME_FROM_FORM+1];
char NicknameWithArroba[Nck_MAX_BYTES_NICKNAME_FROM_FORM + 1];
/***** Get my nicknames *****/
sprintf (Query,"SELECT Nickname FROM usr_nicknames"
@ -307,7 +307,7 @@ void Nck_RemoveNick (void)
{
extern const char *Txt_Nickname_X_removed;
extern const char *Txt_You_can_not_delete_your_current_nickname;
char NicknameWithoutArroba[Nck_MAX_LENGTH_NICKNAME_WITHOUT_ARROBA+1];
char NicknameWithoutArroba[Nck_MAX_LENGTH_NICKNAME_WITHOUT_ARROBA + 1];
/***** Get new nickname from form *****/
Par_GetParToText ("Nick",NicknameWithoutArroba,Nck_MAX_LENGTH_NICKNAME_WITHOUT_ARROBA);
@ -354,8 +354,8 @@ void Nck_UpdateNick (void)
extern const char *Txt_Your_nickname_X_has_been_registered_successfully;
extern const char *Txt_The_nickname_entered_X_is_not_valid_;
char Query[1024];
char NewNicknameWithArroba[Nck_MAX_BYTES_NICKNAME_FROM_FORM+1];
char NewNicknameWithoutArroba[Nck_MAX_BYTES_NICKNAME_FROM_FORM+1];
char NewNicknameWithArroba[Nck_MAX_BYTES_NICKNAME_FROM_FORM + 1];
char NewNicknameWithoutArroba[Nck_MAX_BYTES_NICKNAME_FROM_FORM + 1];
bool Error = false;
/***** Get new nickname from form *****/

2
swad_nickname.h
View File

@ -37,7 +37,7 @@
#define Nck_MAX_BYTES_NICKNAME_FROM_FORM (128 - 1) // For variables that store characters typed in a form
#define Nck_MAX_BYTES_LIST_NICKS ((Nck_MAX_BYTES_NICKNAME_FROM_FORM+2)*Cfg_MAX_USRS_IN_LIST)
#define Nck_MAX_BYTES_LIST_NICKS ((Nck_MAX_BYTES_NICKNAME_FROM_FORM + 2) * Cfg_MAX_USRS_IN_LIST)
/*****************************************************************************/
/***************************** Public prototypes *****************************/

10
swad_notice.c
View File

@ -129,7 +129,7 @@ void Not_ReceiveNotice (void)
long NotCod;
unsigned NumUsrsToBeNotifiedByEMail;
struct SocialPublishing SocPub;
char Content[Cns_MAX_BYTES_TEXT+1];
char Content[Cns_MAX_BYTES_TEXT + 1];
/***** Get the text of the notice *****/
Par_GetParAndChangeFormat ("Content",Content,Cns_MAX_BYTES_TEXT,
@ -160,7 +160,7 @@ void Not_ReceiveNotice (void)
static long Not_InsertNoticeInDB (const char *Content)
{
char Query[256+Cns_MAX_BYTES_TEXT];
char Query[256 + Cns_MAX_BYTES_TEXT];
/***** Insert notice in the database *****/
sprintf (Query,"INSERT INTO notices (CrsCod,UsrCod,CreatTime,Content,Status)"
@ -345,7 +345,7 @@ void Not_ShowNotices (Not_Listing_t TypeNoticesListing)
char Query[512];
MYSQL_RES *mysql_res;
MYSQL_ROW row;
char StrWidth[10+2+1];
char StrWidth[10 + 2 + 1];
char PathRelRSSFile[PATH_MAX + 1];
long NotCod;
unsigned long NumNot;
@ -996,11 +996,11 @@ void Not_PutHiddenParamNotCod (long NotCod)
static long Not_GetParamNotCod (void)
{
char LongStr[1+10+1]; // String that holds the notice code
char LongStr[1 + 10 + 1]; // String that holds the notice code
long NotCod;
/* Get notice code */
Par_GetParToText ("NotCod",LongStr,1+10);
Par_GetParToText ("NotCod",LongStr,1 + 10);
if (sscanf (LongStr,"%ld",&NotCod) != 1)
Lay_ShowErrorAndExit ("Wrong code of notice.");

26
swad_notification.c
View File

@ -673,7 +673,7 @@ static void Ntf_WriteFormAllNotifications (bool AllNotifications)
static bool Ntf_GetAllNotificationsFromForm (void)
{
char YN[1+1];
char YN[1 + 1];
Par_GetParToText ("All",YN,1);
return (Str_ConvertToUpperLetter (YN[0]) == 'Y');
@ -826,7 +826,7 @@ static void Ntf_PutHiddenParamNotifyEvent (Ntf_NotifyEvent_t NotifyEvent)
Ntf_NotifyEvent_t Ntf_GetParamNotifyEvent (void)
{
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
unsigned UnsignedNum;
Par_GetParToText ("NotifyEvent",UnsignedStr,10);
@ -1542,16 +1542,16 @@ void Ntf_SendPendingNotifByEMailToAllUsrs (void)
static void Ntf_SendPendingNotifByEMailToOneUsr (struct UsrData *ToUsrDat,unsigned *NumNotif,unsigned *NumMails)
{
extern const char *Txt_NOTIFY_EVENTS_There_is_a_new_event_NO_HTML[1+Txt_NUM_LANGUAGES];
extern const char *Txt_NOTIFY_EVENTS_There_are_X_new_events_NO_HTML[1+Txt_NUM_LANGUAGES];
extern const char *Txt_NOTIFY_EVENTS_SINGULAR_NO_HTML[Ntf_NUM_NOTIFY_EVENTS][1+Txt_NUM_LANGUAGES];
extern const char *Txt_Course_NO_HTML[1+Txt_NUM_LANGUAGES];
extern const char *Txt_Forum_NO_HTML[1+Txt_NUM_LANGUAGES];
extern const char *Txt_MSG_From_NO_HTML[1+Txt_NUM_LANGUAGES];
extern const char *Txt_Go_to_NO_HTML[1+Txt_NUM_LANGUAGES];
extern const char *Txt_TAB_Messages_NO_HTML[1+Txt_NUM_LANGUAGES];
extern const char *Txt_Notifications_NO_HTML[1+Txt_NUM_LANGUAGES];
extern const char *Txt_If_you_no_longer_wish_to_receive_email_notifications_NO_HTML[1+Txt_NUM_LANGUAGES];
extern const char *Txt_NOTIFY_EVENTS_There_is_a_new_event_NO_HTML[1 + Txt_NUM_LANGUAGES];
extern const char *Txt_NOTIFY_EVENTS_There_are_X_new_events_NO_HTML[1 + Txt_NUM_LANGUAGES];
extern const char *Txt_NOTIFY_EVENTS_SINGULAR_NO_HTML[Ntf_NUM_NOTIFY_EVENTS][1 + Txt_NUM_LANGUAGES];
extern const char *Txt_Course_NO_HTML[1 + Txt_NUM_LANGUAGES];
extern const char *Txt_Forum_NO_HTML[1 + Txt_NUM_LANGUAGES];
extern const char *Txt_MSG_From_NO_HTML[1 + Txt_NUM_LANGUAGES];
extern const char *Txt_Go_to_NO_HTML[1 + Txt_NUM_LANGUAGES];
extern const char *Txt_TAB_Messages_NO_HTML[1 + Txt_NUM_LANGUAGES];
extern const char *Txt_Notifications_NO_HTML[1 + Txt_NUM_LANGUAGES];
extern const char *Txt_If_you_no_longer_wish_to_receive_email_notifications_NO_HTML[1 + Txt_NUM_LANGUAGES];
char Query[512];
MYSQL_RES *mysql_res;
MYSQL_ROW row;
@ -1956,7 +1956,7 @@ void Ntf_PutFormChangeNotifSentByEMail (void)
static void Ntf_GetParamsNotifyEvents (void)
{
Ntf_NotifyEvent_t NotifyEvent;
char YN[1+1];
char YN[1 + 1];
bool CreateNotifForThisEvent;
Gbl.Usrs.Me.UsrDat.Prefs.NotifNtfEvents = 0;

10
swad_pagination.c
View File

@ -447,7 +447,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,long ThrCod,struct P
if (Pagination->RightPage > Pagination->EndPage &&
Pagination->RightPage < Pagination->NumPags)
{
if (Pagination->RightPage > Pagination->EndPage+1)
if (Pagination->RightPage > Pagination->EndPage + 1)
fprintf (Gbl.F.Out,"<td class=\"%s LEFT_MIDDLE\">"
"&hellip;"
"</td>",
@ -523,7 +523,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,long ThrCod,struct P
/***** Possible link to last page *****/
if (Pagination->EndPage < Pagination->NumPags)
{
if (Pagination->NumPags > Pagination->RightPage+1)
if (Pagination->NumPags > Pagination->RightPage + 1)
fprintf (Gbl.F.Out,"<td class=\"%s LEFT_MIDDLE\">"
"&hellip;"
"</td>",
@ -616,7 +616,7 @@ void Pag_PutHiddenParamPagNum (unsigned NumPage)
void Pag_GetParamPagNum (Pag_WhatPaginate_t WhatPaginate)
{
static bool FirstCall = true;
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
unsigned NumPage;
if (FirstCall)
@ -657,7 +657,7 @@ void Pag_GetParamPagNum (Pag_WhatPaginate_t WhatPaginate)
void Pag_SaveLastPageMsgIntoSession (Pag_WhatPaginate_t WhatPaginate,unsigned NumPage)
{
char Query[128+Ses_LENGTH_SESSION_ID];
char Query[128 + Ses_LENGTH_SESSION_ID];
/***** Save last page of received/sent messages *****/
sprintf (Query,"UPDATE sessions SET %s='%u' WHERE SessionId='%s'",
@ -673,7 +673,7 @@ void Pag_SaveLastPageMsgIntoSession (Pag_WhatPaginate_t WhatPaginate,unsigned Nu
unsigned Pag_GetLastPageMsgFromSession (Pag_WhatPaginate_t WhatPaginate)
{
char Query[128+Ses_LENGTH_SESSION_ID];
char Query[128 + Ses_LENGTH_SESSION_ID];
MYSQL_RES *mysql_res;
MYSQL_ROW row;
unsigned long NumRows;

30
swad_parameter.c
View File

@ -293,10 +293,10 @@ static void Par_CreateListOfParamsFromQueryString (void)
/*****************************************************************************/
// TODO: Rename Gbl.F.Tmp to Gbl.F.In (InFile, QueryFile)?
#define Par_LENGTH_OF_STR_BEFORE_PARAM 38 // Length of "Content-Disposition: form-data; name=\""
#define Par_LENGTH_OF_STR_FILENAME 12 // Length of "; filename=\""
#define Par_LENGTH_OF_STR_CONTENT_TYPE 14 // Length of "Content-Type: "
#define Par_MAX_BYTES_STR_AUX (38+1) // Space to read any of the three preceding strings
#define Par_LENGTH_OF_STR_BEFORE_PARAM 38 // Length of "Content-Disposition: form-data; name=\""
#define Par_LENGTH_OF_STR_FILENAME 12 // Length of "; filename=\""
#define Par_LENGTH_OF_STR_CONTENT_TYPE 14 // Length of "Content-Type: "
#define Par_MAX_BYTES_STR_AUX (38 + 1) // Space to read any of the three preceding strings
static void Par_CreateListOfParamsFromTmpFile (void)
{
@ -307,7 +307,7 @@ static void Par_CreateListOfParamsFromTmpFile (void)
struct Param *Param = NULL; // Initialized to avoid warning
struct Param *NewParam;
int Ch;
char StrAux[Par_MAX_BYTES_STR_AUX+1];
char StrAux[Par_MAX_BYTES_STR_AUX + 1];
/***** Go over the file
getting start positions and lengths of parameters *****/
@ -359,7 +359,7 @@ static void Par_CreateListOfParamsFromTmpFile (void)
{
Str_GetNextStrFromFileConvertingToLower (Gbl.F.Tmp,StrAux,
Par_LENGTH_OF_STR_FILENAME-1);
if (!strcasecmp (StrAux,StringFilename+1)) // Start of filename
if (!strcasecmp (StrAux,StringFilename + 1)) // Start of filename
{
/* Get filename */
CurPos = (unsigned long) ftell (Gbl.F.Tmp); // At start of filename
@ -648,13 +648,13 @@ static bool Par_CheckIsParamCanBeUsedInGETMethod (const char *ParamName)
void Par_GetMainParameters (void)
{
extern Act_Action_t Act_FromActCodToAction[1+Act_MAX_ACTION_COD];
extern Act_Action_t Act_FromActCodToAction[1 + Act_MAX_ACTION_COD];
extern const char *The_ThemeId[The_NUM_THEMES];
extern const char *Ico_IconSetId[Ico_NUM_ICON_SETS];
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
unsigned UnsignedNum;
char Nickname[Nck_MAX_BYTES_NICKNAME_FROM_FORM+1];
char LongStr[1+10+1];
char Nickname[Nck_MAX_BYTES_NICKNAME_FROM_FORM + 1];
char LongStr[1 + 10 + 1];
/***** Reset codes of country, institution, centre, degree and course *****/
Gbl.CurrentCty.Cty.CtyCod =
@ -802,7 +802,7 @@ void Par_GetMainParameters (void)
}
/***** Get country if exists (from menu) *****/
Par_GetParToText ("cty",LongStr,1+10);
Par_GetParToText ("cty",LongStr,1 + 10);
if (LongStr[0]) // Parameter "cty" available
{
Gbl.CurrentCty.Cty.CtyCod = Str_ConvertStrCodToLongCod (LongStr);
@ -813,7 +813,7 @@ void Par_GetMainParameters (void)
}
/***** Get institution if exists (from menu) *****/
Par_GetParToText ("ins",LongStr,1+10);
Par_GetParToText ("ins",LongStr,1 + 10);
if (LongStr[0]) // Parameter "ins" available
{
Gbl.CurrentIns.Ins.InsCod = Str_ConvertStrCodToLongCod (LongStr);
@ -823,7 +823,7 @@ void Par_GetMainParameters (void)
}
/***** Get centre if exists (from menu) *****/
Par_GetParToText ("ctr",LongStr,1+10);
Par_GetParToText ("ctr",LongStr,1 + 10);
if (LongStr[0]) // Parameter "ctr" available
{
Gbl.CurrentCtr.Ctr.CtrCod = Str_ConvertStrCodToLongCod (LongStr);
@ -832,7 +832,7 @@ void Par_GetMainParameters (void)
}
/***** Get numerical degree code if exists (from menu) *****/
Par_GetParToText ("deg",LongStr,1+10);
Par_GetParToText ("deg",LongStr,1 + 10);
if (LongStr[0]) // Parameter "deg" available
{
Gbl.CurrentDeg.Deg.DegCod = Str_ConvertStrCodToLongCod (LongStr);
@ -840,7 +840,7 @@ void Par_GetMainParameters (void)
}
/***** Get numerical course code if exists (from menu) *****/
Par_GetParToText ("crs",LongStr,1+10);
Par_GetParToText ("crs",LongStr,1 + 10);
if (LongStr[0]) // Parameter "crs" available
Gbl.CurrentCrs.Crs.CrsCod = Str_ConvertStrCodToLongCod (LongStr); // Overwrite CrsCod from session

36
swad_password.c
View File

@ -67,7 +67,7 @@ extern struct Globals Gbl;
static void Pwd_PutLinkToSendNewPasswdParams (void);
static void Pwd_CreateANewPassword (char PlainPassword[Pwd_MAX_LENGTH_PLAIN_PASSWORD+1]);
static void Pwd_CreateANewPassword (char PlainPassword[Pwd_MAX_LENGTH_PLAIN_PASSWORD + 1]);
static bool Pwd_CheckIfPasswdIsUsrIDorName (const char *PlainPassword);
static unsigned Pwd_GetNumOtherUsrsWhoUseThisPassword (const char *EncryptedPassword,long UsrCod);
@ -105,7 +105,7 @@ bool Pwd_CheckCurrentPassword (void)
bool Pwd_CheckPendingPassword (void)
{
char Query[256+Cry_LENGTH_ENCRYPTED_STR_SHA512_BASE64];
char Query[256 + Cry_LENGTH_ENCRYPTED_STR_SHA512_BASE64];
MYSQL_RES *mysql_res;
MYSQL_ROW row;
@ -160,9 +160,9 @@ void Pwd_ActChgMyPwd1 (void)
extern const char *Txt_You_have_not_written_twice_the_same_new_password;
extern const char *Txt_Your_password_has_been_changed_successfully;
extern const char *Txt_You_have_not_entered_your_password_correctly;
char PlainPassword[Pwd_MAX_LENGTH_PLAIN_PASSWORD+1];
char NewPlainPassword[2][Pwd_MAX_LENGTH_PLAIN_PASSWORD+1];
char NewEncryptedPassword[Cry_LENGTH_ENCRYPTED_STR_SHA512_BASE64+1];
char PlainPassword[Pwd_MAX_LENGTH_PLAIN_PASSWORD + 1];
char NewPlainPassword[2][Pwd_MAX_LENGTH_PLAIN_PASSWORD + 1];
char NewEncryptedPassword[Cry_LENGTH_ENCRYPTED_STR_SHA512_BASE64 + 1];
/***** Get plain password from form *****/
Par_GetParToText ("UsrPwd",PlainPassword,Pwd_MAX_LENGTH_PLAIN_PASSWORD);
@ -280,7 +280,7 @@ void Pwd_ChkIdLoginAndSendNewPwd (void)
extern const char *Txt_If_you_have_written_your_ID_nickname_or_email_correctly_;
extern const char *Txt_There_are_more_than_one_user_with_the_ID_X_Please_type_a_nick_or_email;
struct ListUsrCods ListUsrCods;
char NewRandomPlainPassword[Pwd_MAX_LENGTH_PLAIN_PASSWORD+1];
char NewRandomPlainPassword[Pwd_MAX_LENGTH_PLAIN_PASSWORD + 1];
int ReturnCode;
/***** Check if user's ID or nickname is not empty *****/
@ -391,10 +391,10 @@ void Pwd_ChkIdLoginAndSendNewPwd (void)
// Gbl.Usrs.Me.UsrDat must be filled
// Return code returned by command
int Pwd_SendNewPasswordByEmail (char NewRandomPlainPassword[Pwd_MAX_LENGTH_PLAIN_PASSWORD+1])
int Pwd_SendNewPasswordByEmail (char NewRandomPlainPassword[Pwd_MAX_LENGTH_PLAIN_PASSWORD + 1])
{
extern const char *Txt_The_following_password_has_been_assigned_to_you_to_log_in_X_NO_HTML;
extern const char *Txt_New_password_NO_HTML[1+Txt_NUM_LANGUAGES];
extern const char *Txt_New_password_NO_HTML[1 + Txt_NUM_LANGUAGES];
char Command[2048]; // Command to execute for sending an email
int ReturnCode;
@ -410,8 +410,8 @@ int Pwd_SendNewPasswordByEmail (char NewRandomPlainPassword[Pwd_MAX_LENGTH_PLAIN
/* Message body */
fprintf (Gbl.Msg.FileMail,Txt_The_following_password_has_been_assigned_to_you_to_log_in_X_NO_HTML,
Cfg_PLATFORM_SHORT_NAME,NewRandomPlainPassword,
Cfg_URL_SWAD_CGI,(unsigned) (Cfg_TIME_TO_DELETE_OLD_PENDING_PASSWORDS/(24L*60L*60L)),
Cfg_PLATFORM_SHORT_NAME,NewRandomPlainPassword,Cfg_URL_SWAD_CGI,
(unsigned) (Cfg_TIME_TO_DELETE_OLD_PENDING_PASSWORDS / (24L * 60L * 60L)),
Gbl.Usrs.Me.UsrDat.Email);
/* Footer note */
@ -445,7 +445,7 @@ int Pwd_SendNewPasswordByEmail (char NewRandomPlainPassword[Pwd_MAX_LENGTH_PLAIN
/*********************** Create a new random password ************************/
/*****************************************************************************/
static void Pwd_CreateANewPassword (char PlainPassword[Pwd_MAX_LENGTH_PLAIN_PASSWORD+1])
static void Pwd_CreateANewPassword (char PlainPassword[Pwd_MAX_LENGTH_PLAIN_PASSWORD + 1])
{
Str_CreateRandomAlphanumStr (PlainPassword,Pwd_MIN_LENGTH_PLAIN_PASSWORD);
}
@ -454,7 +454,7 @@ static void Pwd_CreateANewPassword (char PlainPassword[Pwd_MAX_LENGTH_PLAIN_PASS
/*************************** Set my pending password *************************/
/*****************************************************************************/
void Pwd_SetMyPendingPassword (char PlainPassword[Pwd_MAX_LENGTH_PLAIN_PASSWORD+1])
void Pwd_SetMyPendingPassword (char PlainPassword[Pwd_MAX_LENGTH_PLAIN_PASSWORD + 1])
{
char Query[512];
@ -483,8 +483,8 @@ void Pwd_UpdateOtherPwd1 (void)
extern const char *Txt_You_have_not_written_twice_the_same_new_password;
extern const char *Txt_The_X_password_has_been_changed_successfully;
extern const char *Txt_User_not_found_or_you_do_not_have_permission_;
char NewPlainPassword[2][Pwd_MAX_LENGTH_PLAIN_PASSWORD+1];
char NewEncryptedPassword[Cry_LENGTH_ENCRYPTED_STR_SHA512_BASE64+1];
char NewPlainPassword[2][Pwd_MAX_LENGTH_PLAIN_PASSWORD + 1];
char NewEncryptedPassword[Cry_LENGTH_ENCRYPTED_STR_SHA512_BASE64 + 1];
Gbl.Usrs.Error = true;
@ -578,7 +578,7 @@ bool Pwd_SlowCheckIfPasswordIsGood (const char *PlainPassword,
static bool Pwd_CheckIfPasswdIsUsrIDorName (const char *PlainPassword)
{
char Query[128+3*Pwd_MAX_LENGTH_PLAIN_PASSWORD];
char Query[128 + 3 * Pwd_MAX_LENGTH_PLAIN_PASSWORD];
bool Found;
/***** Get if password is found in user's ID from database *****/
@ -922,9 +922,9 @@ bool Pwd_GetConfirmationOnDangerousAction (void)
{
extern const char *Txt_You_have_not_confirmed_the_action;
extern const char *Txt_You_have_not_entered_your_password_correctly;
char YN[1+1];
char PlainPassword[Pwd_MAX_LENGTH_PLAIN_PASSWORD+1];
char EncryptedPassword[Cry_LENGTH_ENCRYPTED_STR_SHA512_BASE64+1];
char YN[1 + 1];
char PlainPassword[Pwd_MAX_LENGTH_PLAIN_PASSWORD + 1];
char EncryptedPassword[Cry_LENGTH_ENCRYPTED_STR_SHA512_BASE64 + 1];
/***** Get if consent has been done *****/
Par_GetParToText ("Consent",YN,1);

4
swad_password.h
View File

@ -50,8 +50,8 @@ void Pwd_ActChgMyPwd2 (void);
void Pwd_PutLinkToSendNewPasswd (void);
void Pwd_ShowFormSendNewPwd (void);
void Pwd_ChkIdLoginAndSendNewPwd (void);
int Pwd_SendNewPasswordByEmail (char NewRandomPlainPassword[Pwd_MAX_LENGTH_PLAIN_PASSWORD+1]);
void Pwd_SetMyPendingPassword (char PlainPassword[Pwd_MAX_LENGTH_PLAIN_PASSWORD+1]);
int Pwd_SendNewPasswordByEmail (char NewRandomPlainPassword[Pwd_MAX_LENGTH_PLAIN_PASSWORD + 1]);
void Pwd_SetMyPendingPassword (char PlainPassword[Pwd_MAX_LENGTH_PLAIN_PASSWORD + 1]);
void Pwd_UpdateOtherPwd1 (void);
void Pwd_UpdateOtherPwd2 (void);

55
swad_photo.c
View File

@ -182,7 +182,7 @@ void Pho_PutLinkToChangeOtherUsrPhoto (void)
extern const char *Txt_Change_photo;
extern const char *Txt_Upload_photo;
bool PhotoExists;
char PhotoURL[PATH_MAX+1];
char PhotoURL[PATH_MAX + 1];
const char *TitleText;
/***** Link for changing / uploading the photo *****/
@ -227,7 +227,7 @@ static void Pho_PutIconToRequestRemoveMyPhoto (void)
static void Pho_PutIconToRequestRemoveOtherUsrPhoto (void)
{
extern const char *Txt_Remove_photo;
char PhotoURL[PATH_MAX+1];
char PhotoURL[PATH_MAX + 1];
bool PhotoExists;
/***** Link to request the removal of another user's photo *****/
@ -272,7 +272,7 @@ static void Pho_ReqMyPhoto (void)
static void Pho_ReqOtherUsrPhoto (void)
{
char PhotoURL[PATH_MAX+1];
char PhotoURL[PATH_MAX + 1];
/***** Get photo URL *****/
Pho_BuildLinkToPhoto (&Gbl.Usrs.Other.UsrDat,PhotoURL);
@ -466,7 +466,7 @@ void Pho_ReqRemoveUsrPhoto (void)
extern const char *Txt_Remove_photo;
extern const char *Txt_The_photo_no_longer_exists;
extern const char *Txt_User_not_found_or_you_do_not_have_permission_;
char PhotoURL[PATH_MAX+1];
char PhotoURL[PATH_MAX + 1];
/***** Get user's code from form *****/
Usr_GetParamOtherUsrCodEncryptedAndGetListIDs ();
@ -805,8 +805,8 @@ void Pho_UpdateUsrPhoto2 (void)
static void Pho_UpdatePhoto1 (struct UsrData *UsrDat)
{
char PathPhotoTmp[PATH_MAX+1]; // Full name (including path and .jpg) of the temporary file with the selected face
char PathRelPhoto[PATH_MAX+1];
char PathPhotoTmp[PATH_MAX + 1]; // Full name (including path and .jpg) of the temporary file with the selected face
char PathRelPhoto[PATH_MAX + 1];
/***** Get the name of the file with the selected face *****/
Par_GetParToText ("FileName",Gbl.Usrs.FileNamePhoto,NAME_MAX); // Example of FileNamePhoto: "4924a838630e_016"
@ -936,12 +936,12 @@ void Pho_RemoveUsrFromTableClicksWithoutPhoto (long UsrCod)
// Returns true if the photo can be shown and false if not.
// Public photo means two different things depending on the user's type
bool Pho_ShowUsrPhotoIsAllowed (struct UsrData *UsrDat,char *PhotoURL)
bool Pho_ShowingUsrPhotoIsAllowed (struct UsrData *UsrDat,char *PhotoURL)
{
bool ICanSeePhoto;
/***** Check if I can see the other's photo *****/
ICanSeePhoto = Pri_ShowIsAllowed (UsrDat->PhotoVisibility,UsrDat);
ICanSeePhoto = Pri_ShowingIsAllowed (UsrDat->PhotoVisibility,UsrDat);
/***** Photo is shown if I can see it, and it exists *****/
return ICanSeePhoto ? Pho_BuildLinkToPhoto (UsrDat,PhotoURL) :
@ -956,8 +956,8 @@ bool Pho_ShowUsrPhotoIsAllowed (struct UsrData *UsrDat,char *PhotoURL)
bool Pho_BuildLinkToPhoto (const struct UsrData *UsrDat,char *PhotoURL)
{
char PathPublPhoto[PATH_MAX+1];
char PathPrivPhoto[PATH_MAX+1];
char PathPublPhoto[PATH_MAX + 1];
char PathPrivPhoto[PATH_MAX + 1];
if (UsrDat->Photo[0])
{
@ -973,13 +973,8 @@ bool Pho_BuildLinkToPhoto (const struct UsrData *UsrDat,char *PhotoURL)
/***** Create a symbolic link to the private photo, if not exists *****/
if (!Fil_CheckIfPathExists (PathPublPhoto))
if (symlink (PathPrivPhoto,PathPublPhoto) != 0)
{
sprintf (Gbl.Message,"symlink (%s,%s)",
PathPrivPhoto,PathPublPhoto);
Lay_ShowAlert (Lay_WARNING,Gbl.Message);
Lay_ShowErrorAndExit ("Can not create public link"
" to access to user's private photo");
}
/***** Create the public URL of the photo *****/
sprintf (PhotoURL,"%s/%s/%s.jpg",
@ -1017,8 +1012,8 @@ bool Pho_CheckIfPrivPhotoExists (long UsrCod,char *PathPrivRelPhoto)
bool Pho_RemovePhoto (struct UsrData *UsrDat)
{
char PathPrivRelPhoto[PATH_MAX+1];
char PathPublPhoto[PATH_MAX+1];
char PathPrivRelPhoto[PATH_MAX + 1];
char PathPublPhoto[PATH_MAX + 1];
unsigned NumErrors = 0;
if (UsrDat->Photo[0])
@ -1089,7 +1084,7 @@ static void Pho_ClearPhotoName (long UsrCod)
void Pho_UpdatePhotoName (struct UsrData *UsrDat)
{
char Query[512];
char PathPublPhoto[PATH_MAX+1];
char PathPublPhoto[PATH_MAX + 1];
/***** Update photo name in database *****/
sprintf (Query,"UPDATE usr_data SET Photo='%s'"
@ -1238,11 +1233,11 @@ void Pho_ChangePhotoVisibility (void)
void Pho_CalcPhotoDegree (void)
{
char PathPhotosPublic[PATH_MAX+1];
char PathPhotosTmpPriv[PATH_MAX+1];
char PathPhotosPublic[PATH_MAX + 1];
char PathPhotosTmpPriv[PATH_MAX + 1];
Pho_AvgPhotoTypeOfAverage_t TypeOfAverage;
long DegCod = -1L;
char DirAvgPhotosRelPath[Pho_NUM_AVERAGE_PHOTO_TYPES][PATH_MAX+1];
char DirAvgPhotosRelPath[Pho_NUM_AVERAGE_PHOTO_TYPES][PATH_MAX + 1];
unsigned NumStds,NumStdsWithPhoto;
Usr_Sex_t Sex;
long TotalTimeToComputeAvgPhotoInMicroseconds,PartialTimeToComputeAvgPhotoInMicroseconds;
@ -1494,9 +1489,9 @@ static void Pho_ComputeAveragePhoto (long DegCod,Usr_Sex_t Sex,Rol_Role_t Role,
{
extern const char *Usr_StringsSexDB[Usr_NUM_SEXS];
unsigned NumUsr;
char PathPrivRelPhoto[PATH_MAX+1]; // Relative path to private photo, to calculate average face
char PathRelAvgPhoto[PATH_MAX+1];
char FileNamePhotoNames[PATH_MAX+1];
char PathPrivRelPhoto[PATH_MAX + 1]; // Relative path to private photo, to calculate average face
char PathRelAvgPhoto[PATH_MAX + 1];
char FileNamePhotoNames[PATH_MAX + 1];
FILE *FilePhotoNames = NULL; // Initialized to avoid warning
char StrCallToProgram[256]; // Call to photo processing program
int ReturnCode;
@ -1711,7 +1706,7 @@ void Pho_PutHiddenParamTypeOfAvg (void)
static Pho_AvgPhotoTypeOfAverage_t Pho_GetPhotoAvgTypeFromForm (void)
{
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
unsigned UnsignedNum;
Par_GetParToText ("AvgType",UnsignedStr,10);
@ -1780,7 +1775,7 @@ void Pho_PutHiddenParamPhotoSize (void)
static Pho_HowComputePhotoSize_t Pho_GetHowComputePhotoSizeFromForm (void)
{
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
unsigned UnsignedNum;
Par_GetParToText ("PhotoSize",UnsignedStr,10);
@ -1849,7 +1844,7 @@ void Pho_PutHiddenParamOrderDegrees (void)
static Pho_HowOrderDegrees_t Pho_GetHowOrderDegreesFromForm (void)
{
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
unsigned UnsignedNum;
Par_GetParToText ("OrdDeg",UnsignedStr,10);
@ -2350,10 +2345,10 @@ static void Pho_ShowDegreeAvgPhotoAndStat (struct Degree *Deg,
extern const char *Txt_photos;
unsigned PhotoWidth;
unsigned PhotoHeight;
char PathRelAvgPhoto[PATH_MAX+1];
char PhotoURL[PATH_MAX+1];
char PathRelAvgPhoto[PATH_MAX + 1];
char PhotoURL[PATH_MAX + 1];
char PhotoCaption[512];
char CopyOfDegShortName[Deg_MAX_LENGTH_DEGREE_SHRT_NAME+1]; // Short name of degree
char CopyOfDegShortName[Deg_MAX_LENGTH_DEGREE_SHRT_NAME + 1]; // Short name of degree
bool ShowDegPhoto;
char IdCaption[Act_MAX_LENGTH_ID];

2
swad_photo.h
View File

@ -103,7 +103,7 @@ void Pho_UpdateUsrPhoto2 (void);
unsigned Pho_UpdateMyClicksWithoutPhoto (void);
void Pho_RemoveUsrFromTableClicksWithoutPhoto (long UsrCod);
bool Pho_ShowUsrPhotoIsAllowed (struct UsrData *UsrDat,char *PhotoURL);
bool Pho_ShowingUsrPhotoIsAllowed (struct UsrData *UsrDat,char *PhotoURL);
bool Pho_BuildLinkToPhoto (const struct UsrData *UsrDat,char *PhotoURL);
bool Pho_CheckIfPrivPhotoExists (long UsrCod,char *PathPrivRelPhoto);
bool Pho_RemovePhoto (struct UsrData *UsrDat);

8
swad_place.c
View File

@ -184,7 +184,7 @@ void Plc_SeePlaces (void)
static void Plc_GetParamPlcOrderType (void)
{
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
unsigned UnsignedNum;
Par_GetParToText ("Order",UnsignedStr,10);
@ -507,10 +507,10 @@ static void Plc_PutParamPlcCod (long PlcCod)
long Plc_GetParamPlcCod (void)
{
char LongStr[1+10+1];
char LongStr[1 + 10 + 1];
/***** Get parameter with code of place *****/
Par_GetParToText ("PlcCod",LongStr,1+10);
Par_GetParToText ("PlcCod",LongStr,1 + 10);
return Str_ConvertStrCodToLongCod (LongStr);
}
@ -586,7 +586,7 @@ static void Plc_RenamePlace (Cns_ShrtOrFullName_t ShrtOrFullName)
const char *FieldName = NULL; // Initialized to avoid warning
unsigned MaxLength = 0; // Initialized to avoid warning
char *CurrentPlcName = NULL; // Initialized to avoid warning
char NewPlcName[Plc_MAX_LENGTH_PLACE_FULL_NAME+1];
char NewPlcName[Plc_MAX_LENGTH_PLACE_FULL_NAME + 1];
Plc = &Gbl.Plcs.EditingPlc;
switch (ShrtOrFullName)

40
swad_plugin.c
View File

@ -79,7 +79,7 @@ void Plg_ListPlugins (void)
extern const char *Txt_Plugin;
unsigned NumPlg;
struct Plugin *Plg;
char URL[Cns_MAX_LENGTH_WWW+Ses_LENGTH_SESSION_ID+1];
char URL[Cns_MAX_LENGTH_WWW+Ses_LENGTH_SESSION_ID + 1];
if (Gbl.Usrs.Me.LoggedRole != Rol_SYS_ADM)
{
@ -476,10 +476,10 @@ static void Plg_PutParamPlgCod (long PlgCod)
long Plg_GetParamPlgCod (void)
{
char LongStr[1+10+1];
char LongStr[1 + 10 + 1];
/***** Get parameter with code of plugin *****/
Par_GetParToText ("PlgCod",LongStr,1+10);
Par_GetParToText ("PlgCod",LongStr,1 + 10);
return Str_ConvertStrCodToLongCod (LongStr);
}
@ -525,7 +525,7 @@ void Plg_RenamePlugin (void)
extern const char *Txt_The_name_of_the_plugin_X_has_not_changed;
char Query[512];
struct Plugin *Plg;
char NewPlgName[Plg_MAX_LENGTH_PLUGIN_NAME+1];
char NewPlgName[Plg_MAX_LENGTH_PLUGIN_NAME + 1];
Plg = &Gbl.Plugins.EditingPlg;
@ -609,8 +609,8 @@ void Plg_ChangePlgDescription (void)
extern const char *Txt_The_new_description_is_X;
extern const char *Txt_You_can_not_leave_the_description_empty;
struct Plugin *Plg;
char Query[256+Plg_MAX_LENGTH_PLUGIN_DESCRIPTION];
char NewDescription[Plg_MAX_LENGTH_PLUGIN_DESCRIPTION+1];
char Query[256 + Plg_MAX_LENGTH_PLUGIN_DESCRIPTION];
char NewDescription[Plg_MAX_LENGTH_PLUGIN_DESCRIPTION + 1];
Plg = &Gbl.Plugins.EditingPlg;
@ -656,8 +656,8 @@ void Plg_ChangePlgLogo (void)
extern const char *Txt_The_new_logo_is_X;
extern const char *Txt_You_can_not_leave_the_logo_empty;
struct Plugin *Plg;
char Query[256+Plg_MAX_LENGTH_PLUGIN_LOGO];
char NewLogo[Plg_MAX_LENGTH_PLUGIN_LOGO+1];
char Query[256 + Plg_MAX_LENGTH_PLUGIN_LOGO];
char NewLogo[Plg_MAX_LENGTH_PLUGIN_LOGO + 1];
Plg = &Gbl.Plugins.EditingPlg;
@ -700,8 +700,8 @@ void Plg_ChangePlgAppKey (void)
extern const char *Txt_The_new_logo_is_X; // TODO: !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
extern const char *Txt_You_can_not_leave_the_logo_empty;// TODO: !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
struct Plugin *Plg;
char Query[256+Plg_MAX_LENGTH_PLUGIN_APP_KEY];
char NewAppKey[Plg_MAX_LENGTH_PLUGIN_APP_KEY+1];
char Query[256 + Plg_MAX_LENGTH_PLUGIN_APP_KEY];
char NewAppKey[Plg_MAX_LENGTH_PLUGIN_APP_KEY + 1];
Plg = &Gbl.Plugins.EditingPlg;
@ -744,8 +744,8 @@ void Plg_ChangePlgURL (void)
extern const char *Txt_The_new_URL_is_X;
extern const char *Txt_You_can_not_leave_the_URL_empty;
struct Plugin *Plg;
char Query[256+Cns_MAX_LENGTH_WWW];
char NewURL[Cns_MAX_LENGTH_WWW+1];
char Query[256 + Cns_MAX_LENGTH_WWW];
char NewURL[Cns_MAX_LENGTH_WWW + 1];
Plg = &Gbl.Plugins.EditingPlg;
@ -788,8 +788,8 @@ void Plg_ChangePlgIP (void)
extern const char *Txt_The_new_IP_address_is_X;
extern const char *Txt_You_can_not_leave_the_IP_address_empty;
struct Plugin *Plg;
char Query[256+Cns_MAX_LENGTH_IP];
char NewIP[Cns_MAX_LENGTH_IP+1];
char Query[256 + Cns_MAX_LENGTH_IP];
char NewIP[Cns_MAX_LENGTH_IP + 1];
Plg = &Gbl.Plugins.EditingPlg;
@ -1042,12 +1042,12 @@ void Plg_RecFormNewPlg (void)
static void Plg_CreatePlugin (struct Plugin *Plg)
{
extern const char *Txt_Created_new_plugin_X;
char Query[512+Plg_MAX_LENGTH_PLUGIN_NAME+
Plg_MAX_LENGTH_PLUGIN_DESCRIPTION+
Plg_MAX_LENGTH_PLUGIN_LOGO+
Plg_MAX_LENGTH_PLUGIN_APP_KEY+
Cns_MAX_LENGTH_WWW+
Cns_MAX_LENGTH_IP];
char Query[512 + Plg_MAX_LENGTH_PLUGIN_NAME +
Plg_MAX_LENGTH_PLUGIN_DESCRIPTION +
Plg_MAX_LENGTH_PLUGIN_LOGO +
Plg_MAX_LENGTH_PLUGIN_APP_KEY +
Cns_MAX_LENGTH_WWW +
Cns_MAX_LENGTH_IP];
/***** Create a new plugin *****/
sprintf (Query,"INSERT INTO plugins (Name,Description,Logo,AppKey,URL,IP)"

14
swad_preference.c
View File

@ -248,7 +248,7 @@ void Pre_PutLinkToChangeLanguage (void)
void Pre_PutSelectorToSelectLanguage (void)
{
extern const char *Txt_STR_LANG_NAME[1+Txt_NUM_LANGUAGES];
extern const char *Txt_STR_LANG_NAME[1 + Txt_NUM_LANGUAGES];
Txt_Language_t Lan;
Act_FormStart (ActReqChgLan);
@ -275,9 +275,9 @@ void Pre_PutSelectorToSelectLanguage (void)
void Pre_AskChangeLanguage (void)
{
extern const char *Txt_Do_you_want_to_change_your_language_to_LANGUAGE[1+Txt_NUM_LANGUAGES];
extern const char *Txt_Do_you_want_to_change_the_language_to_LANGUAGE[1+Txt_NUM_LANGUAGES];
extern const char *Txt_Switch_to_LANGUAGE[1+Txt_NUM_LANGUAGES];
extern const char *Txt_Do_you_want_to_change_your_language_to_LANGUAGE[1 + Txt_NUM_LANGUAGES];
extern const char *Txt_Do_you_want_to_change_the_language_to_LANGUAGE[1 + Txt_NUM_LANGUAGES];
extern const char *Txt_Switch_to_LANGUAGE[1 + Txt_NUM_LANGUAGES];
Txt_Language_t CurrentLanguage = Gbl.Prefs.Language;
/***** Get param language *****/
@ -331,7 +331,7 @@ void Pre_ChangeLanguage (void)
void Pre_UpdateMyLanguageToCurrentLanguage (void)
{
extern const char *Txt_STR_LANG_ID[1+Txt_NUM_LANGUAGES];
extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES];
char Query[128];
/***** Set my language to the current language *****/
@ -351,7 +351,7 @@ void Pre_UpdateMyLanguageToCurrentLanguage (void)
Txt_Language_t Pre_GetParamLanguage (void)
{
extern const unsigned Txt_Current_CGI_SWAD_Language;
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
unsigned UnsignedNum;
Par_GetParToText ("Lan",UnsignedStr,10);
@ -504,7 +504,7 @@ static void Pre_UpdateSideColsOnUsrDataTable (void)
unsigned Pre_GetParamSideCols (void)
{
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
unsigned UnsignedNum; // 11 ==> by default, show both side columns
Par_GetParToText ("SideCols",UnsignedStr,10);

8
swad_privacy.c
View File

@ -227,7 +227,7 @@ Pri_Visibility_t Pri_GetVisibilityFromStr (const char *Str)
Pri_Visibility_t Pri_GetParamVisibility (const char *ParamName)
{
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
unsigned UnsignedNum;
Par_GetParToText (ParamName,UnsignedStr,10);
@ -248,7 +248,7 @@ Pri_Visibility_t Pri_GetParamVisibility (const char *ParamName)
/*****************************************************************************/
// Returns true if it can be shown and false if not.
bool Pri_ShowIsAllowed (Pri_Visibility_t Visibility,struct UsrData *UsrDat)
bool Pri_ShowingIsAllowed (Pri_Visibility_t Visibility,struct UsrData *UsrDat)
{
/***** It's me? I always can see my things *****/
if (UsrDat->UsrCod == Gbl.Usrs.Me.UsrDat.UsrCod)
@ -263,7 +263,9 @@ bool Pri_ShowIsAllowed (Pri_Visibility_t Visibility,struct UsrData *UsrDat)
{
case Pri_VISIBILITY_UNKNOWN:
return false; // It's not me
case Pri_VISIBILITY_USER: // Only visible by me and my teachers if I am a student or me and my students if I am a teacher
case Pri_VISIBILITY_USER: // Only visible
// by me and my teachers if I am a student
// or me and my students if I am a teacher
// Do both users share the same course but whit different role?
return Usr_CheckIfUsrSharesAnyOfMyCrsWithDifferentRole (UsrDat->UsrCod);
case Pri_VISIBILITY_COURSE: // Visible by users sharing courses with me

2
swad_privacy.h
View File

@ -48,6 +48,6 @@ void Pri_EditMyPrivacy (void);
Pri_Visibility_t Pri_GetVisibilityFromStr (const char *Str);
Pri_Visibility_t Pri_GetParamVisibility (const char *ParamName);
bool Pri_ShowIsAllowed (Pri_Visibility_t Visibility,struct UsrData *UsrDat);
bool Pri_ShowingIsAllowed (Pri_Visibility_t Visibility,struct UsrData *UsrDat);
#endif

10
swad_profile.c
View File

@ -112,7 +112,7 @@ void Prf_SeeSocialProfiles (void)
char *Prf_GetURLPublicProfile (char *URL,const char *NicknameWithoutArroba)
{
extern const char *Txt_STR_LANG_ID[1+Txt_NUM_LANGUAGES];
extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES];
/***** Build URL using nickname *****/
sprintf (URL,"%s/%s?usr=@%s",
@ -269,7 +269,7 @@ bool Prf_ShowUserProfile (struct UsrData *UsrDat)
}
/***** Check if I can see the public profile *****/
if (Pri_ShowIsAllowed (UsrDat->ProfileVisibility,UsrDat))
if (Pri_ShowingIsAllowed (UsrDat->ProfileVisibility,UsrDat))
{
if (!ItsMe && // If not it's me...
Gbl.CurrentCrs.Crs.CrsCod > 0) // ...and a course is selected
@ -1489,8 +1489,8 @@ void Prf_ShowUsrInRanking (struct UsrData *UsrDat,unsigned Rank)
{
extern const char *Txt_View_public_profile;
bool ShowPhoto;
char PhotoURL[PATH_MAX+1];
bool Visible = Pri_ShowIsAllowed (UsrDat->ProfileVisibility,UsrDat);
char PhotoURL[PATH_MAX + 1];
bool Visible = Pri_ShowingIsAllowed (UsrDat->ProfileVisibility,UsrDat);
fprintf (Gbl.F.Out,"<td class=\"RANK RIGHT_MIDDLE COLOR%u\""
" style=\"height:50px;\">"
@ -1506,7 +1506,7 @@ void Prf_ShowUsrInRanking (struct UsrData *UsrDat,unsigned Rank)
if (Visible)
{
/***** User's photo *****/
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (UsrDat,PhotoURL);
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (UsrDat,PhotoURL);
Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL :
NULL,
"PHOTO30x40",Pho_ZOOM,false);

52
swad_record.c
View File

@ -71,7 +71,7 @@ extern struct Globals Gbl;
/*****************************************************************************/
static void Rec_WriteHeadingRecordFields (void);
static void Rec_GetFieldByCod (long FieldCod,char Name[Rec_MAX_LENGTH_NAME_FIELD+1],
static void Rec_GetFieldByCod (long FieldCod,char Name[Rec_MAX_LENGTH_NAME_FIELD + 1],
unsigned *NumLines,Rec_VisibilityRecordFields_t *Visibility);
static void Rec_ShowRecordOneStdCrs (void);
@ -432,7 +432,7 @@ void Rec_ReceiveFormField (void)
{
extern const char *Txt_The_record_field_X_already_exists;
extern const char *Txt_You_must_specify_the_name_of_the_new_record_field;
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
unsigned Vis;
/***** Get parameters from the form *****/
@ -590,10 +590,10 @@ void Rec_ReqRemField (void)
long Rec_GetFieldCod (void)
{
char LongStr[1+10+1];
char LongStr[1 + 10 + 1];
/***** Get the code of the field *****/
Par_GetParToText ("FieldCod",LongStr,1+10);
Par_GetParToText ("FieldCod",LongStr,1 + 10);
return Str_ConvertStrCodToLongCod (LongStr);
}
@ -751,7 +751,7 @@ void Rec_RenameField (void)
extern const char *Txt_The_record_field_X_has_been_renamed_as_Y;
extern const char *Txt_The_name_of_the_field_X_has_not_changed;
char Query[1024];
char NewFieldName[Rec_MAX_LENGTH_NAME_FIELD+1];
char NewFieldName[Rec_MAX_LENGTH_NAME_FIELD + 1];
/***** Get parameters of the form *****/
/* Get the code of the field */
@ -820,7 +820,7 @@ void Rec_ChangeLinesField (void)
extern const char *Txt_The_number_of_editing_lines_in_the_record_field_X_has_not_changed;
extern const char *Txt_From_now_on_the_number_of_editing_lines_of_the_field_X_is_Y;
char Query[1024];
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
unsigned NewNumLines;
/***** Get parameters of the form *****/
@ -870,7 +870,7 @@ void Rec_ChangeVisibilityField (void)
extern const char *Txt_The_visibility_of_the_record_field_X_has_not_changed;
extern const char *Txt_RECORD_FIELD_VISIBILITY_MSG[Rec_NUM_TYPES_VISIBILITY];
char Query[1024];
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
unsigned Vis;
Rec_VisibilityRecordFields_t NewVisibility;
@ -1239,7 +1239,7 @@ static void Rec_ShowRecordOneTchCrs (void)
{
extern const char *Hlp_USERS_Teachers_timetable;
extern const char *Txt_TIMETABLE_TYPES[TT_NUM_TIMETABLE_TYPES];
char Width[10+2+1];
char Width[10 + 2 + 1];
bool ShowOfficeHours;
/***** Width for office hours *****/
@ -1306,7 +1306,7 @@ void Rec_ListRecordsTchs (void)
Rec_SHA_RECORD_PRINT;
struct UsrData UsrDat;
bool ShowOfficeHours;
char Width[10+2+1];
char Width[10 + 2 + 1];
/***** Width for office hours *****/
sprintf (Width,"%upx",Rec_RECORD_WIDTH);
@ -1442,7 +1442,7 @@ static void Rec_ShowLinkToPrintPreviewOfRecords (void)
static void Rec_GetParamRecordsPerPage (void)
{
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
Par_GetParToText ("RecsPerPag",UnsignedStr,10);
if (sscanf (UnsignedStr,"%u",&Gbl.Usrs.Listing.RecsPerPag) != 1)
@ -1492,7 +1492,7 @@ static void Rec_PutParamsShowOfficeHoursSeveralTchs (void)
static bool Rec_GetParamShowOfficeHours (void)
{
char YN[1+1];
char YN[1 + 1];
Par_GetParToText ("ParamOfficeHours",YN,1);
if (Str_ConvertToUpperLetter (YN[0]) == 'Y')
@ -1580,7 +1580,7 @@ static void Rec_ShowCrsRecord (Rec_CourseRecordViewType_t TypeOfView,
Hlp_USERS_Students_course_record_card, // Rec_CRS_RECORD_LIST
NULL, // Rec_CRS_RECORD_PRINT
};
char StrRecordWidth[10+1];
char StrRecordWidth[10 + 1];
unsigned Col1Width = 210;
unsigned Col2Width;
bool ItsMe;
@ -1777,7 +1777,7 @@ unsigned long Rec_GetFieldFromCrsRecord (long UsrCod,long FieldCod,MYSQL_RES **m
void Rec_GetFieldsCrsRecordFromForm (void)
{
unsigned NumField;
char FieldParamName[5+10+1];
char FieldParamName[5 + 10 + 1];
for (NumField = 0;
NumField < Gbl.CurrentCrs.Records.LstFields.Num;
@ -1798,7 +1798,7 @@ void Rec_GetFieldsCrsRecordFromForm (void)
void Rec_UpdateCrsRecord (long UsrCod)
{
unsigned NumField;
char Query[256+Cns_MAX_BYTES_TEXT];
char Query[256 + Cns_MAX_BYTES_TEXT];
MYSQL_RES *mysql_res;
bool FieldAlreadyExists;
@ -1917,7 +1917,7 @@ void Rec_AllocMemFieldsRecordsCrs (void)
if (Gbl.Usrs.Me.LoggedRole > Rol_STUDENT ||
Gbl.CurrentCrs.Records.LstFields.Lst[NumField].Visibility == Rec_EDITABLE_FIELD)
/* Allocate memory for the texts of the fields */
if ((Gbl.CurrentCrs.Records.LstFields.Lst[NumField].Text = malloc (Cns_MAX_BYTES_TEXT+1)) == NULL)
if ((Gbl.CurrentCrs.Records.LstFields.Lst[NumField].Text = malloc (Cns_MAX_BYTES_TEXT + 1)) == NULL)
Lay_ShowErrorAndExit ("Not enough memory to store records of the course.");
}
@ -2083,7 +2083,7 @@ void Rec_ShowSharedUsrRecord (Rec_SharedRecordViewType_t TypeOfView,
NULL, // Rol_INS_ADM
NULL, // Rol_SYS_ADM
};
char StrRecordWidth[10+1];
char StrRecordWidth[10 + 1];
const char *ClassForm = "REC_DAT";
bool ItsMe;
bool IAmLoggedAsTeacher;
@ -2365,7 +2365,7 @@ static void Rec_PutIconsCommands (void)
Act_Actions[Gbl.Action.Act].BrowserWindow == Act_THIS_WINDOW && // Only in main window
Gbl.Usrs.Me.Logged) // Only if I am logged
{
ICanViewUsrProfile = Pri_ShowIsAllowed (Gbl.Record.UsrDat->ProfileVisibility,
ICanViewUsrProfile = Pri_ShowingIsAllowed (Gbl.Record.UsrDat->ProfileVisibility,
Gbl.Record.UsrDat);
/***** Start container *****/
@ -2579,8 +2579,8 @@ static void Rec_ShowInstitutionInHead (struct Instit *Ins,bool PutFormLinks)
static void Rec_ShowPhoto (struct UsrData *UsrDat)
{
char PhotoURL[PATH_MAX+1];
bool ShowPhoto = Pho_ShowUsrPhotoIsAllowed (UsrDat,PhotoURL);
char PhotoURL[PATH_MAX + 1];
bool ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (UsrDat,PhotoURL);
/***** User's photo *****/
fprintf (Gbl.F.Out,"<td rowspan=\"3\" class=\"REC_C3_TOP CENTER_TOP\">");
@ -2628,7 +2628,7 @@ static void Rec_ShowFullName (struct UsrData *UsrDat)
static void Rec_ShowNickname (struct UsrData *UsrDat,bool PutFormLinks)
{
extern const char *Txt_View_public_profile;
char NicknameWithArroba[Nck_MAX_BYTES_NICKNAME_FROM_FORM+1];
char NicknameWithArroba[Nck_MAX_BYTES_NICKNAME_FROM_FORM + 1];
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"REC_C2_MID REC_NAME LEFT_BOTTOM\">"
@ -3527,7 +3527,7 @@ void Rec_UpdateMyRecord (void)
Rol_Role_t Rec_GetRoleFromRecordForm (void)
{
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
Rol_Role_t Role;
bool RoleOK = false;
@ -3613,8 +3613,8 @@ void Rec_GetUsrNameFromRecordForm (struct UsrData *UsrDat)
static void Rec_GetUsrExtraDataFromRecordForm (struct UsrData *UsrDat)
{
char UnsignedStr[10+1];
char LongStr[1+10+1];
char UnsignedStr[10 + 1];
char LongStr[1 + 10 + 1];
unsigned UnsignedNum;
/***** Get sex from form *****/
@ -3625,7 +3625,7 @@ static void Rec_GetUsrExtraDataFromRecordForm (struct UsrData *UsrDat)
UsrDat->Sex = (Usr_Sex_t) UnsignedNum;
/***** Get country code *****/
Par_GetParToText ("OthCtyCod",LongStr,1+10);
Par_GetParToText ("OthCtyCod",LongStr,1 + 10);
UsrDat->CtyCod = Str_ConvertStrCodToLongCod (LongStr);
Par_GetParToText ("OriginPlace",UsrDat->OriginPlace,Cns_MAX_BYTES_STRING);
@ -4076,7 +4076,7 @@ void Rec_UpdateMyDepartment (void)
void Rec_UpdateMyOffice (void)
{
char Query[128+Cns_MAX_BYTES_STRING];
char Query[128 + Cns_MAX_BYTES_STRING];
/***** Get my office *****/
Par_GetParToText ("Office",Gbl.Usrs.Me.UsrDat.Tch.Office,Cns_MAX_BYTES_STRING);
@ -4098,7 +4098,7 @@ void Rec_UpdateMyOffice (void)
void Rec_UpdateMyOfficePhone (void)
{
char Query[128+Usr_MAX_BYTES_PHONE];
char Query[128 + Usr_MAX_BYTES_PHONE];
/***** Get my office *****/
Par_GetParToText ("OfficePhone",Gbl.Usrs.Me.UsrDat.Tch.OfficePhone,Usr_MAX_BYTES_PHONE);

36
swad_report.c
View File

@ -62,12 +62,12 @@
struct Rep_CurrentTimeUTC
{
char StrDate[10+1]; // Example: 2016-10-02
// 1234567890
char StrTime[8+1]; // Example: 19:03:49
// 12345678
unsigned Date; // Example: 20161002
unsigned Time; // Example: 190349
char StrDate[10 + 1]; // Example: 2016-10-02
// 1234567890
char StrTime[8 + 1]; // Example: 19:03:49
// 12345678
unsigned Date; // Example: 20161002
unsigned Time; // Example: 190349
};
struct Rep_Hits
@ -84,8 +84,8 @@ struct Rep_Report
struct Rep_CurrentTimeUTC CurrentTimeUTC;
struct Rep_Hits Hits;
unsigned long MaxHitsPerYear;
char FilenameReport[NAME_MAX+1];
char Permalink[PATH_MAX+1];
char FilenameReport[NAME_MAX + 1];
char Permalink[PATH_MAX + 1];
};
/*****************************************************************************/
@ -355,10 +355,10 @@ static void Rep_GetCurrentDateTimeUTC (struct Rep_Report *Report)
static void Rep_CreateNewReportFile (struct Rep_Report *Report)
{
char PathReports[PATH_MAX+1];
char PathUniqueDirL[PATH_MAX+1];
char PathUniqueDirR[PATH_MAX+1];
char PathFileReport[PATH_MAX+1];
char PathReports[PATH_MAX + 1];
char PathUniqueDirL[PATH_MAX + 1];
char PathUniqueDirR[PATH_MAX + 1];
char PathFileReport[PATH_MAX + 1];
/***** Path for reports *****/
sprintf (PathReports,"%s/%s",
@ -404,7 +404,7 @@ static void Rep_CreateNewReportFile (struct Rep_Report *Report)
static void Rep_CreateNewReportEntryIntoDB (const struct Rep_Report *Report)
{
char Query[1024+PATH_MAX*2];
char Query[1024 + PATH_MAX * 2];
/***** Insert a new user's usage report into database *****/
sprintf (Query,"INSERT INTO usr_report"
@ -520,7 +520,7 @@ static void Rep_WriteSectionUsrInfo (void)
extern const char *Txt_Email;
extern const char *Txt_Country;
extern const char *Txt_Institution;
char CtyName[Cty_MAX_BYTES_COUNTRY_NAME+1];
char CtyName[Cty_MAX_BYTES_COUNTRY_NAME + 1];
struct Instit Ins;
/***** Start of section *****/
@ -753,7 +753,7 @@ static void Rep_WriteSectionGlobalHits (struct Rep_Report *Report)
static void Rep_WriteSectionHitsPerAction (struct Rep_Report *Report)
{
extern struct Act_Actions Act_Actions[Act_NUM_ACTIONS];
extern Act_Action_t Act_FromActCodToAction[1+Act_MAX_ACTION_COD];
extern Act_Action_t Act_FromActCodToAction[1 + Act_MAX_ACTION_COD];
extern const char *Txt_Hits_per_action;
extern const char *Txt_TABS_TXT[Tab_NUM_TABS];
extern const char *Txt_Other_actions;
@ -766,7 +766,7 @@ static void Rep_WriteSectionHitsPerAction (struct Rep_Report *Report)
Act_Action_t Action;
Act_Action_t SuperAction;
Tab_Tab_t Tab;
char ActTxt[Act_MAX_LENGTH_ACTION_TXT+1];
char ActTxt[Act_MAX_LENGTH_ACTION_TXT + 1];
unsigned long NumClicks;
/***** Start of section *****/
@ -1133,7 +1133,7 @@ static void Rep_WriteRowCrsData (long CrsCod,Rol_Role_t Role,
struct Rep_Report *Report,
bool WriteNumUsrs)
{
extern const char *Txt_YEAR_OF_DEGREE[1+Deg_MAX_YEARS_PER_DEGREE];
extern const char *Txt_YEAR_OF_DEGREE[1 + Deg_MAX_YEARS_PER_DEGREE];
extern const char *Txt_teachers_ABBREVIATION;
extern const char *Txt_students_ABBREVIATION;
extern const char *Txt_unknown_removed_course;
@ -1374,7 +1374,7 @@ static void Rep_RemoveUsrReportsFiles (long UsrCod)
MYSQL_ROW row;
unsigned NumReports;
unsigned NumReport;
char PathUniqueDirReport[PATH_MAX+1];
char PathUniqueDirReport[PATH_MAX + 1];
/***** Get directories for the reports *****/
sprintf (Query,"SELECT UniqueDirL,UniqueDirR FROM usr_report"

8
swad_role.c
View File

@ -316,7 +316,7 @@ void Rol_PutFormToChangeMyRole (void)
void Rol_ChangeMyRole (void)
{
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
unsigned UnsignedNum;
/***** Get parameter with the new logged role ******/
@ -394,9 +394,9 @@ void Rol_PutHiddenParamRoles (unsigned Roles)
unsigned Rol_GetSelectedRoles (void)
{
char StrRoles[(10+1)*2];
char StrRoles[(10 + 1) * 2];
const char *Ptr;
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
unsigned UnsignedNum;
Rol_Role_t Role;
unsigned Roles;
@ -409,7 +409,7 @@ unsigned Rol_GetSelectedRoles (void)
Roles = 0;
/***** Try to get multiple param "Role" *****/
Par_GetParMultiToText ("Role",StrRoles,(10+1)*2);
Par_GetParMultiToText ("Role",StrRoles,(10 + 1) * 2);
for (Ptr = StrRoles;
*Ptr;)
{

2
swad_scope.c
View File

@ -191,7 +191,7 @@ void Sco_PutParamScope (const char *ParamName,Sco_Scope_t Scope)
void Sco_GetScope (const char *ParamName)
{
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
/***** Get parameter location range if exists *****/
Par_GetParToText (ParamName,UnsignedStr,10);

32
swad_search.c
View File

@ -412,7 +412,7 @@ void Sch_PutMagnifyingGlassButton (const char *Icon)
void Sch_GetParamWhatToSearch (void)
{
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
unsigned UnsignedNum;
/***** Get what to search from form *****/
@ -666,7 +666,7 @@ static void Sch_SearchInDB (void)
static unsigned Sch_SearchInstitutionsInDB (const char *RangeQuery)
{
extern const char *Txt_STR_LANG_ID[1+Txt_NUM_LANGUAGES];
extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES];
char SearchQuery[Sch_MAX_LENGTH_SEARCH_QUERY + 1];
char Query[1024 + Sch_MAX_LENGTH_SEARCH_QUERY * 2];
@ -701,8 +701,8 @@ static unsigned Sch_SearchInstitutionsInDB (const char *RangeQuery)
static unsigned Sch_SearchCentresInDB (const char *RangeQuery)
{
char SearchQuery[Sch_MAX_LENGTH_SEARCH_QUERY+1];
char Query[1024+Sch_MAX_LENGTH_SEARCH_QUERY*2];
char SearchQuery[Sch_MAX_LENGTH_SEARCH_QUERY + 1];
char Query[1024 + Sch_MAX_LENGTH_SEARCH_QUERY * 2];
/***** Check scope *****/
if (Gbl.Scope.Current != Sco_SCOPE_DEG &&
@ -734,8 +734,8 @@ static unsigned Sch_SearchCentresInDB (const char *RangeQuery)
static unsigned Sch_SearchDegreesInDB (const char *RangeQuery)
{
char SearchQuery[Sch_MAX_LENGTH_SEARCH_QUERY+1];
char Query[1024+Sch_MAX_LENGTH_SEARCH_QUERY*2];
char SearchQuery[Sch_MAX_LENGTH_SEARCH_QUERY + 1];
char Query[1024 + Sch_MAX_LENGTH_SEARCH_QUERY * 2];
/***** Check scope *****/
if (Gbl.Scope.Current != Sco_SCOPE_CRS)
@ -767,8 +767,8 @@ static unsigned Sch_SearchDegreesInDB (const char *RangeQuery)
static unsigned Sch_SearchCoursesInDB (const char *RangeQuery)
{
char SearchQuery[Sch_MAX_LENGTH_SEARCH_QUERY+1];
char Query[1024+Sch_MAX_LENGTH_SEARCH_QUERY*2];
char SearchQuery[Sch_MAX_LENGTH_SEARCH_QUERY + 1];
char Query[1024 + Sch_MAX_LENGTH_SEARCH_QUERY * 2];
/***** Check user's permission *****/
if (Sch_CheckIfIHavePermissionToSearch (Sch_SEARCH_COURSES))
@ -802,7 +802,7 @@ static unsigned Sch_SearchUsrsInDB (Rol_Role_t Role)
{
extern const char *Txt_The_search_text_must_be_longer;
static bool WarningMessageWritten = false;
char SearchQuery[Sch_MAX_LENGTH_SEARCH_QUERY+1];
char SearchQuery[Sch_MAX_LENGTH_SEARCH_QUERY + 1];
/***** Split user string into words *****/
if (Sch_BuildSearchQuery (SearchQuery,
@ -830,8 +830,8 @@ static unsigned Sch_SearchOpenDocumentsInDB (const char *RangeQuery)
{
extern const char *Txt_open_document;
extern const char *Txt_open_documents;
char SearchQuery[Sch_MAX_LENGTH_SEARCH_QUERY+1];
char Query[(512+Sch_MAX_LENGTH_SEARCH_QUERY)*4];
char SearchQuery[Sch_MAX_LENGTH_SEARCH_QUERY + 1];
char Query[(512 + Sch_MAX_LENGTH_SEARCH_QUERY) * 4];
/***** Check user's permission *****/
if (Sch_CheckIfIHavePermissionToSearch (Sch_SEARCH_OPEN_DOCUMENTS))
@ -942,8 +942,8 @@ static unsigned Sch_SearchDocumentsInMyCoursesInDB (const char *RangeQuery)
{
extern const char *Txt_document_in_my_courses;
extern const char *Txt_documents_in_my_courses;
char SearchQuery[Sch_MAX_LENGTH_SEARCH_QUERY+1];
char Query[(1024+Sch_MAX_LENGTH_SEARCH_QUERY)*2];
char SearchQuery[Sch_MAX_LENGTH_SEARCH_QUERY + 1];
char Query[(1024 + Sch_MAX_LENGTH_SEARCH_QUERY) * 2];
unsigned NumDocs;
/***** Check user's permission *****/
@ -1070,8 +1070,8 @@ static unsigned Sch_SearchMyDocumentsInDB (const char *RangeQuery)
{
extern const char *Txt_document_from_me;
extern const char *Txt_documents_from_me;
char SearchQuery[Sch_MAX_LENGTH_SEARCH_QUERY+1];
char Query[(512+Sch_MAX_LENGTH_SEARCH_QUERY)*5];
char SearchQuery[Sch_MAX_LENGTH_SEARCH_QUERY + 1];
char Query[(512 + Sch_MAX_LENGTH_SEARCH_QUERY) * 5];
/***** Check user's permission *****/
if (Sch_CheckIfIHavePermissionToSearch (Sch_SEARCH_MY_DOCUMENTS))
@ -1230,7 +1230,7 @@ bool Sch_BuildSearchQuery (char SearchQuery[Sch_MAX_LENGTH_SEARCH_QUERY + 1],
size_t LengthWord;
size_t LengthTotal = 0;
size_t MaxLengthWord = 0;
char SearchWords[Sch_MAX_WORDS_IN_SEARCH][Sch_MAX_LENGTH_SEARCH_WORD+1];
char SearchWords[Sch_MAX_WORDS_IN_SEARCH][Sch_MAX_LENGTH_SEARCH_WORD + 1];
bool SearchWordIsValid = true;
if (Gbl.Search.Str[0])

2
swad_session.c
View File

@ -335,7 +335,7 @@ bool Ses_GetSessionData (void)
void Ses_InsertHiddenParInDB (Act_Action_t Action,const char *ParamName,const char *ParamValue)
{
char Query[512+Cns_MAX_BYTES_TEXT];
char Query[512 + Cns_MAX_BYTES_TEXT];
/***** Before of inserting the first hidden parameter passed to the next action,
delete all the parameters coming from the previous action *****/

4
swad_session.h
View File

@ -35,8 +35,8 @@
#define Ses_LENGTH_SESSION_ID Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64
#define Con_MIN_TIME_TO_REFRESH_CONNECTED_IN_MS (Cfg_MIN_TIME_TO_REFRESH_CONNECTED*1000L) // Refresh period of connected users in miliseconds
#define Con_MAX_TIME_TO_REFRESH_CONNECTED_IN_MS (Cfg_MAX_TIME_TO_REFRESH_CONNECTED*1000L) // Refresh period of connected users in miliseconds
#define Con_MIN_TIME_TO_REFRESH_CONNECTED_IN_MS (Cfg_MIN_TIME_TO_REFRESH_CONNECTED * 1000L) // Refresh period of connected users in miliseconds
#define Con_MAX_TIME_TO_REFRESH_CONNECTED_IN_MS (Cfg_MAX_TIME_TO_REFRESH_CONNECTED * 1000L) // Refresh period of connected users in miliseconds
/*****************************************************************************/
/***************************** Public prototypes *****************************/

44
swad_social.c
View File

@ -750,7 +750,7 @@ static void Soc_BuildQueryToGetTimeline (Soc_TimelineUsrOrGbl_t TimelineUsrOrGbl
static long Soc_GetPubCodFromSession (const char *FieldName)
{
char Query[128+Ses_LENGTH_SESSION_ID];
char Query[128 + Ses_LENGTH_SESSION_ID];
MYSQL_RES *mysql_res;
MYSQL_ROW row;
long PubCod;
@ -778,7 +778,7 @@ static long Soc_GetPubCodFromSession (const char *FieldName)
static void Soc_UpdateLastPubCodIntoSession (void)
{
char Query[256+Ses_LENGTH_SESSION_ID];
char Query[256 + Ses_LENGTH_SESSION_ID];
/***** Update last publishing code *****/
sprintf (Query,"UPDATE sessions"
@ -794,7 +794,7 @@ static void Soc_UpdateLastPubCodIntoSession (void)
static void Soc_UpdateFirstPubCodIntoSession (long FirstPubCod)
{
char Query[128+Ses_LENGTH_SESSION_ID];
char Query[128 + Ses_LENGTH_SESSION_ID];
/***** Update last publishing code *****/
sprintf (Query,"UPDATE sessions SET FirstPubCod='%ld' WHERE SessionId='%s'",
@ -1099,7 +1099,7 @@ static void Soc_WriteSocialNote (const struct SocialNote *SocNot,
struct Degree Deg;
struct Course Crs;
bool ShowPhoto = false;
char PhotoURL[PATH_MAX+1];
char PhotoURL[PATH_MAX + 1];
char ForumName[For_MAX_BYTES_FORUM_NAME + 1];
char SummaryStr[Cns_MAX_BYTES_TEXT + 1];
unsigned NumComments;
@ -1160,7 +1160,7 @@ static void Soc_WriteSocialNote (const struct SocialNote *SocNot,
/***** Left: write author's photo *****/
fprintf (Gbl.F.Out,"<div class=\"SOCIAL_NOTE_LEFT_PHOTO\">");
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (&UsrDat,PhotoURL);
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (&UsrDat,PhotoURL);
Pho_ShowUsrPhoto (&UsrDat,ShowPhoto ? PhotoURL :
NULL,
"PHOTO42x56",Pho_ZOOM,true); // Use unique id
@ -1973,7 +1973,7 @@ static void Soc_PutFormToWriteNewPost (void)
/***** Left: write author's photo (my photo) *****/
fprintf (Gbl.F.Out,"<div class=\"SOCIAL_NOTE_LEFT_PHOTO\">");
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (&Gbl.Usrs.Me.UsrDat,PhotoURL);
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (&Gbl.Usrs.Me.UsrDat,PhotoURL);
Pho_ShowUsrPhoto (&Gbl.Usrs.Me.UsrDat,ShowPhoto ? PhotoURL :
NULL,
"PHOTO42x56",Pho_ZOOM,false);
@ -2104,7 +2104,7 @@ void Soc_ReceiveSocialPostUsr (void)
// Returns the code of the social note just created
static long Soc_ReceiveSocialPost (void)
{
char Content[Cns_MAX_BYTES_LONG_TEXT+1];
char Content[Cns_MAX_BYTES_LONG_TEXT + 1];
struct Image Image;
char *Query;
long PstCod;
@ -2129,7 +2129,7 @@ static long Soc_ReceiveSocialPost (void)
/***** Allocate space for query *****/
if ((Query = malloc (256 +
strlen (Content) +
Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64+
Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64 +
Img_MAX_BYTES_TITLE)) == NULL)
Lay_ShowErrorAndExit ("Not enough memory to store database query.");
@ -2219,7 +2219,7 @@ static void Soc_PutHiddenFormToWriteNewCommentToSocialNote (long NotCod,
{
extern const char *Txt_New_SOCIAL_comment;
bool ShowPhoto = false;
char PhotoURL[PATH_MAX+1];
char PhotoURL[PATH_MAX + 1];
/***** Start container *****/
fprintf (Gbl.F.Out,"<div id=\"%s\""
@ -2229,7 +2229,7 @@ static void Soc_PutHiddenFormToWriteNewCommentToSocialNote (long NotCod,
/***** Left: write author's photo (my photo) *****/
fprintf (Gbl.F.Out,"<div class=\"SOCIAL_COMMENT_PHOTO\">");
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (&Gbl.Usrs.Me.UsrDat,PhotoURL);
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (&Gbl.Usrs.Me.UsrDat,PhotoURL);
Pho_ShowUsrPhoto (&Gbl.Usrs.Me.UsrDat,ShowPhoto ? PhotoURL :
NULL,
"PHOTO30x40",Pho_ZOOM,true); // Use unique id
@ -2359,7 +2359,7 @@ static void Soc_WriteSocialComment (struct SocialComment *SocCom,
bool IAmTheAuthor;
bool IAmAFaverOfThisSocCom = false;
bool ShowPhoto = false;
char PhotoURL[PATH_MAX+1];
char PhotoURL[PATH_MAX + 1];
if (ShowCommentAlone)
{
@ -2398,7 +2398,7 @@ static void Soc_WriteSocialComment (struct SocialComment *SocCom,
/***** Left: write author's photo *****/
fprintf (Gbl.F.Out,"<div class=\"SOCIAL_COMMENT_PHOTO\">");
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (&UsrDat,PhotoURL);
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (&UsrDat,PhotoURL);
Pho_ShowUsrPhoto (&UsrDat,ShowPhoto ? PhotoURL :
NULL,
"PHOTO30x40",Pho_ZOOM,true); // Use unique id
@ -2790,11 +2790,11 @@ void Soc_PutHiddenParamPubCod (long PubCod)
static long Soc_GetParamNotCod (void)
{
char LongStr[1+10+1]; // String that holds the social note code
char LongStr[1 + 10 + 1]; // String that holds the social note code
long NotCod;
/* Get social note code */
Par_GetParToText ("NotCod",LongStr,1+10);
Par_GetParToText ("NotCod",LongStr,1 + 10);
if (sscanf (LongStr,"%ld",&NotCod) != 1)
return -1L;
@ -2807,11 +2807,11 @@ static long Soc_GetParamNotCod (void)
static long Soc_GetParamPubCod (void)
{
char LongStr[1+10+1]; // String that holds the code
char LongStr[1 + 10 + 1]; // String that holds the code
long PubCod;
/* Get social comment code */
Par_GetParToText ("PubCod",LongStr,1+10);
Par_GetParToText ("PubCod",LongStr,1 + 10);
if (sscanf (LongStr,"%ld",&PubCod) != 1)
return -1L;
@ -2859,7 +2859,7 @@ void Soc_ReceiveCommentUsr (void)
static long Soc_ReceiveComment (void)
{
extern const char *Txt_The_original_post_no_longer_exists;
char Content[Cns_MAX_BYTES_LONG_TEXT+1];
char Content[Cns_MAX_BYTES_LONG_TEXT + 1];
struct Image Image;
char *Query;
struct SocialNote SocNot;
@ -2890,7 +2890,7 @@ static long Soc_ReceiveComment (void)
/***** Allocate space for query *****/
if ((Query = malloc (256 +
strlen (Content) +
Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64+
Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64 +
Img_MAX_BYTES_TITLE)) == NULL)
Lay_ShowErrorAndExit ("Not enough memory to store database query.");
@ -4302,7 +4302,7 @@ static void Soc_ShowSharersOrFavers (unsigned NumUsrs,const char *Query)
unsigned NumUsrsShown = 0;
struct UsrData UsrDat;
bool ShowPhoto;
char PhotoURL[PATH_MAX+1];
char PhotoURL[PATH_MAX + 1];
/***** Show number of users who have marked this social note as favourite *****/
fprintf (Gbl.F.Out,"<span class=\"SOCIAL_NUM_SHARES_FAVS\"> %u</span>",
@ -4332,7 +4332,7 @@ static void Soc_ShowSharersOrFavers (unsigned NumUsrs,const char *Query)
if (Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat))
{
fprintf (Gbl.F.Out,"<div class=\"SOCIAL_SHARER\">");
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (&UsrDat,PhotoURL);
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (&UsrDat,PhotoURL);
Pho_ShowUsrPhoto (&UsrDat,ShowPhoto ? PhotoURL :
NULL,
"PHOTO15x20",Pho_ZOOM,true); // Use unique id
@ -4622,7 +4622,7 @@ void Soc_ClearOldTimelinesDB (void)
static void Soc_ClearTimelineThisSession (void)
{
char Query[128+Ses_LENGTH_SESSION_ID];
char Query[128 + Ses_LENGTH_SESSION_ID];
/***** Remove social timeline for this session *****/
sprintf (Query,"DELETE FROM social_timelines WHERE SessionId='%s'",
@ -4636,7 +4636,7 @@ static void Soc_ClearTimelineThisSession (void)
static void Soc_AddNotesJustRetrievedToTimelineThisSession (void)
{
char Query[256+Ses_LENGTH_SESSION_ID];
char Query[256 + Ses_LENGTH_SESSION_ID];
sprintf (Query,"INSERT IGNORE INTO social_timelines (SessionId,NotCod)"
" SELECT DISTINCTROW '%s',NotCod FROM not_codes",

2
swad_social.h
View File

@ -87,7 +87,7 @@ typedef enum
} Soc_NoteType_t;
#define Soc_NUM_TOP_MESSAGES (1+6)
#define Soc_NUM_TOP_MESSAGES (1 + 6)
typedef enum
{
Soc_TOP_MESSAGE_NONE = 0,

98
swad_statistic.c
View File

@ -63,7 +63,7 @@ extern struct Globals Gbl;
/***************************** Private constants *****************************/
/*****************************************************************************/
#define Sta_SECONDS_IN_RECENT_LOG ((time_t)(Cfg_DAYS_IN_RECENT_LOG*24UL*60UL*60UL)) // Remove entries in recent log oldest than this time
#define Sta_SECONDS_IN_RECENT_LOG ((time_t) (Cfg_DAYS_IN_RECENT_LOG * 24UL * 60UL * 60UL)) // Remove entries in recent log oldest than this time
const unsigned Sta_CellPadding[Sta_NUM_CLICKS_GROUPED_BY] =
{
@ -745,7 +745,7 @@ static void Sta_WriteSelectorAction (void)
Act_Action_t Action;
Act_Action_t SuperAction;
Tab_Tab_t Tab;
char ActTxt[Act_MAX_LENGTH_ACTION_TXT+1];
char ActTxt[Act_MAX_LENGTH_ACTION_TXT + 1];
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"RIGHT_TOP\">"
@ -807,7 +807,7 @@ void Sta_SeeCrsAccesses (void)
/******************** Compute and show access statistics ********************/
/*****************************************************************************/
#define Sta_MAX_LENGTH_QUERY_ACCESS (1024 + (10+ID_MAX_LENGTH_USR_ID)*5000 - 1)
#define Sta_MAX_LENGTH_QUERY_ACCESS (1024 + (10 + ID_MAX_LENGTH_USR_ID) * 5000 - 1)
#define Sta_MAX_LENGTH_COUNT_TYPE (256 - 1)
@ -826,12 +826,12 @@ static void Sta_ShowHits (Sta_GlobalOrCourseAccesses_t GlobalOrCourse)
long LengthQuery;
MYSQL_RES *mysql_res;
unsigned long NumRows;
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
unsigned UnsignedNum;
const char *LogTable;
Sta_ClicksDetailedOrGrouped_t DetailedOrGrouped = Sta_CLICKS_GROUPED;
struct UsrData UsrDat;
char BrowserTimeZone[Dat_MAX_BYTES_TIME_ZONE+1];
char BrowserTimeZone[Dat_MAX_BYTES_TIME_ZONE + 1];
unsigned NumUsr = 0;
const char *Ptr;
char StrRole[256];
@ -1545,7 +1545,7 @@ static void Sta_ShowDetailedAccessesList (unsigned long NumRows,MYSQL_RES *mysql
Rol_Role_t RoleFromLog;
unsigned UniqueId;
long ActCod;
char ActTxt[Act_MAX_LENGTH_ACTION_TXT+1];
char ActTxt[Act_MAX_LENGTH_ACTION_TXT + 1];
/***** Initialize estructura of data of the user *****/
Usr_UsrDataConstructor (&UsrDat);
@ -1620,7 +1620,7 @@ static void Sta_ShowDetailedAccessesList (unsigned long NumRows,MYSQL_RES *mysql
"</td>",
Txt_Clicks,
FirstRow,LastRow,Txt_of_PART_OF_A_TOTAL,NumRows,
Txt_page,NumPagesBefore+1,Txt_of_PART_OF_A_TOTAL,NumPagsTotal);
Txt_page,NumPagesBefore + 1,Txt_of_PART_OF_A_TOTAL,NumPagsTotal);
/* Put link to jump to next page (more recent clicks) */
if (LastRow < NumRows)
@ -1628,10 +1628,10 @@ static void Sta_ShowDetailedAccessesList (unsigned long NumRows,MYSQL_RES *mysql
Act_FormStartAnchor (ActSeeAccCrs,"stat_results");
Sta_WriteParamsDatesSeeAccesses ();
Par_PutHiddenParamUnsigned ("GroupedBy",(unsigned) Sta_CLICKS_CRS_DETAILED_LIST);
Par_PutHiddenParamUnsigned ("StatAct",(unsigned) Gbl.Stat.NumAction);
Par_PutHiddenParamUnsigned ("FirstRow",(unsigned) (LastRow+1));
Par_PutHiddenParamUnsigned ("LastRow",(unsigned) (LastRow+Gbl.Stat.RowsPerPage));
Par_PutHiddenParamUnsigned ("RowsPage",(unsigned) Gbl.Stat.RowsPerPage);
Par_PutHiddenParamUnsigned ("StatAct" ,(unsigned) Gbl.Stat.NumAction);
Par_PutHiddenParamUnsigned ("FirstRow" ,(unsigned) (LastRow + 1));
Par_PutHiddenParamUnsigned ("LastRow" ,(unsigned) (LastRow + Gbl.Stat.RowsPerPage));
Par_PutHiddenParamUnsigned ("RowsPage" ,(unsigned) Gbl.Stat.RowsPerPage);
Usr_PutHiddenParUsrCodAll (ActSeeAccCrs,Gbl.Usrs.Select.All);
}
fprintf (Gbl.F.Out,"<td class=\"RIGHT_MIDDLE\" style=\"width:20%%;\">");
@ -1810,7 +1810,7 @@ static void Sta_ShowNumHitsPerUsr (unsigned long NumRows,
struct Sta_Hits Hits;
unsigned BarWidth;
struct UsrData UsrDat;
char PhotoURL[PATH_MAX+1];
char PhotoURL[PATH_MAX + 1];
bool ShowPhoto;
/***** Initialize user's data *****/
@ -1865,7 +1865,7 @@ static void Sta_ShowNumHitsPerUsr (unsigned long NumRows,
/* Show the photo */
fprintf (Gbl.F.Out,"<td class=\"CENTER_TOP COLOR%u\">",
Gbl.RowEvenOdd);
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (&UsrDat,PhotoURL);
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (&UsrDat,PhotoURL);
Pho_ShowUsrPhoto (&UsrDat,ShowPhoto ? PhotoURL :
NULL,
"PHOTO15x20",Pho_ZOOM,false);
@ -2061,7 +2061,7 @@ static void Sta_ShowNumHitsPerDays (unsigned long NumRows,
/*****************************************************************************/
#define GRAPH_DISTRIBUTION_PER_HOUR_HOUR_WIDTH 25
#define GRAPH_DISTRIBUTION_PER_HOUR_TOTAL_WIDTH (GRAPH_DISTRIBUTION_PER_HOUR_HOUR_WIDTH*24)
#define GRAPH_DISTRIBUTION_PER_HOUR_TOTAL_WIDTH (GRAPH_DISTRIBUTION_PER_HOUR_HOUR_WIDTH * 24)
static void Sta_ShowDistrAccessesPerDaysAndHour (unsigned long NumRows,MYSQL_RES *mysql_res)
{
@ -2335,7 +2335,7 @@ static void Sta_ShowDistrAccessesPerDaysAndHour (unsigned long NumRows,MYSQL_RES
static Sta_ColorType_t Sta_GetStatColorType (void)
{
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
unsigned UnsignedNum;
Par_GetParToText ("ColorType",UnsignedStr,10);
@ -2808,9 +2808,9 @@ static void Sta_WriteAccessHour (unsigned Hour,struct Sta_Hits *Hits,unsigned Co
/**** Show a listing with the number of clicks in every minute of the day ***/
/*****************************************************************************/
#define NUM_MINUTES_PER_DAY (60*24) // 1440 minutes in a day
#define WIDTH_SEMIDIVISION_GRAPHIC 30
#define NUM_DIVISIONS_X 10
#define Sta_NUM_MINUTES_PER_DAY (60 * 24) // 1440 minutes in a day
#define Sta_WIDTH_SEMIDIVISION_GRAPHIC 30
#define Sta_NUM_DIVISIONS_X 10
static void Sta_ShowAverageAccessesPerMinute (unsigned long NumRows,MYSQL_RES *mysql_res)
{
@ -2823,7 +2823,7 @@ static void Sta_ShowAverageAccessesPerMinute (unsigned long NumRows,MYSQL_RES *m
unsigned MinuteDayRead = 0;
unsigned i;
struct Sta_Hits Hits;
float NumClicksPerMin[NUM_MINUTES_PER_DAY];
float NumClicksPerMin[Sta_NUM_MINUTES_PER_DAY];
float Power10LeastOrEqual;
float MaxX;
float IncX;
@ -2833,7 +2833,7 @@ static void Sta_ShowAverageAccessesPerMinute (unsigned long NumRows,MYSQL_RES *m
{
/***** Compute number of clicks (and máximo) in every minute *****/
Hits.Max = 0.0;
while (MinuteDay < NUM_MINUTES_PER_DAY)
while (MinuteDay < Sta_NUM_MINUTES_PER_DAY)
{
if (NumRow <= NumRows) // If not all the result of the query are yet read
{
@ -2855,7 +2855,7 @@ static void Sta_ShowAverageAccessesPerMinute (unsigned long NumRows,MYSQL_RES *m
}
else
for (i = MinuteDayRead + 1;
i < NUM_MINUTES_PER_DAY;
i < Sta_NUM_MINUTES_PER_DAY;
i++, MinuteDay++)
NumClicksPerMin[i] = 0.0;
}
@ -2868,7 +2868,7 @@ static void Sta_ShowAverageAccessesPerMinute (unsigned long NumRows,MYSQL_RES *m
Power10LeastOrEqual = (float) pow (10.0,floor (log10 ((double) Hits.Max)));
MaxX = ceil (Hits.Max / Power10LeastOrEqual) * Power10LeastOrEqual;
}
IncX = MaxX / (float) NUM_DIVISIONS_X;
IncX = MaxX / (float) Sta_NUM_DIVISIONS_X;
if (IncX >= 1.0)
Format = "%.0f";
else if (IncX >= 0.1)
@ -2885,7 +2885,7 @@ static void Sta_ShowAverageAccessesPerMinute (unsigned long NumRows,MYSQL_RES *m
/***** Y axis and graphic *****/
for (i = 0;
i < NUM_MINUTES_PER_DAY;
i < Sta_NUM_MINUTES_PER_DAY;
i++)
Sta_WriteAccessMinute (i,NumClicksPerMin[i],MaxX);
@ -2897,11 +2897,11 @@ static void Sta_ShowAverageAccessesPerMinute (unsigned long NumRows,MYSQL_RES *m
" alt=\"\" title=\"\""
" style=\"display:block; width:%upx; height:1px;\" />"
"</td>",
WIDTH_SEMIDIVISION_GRAPHIC,Gbl.Prefs.IconsURL,
WIDTH_SEMIDIVISION_GRAPHIC);
Sta_WIDTH_SEMIDIVISION_GRAPHIC,Gbl.Prefs.IconsURL,
Sta_WIDTH_SEMIDIVISION_GRAPHIC);
/* All the intermediate divisions */
for (i = 0;
i < NUM_DIVISIONS_X*2;
i < Sta_NUM_DIVISIONS_X * 2;
i++)
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\" style=\"width:%upx;\">"
"<img src=\"%s/ejex24x1.gif\""
@ -2909,8 +2909,8 @@ static void Sta_ShowAverageAccessesPerMinute (unsigned long NumRows,MYSQL_RES *m
" style=\"display:block;"
" width:%upx; height:1px;\" />"
"</td>",
WIDTH_SEMIDIVISION_GRAPHIC,Gbl.Prefs.IconsURL,
WIDTH_SEMIDIVISION_GRAPHIC);
Sta_WIDTH_SEMIDIVISION_GRAPHIC,Gbl.Prefs.IconsURL,
Sta_WIDTH_SEMIDIVISION_GRAPHIC);
/* Last division (right) */
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\" style=\"width:%upx;\">"
"<img src=\"%s/tr24x1.gif\""
@ -2918,8 +2918,8 @@ static void Sta_ShowAverageAccessesPerMinute (unsigned long NumRows,MYSQL_RES *m
" style=\"display:block; width:%upx; height:1px;\" />"
"</td>"
"</tr>",
WIDTH_SEMIDIVISION_GRAPHIC,Gbl.Prefs.IconsURL,
WIDTH_SEMIDIVISION_GRAPHIC);
Sta_WIDTH_SEMIDIVISION_GRAPHIC,Gbl.Prefs.IconsURL,
Sta_WIDTH_SEMIDIVISION_GRAPHIC);
/***** Write again the labels of the X axis *****/
Sta_WriteLabelsXAxisAccMin (IncX,Format);
@ -2930,7 +2930,7 @@ static void Sta_ShowAverageAccessesPerMinute (unsigned long NumRows,MYSQL_RES *m
/****** Write labels of the X axis in the graphic of clicks per minute *******/
/*****************************************************************************/
#define WIDTH_DIVISION_GRAPHIC (WIDTH_SEMIDIVISION_GRAPHIC*2) // 60
#define Sta_WIDTH_DIVISION_GRAPHIC (Sta_WIDTH_SEMIDIVISION_GRAPHIC * 2) // 60
static void Sta_WriteLabelsXAxisAccMin (float IncX,const char *Format)
{
@ -2939,12 +2939,12 @@ static void Sta_WriteLabelsXAxisAccMin (float IncX,const char *Format)
fprintf (Gbl.F.Out,"<tr>");
for (i = 0, NumX = 0;
i <= NUM_DIVISIONS_X;
i <= Sta_NUM_DIVISIONS_X;
i++, NumX += IncX)
{
fprintf (Gbl.F.Out,"<td colspan=\"2\" class=\"LOG CENTER_BOTTOM\""
" style=\"width:%upx;\">",
WIDTH_DIVISION_GRAPHIC);
Sta_WIDTH_DIVISION_GRAPHIC);
fprintf (Gbl.F.Out,Format,NumX);
fprintf (Gbl.F.Out,"</td>");
}
@ -2955,7 +2955,7 @@ static void Sta_WriteLabelsXAxisAccMin (float IncX,const char *Format)
/***** Write a row of the graphic with number of clicks in every minute ******/
/*****************************************************************************/
#define WIDTH_GRAPHIC (WIDTH_DIVISION_GRAPHIC*NUM_DIVISIONS_X) // 60*10=600
#define Sta_WIDTH_GRAPHIC (Sta_WIDTH_DIVISION_GRAPHIC * Sta_NUM_DIVISIONS_X) // 60 * 10 = 600
static void Sta_WriteAccessMinute (unsigned Minute,float HitsNum,float MaxX)
{
@ -2974,8 +2974,8 @@ static void Sta_WriteAccessMinute (unsigned Minute,float HitsNum,float MaxX)
" background-repeat:repeat;\">"
"00h"
"</td>",
WIDTH_SEMIDIVISION_GRAPHIC,Gbl.Prefs.IconsURL);
else if (Minute == (NUM_MINUTES_PER_DAY - 30))
Sta_WIDTH_SEMIDIVISION_GRAPHIC,Gbl.Prefs.IconsURL);
else if (Minute == (Sta_NUM_MINUTES_PER_DAY - 30))
// If 23:30
fprintf (Gbl.F.Out,"<td rowspan=\"30\" class=\"LOG LEFT_BOTTOM\""
" style=\"width:%upx;"
@ -2984,7 +2984,7 @@ static void Sta_WriteAccessMinute (unsigned Minute,float HitsNum,float MaxX)
" background-repeat:repeat;\">"
"24h"
"</td>",
WIDTH_SEMIDIVISION_GRAPHIC,Gbl.Prefs.IconsURL);
Sta_WIDTH_SEMIDIVISION_GRAPHIC,Gbl.Prefs.IconsURL);
else if (!(Minute % 30) && (Minute % 60))
// If minute is multiple of 30 but not of 60 (i.e.: 30, 90, 150...)
fprintf (Gbl.F.Out,"<td rowspan=\"60\" class=\"LOG LEFT_MIDDLE\""
@ -2994,7 +2994,7 @@ static void Sta_WriteAccessMinute (unsigned Minute,float HitsNum,float MaxX)
" background-repeat:repeat;\">"
"%02uh"
"</td>",
WIDTH_SEMIDIVISION_GRAPHIC,Gbl.Prefs.IconsURL,(Minute + 30) / 60);
Sta_WIDTH_SEMIDIVISION_GRAPHIC,Gbl.Prefs.IconsURL,(Minute + 30) / 60);
/***** Start of cell for the graphic *****/
fprintf (Gbl.F.Out,"<td colspan=\"%u\" class=\"LEFT_BOTTOM\""
@ -3002,13 +3002,13 @@ static void Sta_WriteAccessMinute (unsigned Minute,float HitsNum,float MaxX)
" background-image:url('%s/malla%c48x1.gif');"
" background-size:60px 1px;"
" background-repeat:repeat;\">",
NUM_DIVISIONS_X*2,WIDTH_GRAPHIC,Gbl.Prefs.IconsURL,
Sta_NUM_DIVISIONS_X * 2,Sta_WIDTH_GRAPHIC,Gbl.Prefs.IconsURL,
(Minute % 60) == 0 ? 'v' :
'h');
/***** Draw bar with anchura proporcional al number of clicks *****/
if (HitsNum != 0.0)
if ((BarWidth = (unsigned) (((HitsNum * (float) WIDTH_GRAPHIC / MaxX)) + 0.5)) != 0)
if ((BarWidth = (unsigned) (((HitsNum * (float) Sta_WIDTH_GRAPHIC / MaxX)) + 0.5)) != 0)
fprintf (Gbl.F.Out,"<img src=\"%s/b%c1x1.gif\""
" alt=\"\" title=\"\""
" style=\"display:block;"
@ -3036,7 +3036,7 @@ static void Sta_ShowNumHitsPerAction (unsigned long NumRows,
struct Sta_Hits Hits;
MYSQL_ROW row;
long ActCod;
char ActTxt[Act_MAX_LENGTH_ACTION_TXT+1];
char ActTxt[Act_MAX_LENGTH_ACTION_TXT + 1];
/***** Write heading *****/
fprintf (Gbl.F.Out,"<tr>"
@ -3652,7 +3652,7 @@ static void Sta_ShowNumHitsPerCourse (unsigned long NumRows,
extern const char *Txt_Course;
extern const char *Txt_STAT_TYPE_COUNT_CAPS[Sta_NUM_COUNT_TYPES];
extern const char *Txt_Go_to_X;
extern const char *Txt_YEAR_OF_DEGREE[1+Deg_MAX_YEARS_PER_DEGREE]; // Declaration in swad_degree.c
extern const char *Txt_YEAR_OF_DEGREE[1 + Deg_MAX_YEARS_PER_DEGREE]; // Declaration in swad_degree.c
unsigned long NumRow;
unsigned long Ranking;
struct Sta_Hits Hits;
@ -3976,7 +3976,7 @@ void Sta_ShowFigures (void)
Sta_GetAndShowNumUsrsPerSideColumns, // Sta_SIDE_COLUMNS
Sta_GetAndShowNumUsrsPerPrivacy, // Sta_PRIVACY
};
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
unsigned UnsignedNum;
/***** Get the type of figure ******/
@ -8514,13 +8514,13 @@ static void Sta_GetAndShowNumUsrsPerLanguage (void)
extern const char *Hlp_STATS_Figures_language;
extern const char *Txt_STAT_USE_STAT_TYPES[Sta_NUM_FIGURES];
extern const char *Txt_Language;
extern const char *Txt_STR_LANG_ID[1+Txt_NUM_LANGUAGES];
extern const char *Txt_STR_LANG_NAME[1+Txt_NUM_LANGUAGES];
extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES];
extern const char *Txt_STR_LANG_NAME[1 + Txt_NUM_LANGUAGES];
extern const char *Txt_No_of_users;
extern const char *Txt_PERCENT_of_users;
Txt_Language_t Lan;
char Query[1024];
unsigned NumUsrs[1+Txt_NUM_LANGUAGES];
unsigned NumUsrs[1 + Txt_NUM_LANGUAGES];
unsigned NumUsrsTotal = 0;
/***** Start table *****/
@ -9420,8 +9420,10 @@ void Sta_WriteTime (char *Str,long TimeInMicroseconds)
sprintf (Str,"%ld &micro;s",TimeInMicroseconds);
else if (TimeInMicroseconds < 1000000L)
sprintf (Str,"%ld ms",TimeInMicroseconds / 1000);
else if (TimeInMicroseconds < (60*1000000L))
else if (TimeInMicroseconds < (60 * 1000000L))
sprintf (Str,"%.1f s",(float) TimeInMicroseconds / 1E6);
else
sprintf (Str,"%ld min, %ld s",TimeInMicroseconds / (60*1000000L),(TimeInMicroseconds/1000000L) % 60);
sprintf (Str,"%ld min, %ld s",
TimeInMicroseconds / (60 * 1000000L),
(TimeInMicroseconds / 1000000L) % 60);
}

50
swad_string.c
View File

@ -152,7 +152,7 @@ void Str_InsertLinks (char *Txt,unsigned long MaxLength,size_t MaxCharsURLOnScre
size_t NumChars2;
size_t NumBytesToCopy;
size_t NumBytesToShow; // Length of the link displayed on screen (may be shorter than actual length)
char LimitedURL[MAX_BYTES_LIMITED_URL+1];
char LimitedURL[MAX_BYTES_LIMITED_URL + 1];
unsigned char Ch;
/****** Initialize constant anchors and their lengths *****/
@ -316,7 +316,7 @@ void Str_InsertLinks (char *Txt,unsigned long MaxLength,size_t MaxCharsURLOnScre
Gbl.Form.Id,
ParamsStr);
Anchor1NickLength = strlen (Anchor1Nick);
if ((Links[NumLinks].Anchor1Nick = (char *) malloc (Anchor1NickLength+1)) == NULL)
if ((Links[NumLinks].Anchor1Nick = (char *) malloc (Anchor1NickLength + 1)) == NULL)
Lay_ShowErrorAndExit ("Not enough memory to insert link.");
strcpy (Links[NumLinks].Anchor1Nick,Anchor1Nick);
Links[NumLinks].Anchor1NickLength = Anchor1NickLength;
@ -329,7 +329,7 @@ void Str_InsertLinks (char *Txt,unsigned long MaxLength,size_t MaxCharsURLOnScre
Gbl.Usrs.Me.Logged ? Gbl.Form.UniqueId :
Gbl.Form.Id);
Anchor2NickLength = strlen (Anchor2Nick);
if ((Links[NumLinks].Anchor2Nick = (char *) malloc (Anchor2NickLength+1)) == NULL)
if ((Links[NumLinks].Anchor2Nick = (char *) malloc (Anchor2NickLength + 1)) == NULL)
Lay_ShowErrorAndExit ("Not enough memory to insert link.");
strcpy (Links[NumLinks].Anchor2Nick,Anchor2Nick);
Links[NumLinks].Anchor2NickLength = Anchor2NickLength;
@ -1102,7 +1102,7 @@ void Str_ChangeFormat (Str_ChangeFrom_t ChangeFrom,Str_ChangeTo_t ChangeTo,
break;
case '%': /* Change "%XX" --> "&#decimal_number;" */
IsSpecialChar = true;
sscanf (PtrSrc+1,"%2X",&SpecialChar);
sscanf (PtrSrc + 1,"%2X",&SpecialChar);
LengthSpecStrSrc = 3;
break;
case 0x27: /* Change single comilla --> "&#39;" to avoid SQL code injection */
@ -1726,7 +1726,7 @@ void Str_RemoveTrailingSpacesHTML (char *Str)
break;
}
*(Ptr+1) = '\0';
*(Ptr + 1) = '\0';
}
/*****************************************************************************/
@ -1930,7 +1930,7 @@ bool Str_WriteUntilStrFoundInFileIncludingStr (FILE *FileTgt,FILE *FileSrc,const
static int Str_ReadCharAndSkipComments (FILE *FileSrc,Str_SkipHTMLComments_t SkipHTMLComments)
{
int Ch;
char StrAux[1+1]; /* To check "!--" string */
char StrAux[1 + 1]; /* To check "!--" string */
Ch = fgetc (FileSrc);
@ -1973,7 +1973,7 @@ static int Str_ReadCharAndSkipComments (FILE *FileSrc,Str_SkipHTMLComments_t Ski
static int Str_ReadCharAndSkipCommentsWriting (FILE *FileSrc,FILE *FileTgt,Str_SkipHTMLComments_t SkipHTMLComments)
{
int Ch;
char StrAux[1+1]; /* To check "!--" string */
char StrAux[1 + 1]; /* To check "!--" string */
Ch = fgetc (FileSrc);
@ -2017,7 +2017,7 @@ static int Str_ReadCharAndSkipCommentsWriting (FILE *FileSrc,FILE *FileTgt,Str_S
static int Str_ReadCharAndSkipCommentsBackward (FILE *FileSrc,Str_SkipHTMLComments_t SkipHTMLComments)
{
int Ch;
char StrAux[3+1]; /* To check "--" string */
char StrAux[3 + 1]; /* To check "--" string */
Ch = fgetc (FileSrc);
@ -2063,7 +2063,7 @@ char *Str_GetCellFromHTMLTableSkipComments (FILE *FileSrc,char *Str,int MaxLengt
bool EndCellFound = false;
bool DirectiveFound;
bool SpaceFound;
char StrAux[1+1]; // To find next "/td>" or "nbsp;"
char StrAux[1 + 1]; // To find next "/td>" or "nbsp;"
Str[0] = '\0';
@ -2338,7 +2338,7 @@ void Str_GetNextStringUntilComma (const char **StrSrc,char *StrDst,size_t MaxLen
if (!(isspace ((int) *Ptr) ||
*Ptr == '\xA0')) // Unicode translation for &nbsp;
break;
*(Ptr+1) = '\0';
*(Ptr + 1) = '\0';
}
/*****************************************************************************/
@ -2567,11 +2567,11 @@ void Str_FilePrintStrChangingBRToRetAndNBSPToSpace (FILE *FileTgt,const char *St
/* Is &nbsp;? */
if (*Str == '&')
{
if (*(Str+1) == 'N' || *(Str+1) == 'n')
if (*(Str+2) == 'B' || *(Str+2) == 'b')
if (*(Str+3) == 'S' || *(Str+3) == 's')
if (*(Str+4) == 'P' || *(Str+4) == 'p')
if (*(Str+5) == ';')
if (*(Str + 1) == 'N' || *(Str + 1) == 'n')
if (*(Str + 2) == 'B' || *(Str + 2) == 'b')
if (*(Str + 3) == 'S' || *(Str + 3) == 's')
if (*(Str + 4) == 'P' || *(Str + 4) == 'p')
if (*(Str + 5) == ';')
{
fputc ((int) ' ',FileTgt);
Str += 6;
@ -2581,19 +2581,19 @@ void Str_FilePrintStrChangingBRToRetAndNBSPToSpace (FILE *FileTgt,const char *St
/* Is <br> or <br />? */
else if (*Str == '<')
{
if (*(Str+1) == 'B' || *(Str+1) == 'b')
if (*(Str+2) == 'R' || *(Str+2) == 'r')
if (*(Str + 1) == 'B' || *(Str + 1) == 'b')
if (*(Str + 2) == 'R' || *(Str + 2) == 'r')
{
if (*(Str+3) == '>')
if (*(Str + 3) == '>')
{
fputc ((int) '\n',FileTgt);
Str += 4;
continue;
}
else if (*(Str+3) == ' ')
else if (*(Str + 3) == ' ')
{
if (*(Str+4) == '/')
if (*(Str+5) == '>')
if (*(Str + 4) == '/')
if (*(Str + 5) == '>')
{
fputc ((int) '\n',FileTgt);
Str += 6;
@ -2620,7 +2620,7 @@ If what is read exceed MaxLength, abort and return 0.
If StrDelimit is not found, return -1.
*/
#define MAX_LENGTH_BOUNDARY_STR 100
#define Str_MAX_LENGTH_BOUNDARY_STR 100
int Str_ReadFileUntilBoundaryStr (FILE *FileSrc,char *StrDst,
const char *BoundaryStr,
@ -2630,7 +2630,7 @@ int Str_ReadFileUntilBoundaryStr (FILE *FileSrc,char *StrDst,
unsigned NumBytesIdentical; // Number of characters identical in each iteration of the loop
unsigned NumBytesReadButNotDiscarded; // Number of characters read from the source file...
// ...and not fully discarded in search
int Buffer[MAX_LENGTH_BOUNDARY_STR+1];
int Buffer[Str_MAX_LENGTH_BOUNDARY_STR + 1];
unsigned StartIndex;
unsigned i;
char *Ptr; // Pointer used to go through StrDst writing characters
@ -2643,7 +2643,7 @@ int Str_ReadFileUntilBoundaryStr (FILE *FileSrc,char *StrDst,
*StrDst = '\0';
return 1;
}
if (LengthBoundaryStr > MAX_LENGTH_BOUNDARY_STR)
if (LengthBoundaryStr > Str_MAX_LENGTH_BOUNDARY_STR)
Lay_ShowErrorAndExit ("Delimiter string too large.");
Ptr = StrDst;
@ -2868,7 +2868,7 @@ void Str_ConvertToValidFileName (char *Str)
/******************* Create a random alphanumeric string *********************/
/*****************************************************************************/
#define NUM_ALPHANUM_CHARS (10+26+26)
#define NUM_ALPHANUM_CHARS (10 + 26 + 26)
void Str_CreateRandomAlphanumStr (char *Str,size_t Length)
{

49
swad_survey.c
View File

@ -50,8 +50,8 @@ extern struct Globals Gbl;
/*****************************************************************************/
#define Svy_MAX_LENGTH_ANSWER 1000
#define Svy_MAX_BYTES_ANSWER (Svy_MAX_LENGTH_ANSWER*Str_MAX_CHARACTER)
#define Svy_MAX_BYTES_LIST_ANSWER_TYPES (10+(Svy_NUM_ANS_TYPES-1)*(1+10))
#define Svy_MAX_BYTES_ANSWER (Svy_MAX_LENGTH_ANSWER * Str_MAX_CHARACTER)
#define Svy_MAX_BYTES_LIST_ANSWER_TYPES (10 + (Svy_NUM_ANS_TYPES - 1) * (1 + 10))
typedef enum
{
@ -76,7 +76,7 @@ struct SurveyQuestion
char *Text;
} AnsChoice[Svy_MAX_ANSWERS_PER_QUESTION];
bool AllAnsTypes;
char ListAnsTypes[Svy_MAX_BYTES_LIST_ANSWER_TYPES+1];
char ListAnsTypes[Svy_MAX_BYTES_LIST_ANSWER_TYPES + 1];
};
/*****************************************************************************/
@ -672,7 +672,7 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst,
static void Svy_WriteAuthor (struct Survey *Svy)
{
bool ShowPhoto = false;
char PhotoURL[PATH_MAX+1];
char PhotoURL[PATH_MAX + 1];
char FirstName[Usr_MAX_BYTES_NAME + 1];
char Surnames[Usr_MAX_BYTES_SURNAMES + 1];
struct UsrData UsrDat;
@ -683,7 +683,7 @@ static void Svy_WriteAuthor (struct Survey *Svy)
/***** Get data of author *****/
UsrDat.UsrCod = Svy->UsrCod;
if (Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat)) // Get of the database the data of the author
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (&UsrDat,PhotoURL);
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (&UsrDat,PhotoURL);
/***** Show photo *****/
Pho_ShowUsrPhoto (&UsrDat,ShowPhoto ? PhotoURL :
@ -799,7 +799,7 @@ static void Svy_WriteStatus (struct Survey *Svy)
static void Svy_GetParamSvyOrderType (void)
{
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
unsigned UnsignedNum;
/***** Set default order type *****/
@ -1508,10 +1508,10 @@ static void Svy_PutParamSvyCod (long SvyCod)
static long Svy_GetParamSvyCod (void)
{
char LongStr[1+10+1];
char LongStr[1 + 10 + 1];
/***** Get parameter with code of survey *****/
Par_GetParToText ("SvyCod",LongStr,1+10);
Par_GetParToText ("SvyCod",LongStr,1 + 10);
return Str_ConvertStrCodToLongCod (LongStr);
}
@ -1811,7 +1811,7 @@ void Svy_RequestCreatOrEditSvy (void)
struct Survey Svy;
struct SurveyQuestion SvyQst;
bool ItsANewSurvey;
char Txt[Cns_MAX_BYTES_TEXT+1];
char Txt[Cns_MAX_BYTES_TEXT + 1];
/***** Get parameters *****/
Svy_GetParamSvyOrderType ();
@ -2111,7 +2111,7 @@ void Svy_RecFormSurvey (void)
bool ItsANewSurvey;
bool NewSurveyIsCorrect = true;
unsigned NumUsrsToBeNotifiedByEMail;
char Txt[Cns_MAX_BYTES_TEXT+1];
char Txt[Cns_MAX_BYTES_TEXT + 1];
/***** Get the code of the survey *****/
ItsANewSurvey = ((NewSvy.SvyCod = Svy_GetParamSvyCod ()) == -1L);
@ -2192,7 +2192,7 @@ void Svy_RecFormSurvey (void)
if (NewSvy.TimeUTC[Svy_START_TIME] == 0)
NewSvy.TimeUTC[Svy_START_TIME] = Gbl.StartExecutionTimeUTC;
if (NewSvy.TimeUTC[Svy_END_TIME] == 0)
NewSvy.TimeUTC[Svy_END_TIME] = NewSvy.TimeUTC[Svy_START_TIME] + 24*60*60; // +24 hours
NewSvy.TimeUTC[Svy_END_TIME] = NewSvy.TimeUTC[Svy_START_TIME] + 24 * 60 * 60; // +24 hours
/***** Get users who can answer this survey *****/
NewSvy.Roles = Rol_GetSelectedRoles ();
@ -2268,7 +2268,7 @@ static void Svy_CreateSurvey (struct Survey *Svy,const char *Txt)
{
extern const char *Sco_ScopeDB[Sco_NUM_SCOPES];
extern const char *Txt_Created_new_survey_X;
char Query[1024+Cns_MAX_BYTES_TEXT];
char Query[1024 + Cns_MAX_BYTES_TEXT];
/***** Create a new survey *****/
sprintf (Query,"INSERT INTO surveys"
@ -2303,7 +2303,7 @@ static void Svy_UpdateSurvey (struct Survey *Svy,const char *Txt)
{
extern const char *Sco_ScopeDB[Sco_NUM_SCOPES];
extern const char *Txt_The_survey_has_been_modified;
char Query[1024+Cns_MAX_BYTES_TEXT];
char Query[1024 + Cns_MAX_BYTES_TEXT];
/***** Update the data of the survey *****/
sprintf (Query,"UPDATE surveys"
@ -2834,10 +2834,10 @@ static void Svy_PutParamQstCod (long QstCod)
static long Svy_GetParamQstCod (void)
{
char LongStr[1+10+1];
char LongStr[1 + 10 + 1];
/***** Get parameter with code of survey *****/
Par_GetParToText ("QstCod",LongStr,1+10);
Par_GetParToText ("QstCod",LongStr,1 + 10);
return Str_ConvertStrCodToLongCod (LongStr);
}
@ -2976,13 +2976,13 @@ void Svy_ReceiveQst (void)
extern const char *Txt_You_can_not_leave_empty_intermediate_answers;
extern const char *Txt_You_must_type_at_least_the_first_two_answers;
extern const char *Txt_The_survey_has_been_modified;
char Txt[Cns_MAX_BYTES_TEXT+1];
char Query[512+Cns_MAX_BYTES_TEXT+1];
char Txt[Cns_MAX_BYTES_TEXT + 1];
char Query[512 + Cns_MAX_BYTES_TEXT + 1];
long SvyCod;
struct SurveyQuestion SvyQst;
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
unsigned NumAns;
char AnsStr[8+10+1];
char AnsStr[8 + 10 + 1];
unsigned NumLastAns;
bool ThereIsEndOfAnswers;
bool Error = false;
@ -3305,7 +3305,7 @@ static void Svy_ListSvyQuestions (struct Survey *Svy,struct SurveyQuestion *SvyQ
fprintf (Gbl.F.Out,"<td class=\"DAT_SMALL CENTER_TOP COLOR%u\">"
"%u"
"</td>",
Gbl.RowEvenOdd,SvyQst->QstInd+1);
Gbl.RowEvenOdd,SvyQst->QstInd + 1);
/* Write the question type (row[2]) */
SvyQst->AnswerType = Svy_ConvertFromStrAnsTypDBToAnsTyp (row[2]);
@ -3698,10 +3698,10 @@ static void Svy_ReceiveAndStoreUserAnswersToASurvey (long SvyCod)
unsigned NumQst;
unsigned NumQsts;
long QstCod;
char ParamName[3+10+6+1];
char StrAnswersIndexes[Svy_MAX_ANSWERS_PER_QUESTION*(10+1)];
char ParamName[3 + 10 + 6 + 1];
char StrAnswersIndexes[Svy_MAX_ANSWERS_PER_QUESTION * (10 + 1)];
const char *Ptr;
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
unsigned AnsInd;
/***** Get questions of this survey from database *****/
@ -3727,7 +3727,8 @@ static void Svy_ReceiveAndStoreUserAnswersToASurvey (long SvyCod)
/* Get possible parameter with the user's answer */
sprintf (ParamName,"Ans%010u",(unsigned) QstCod);
// Lay_ShowAlert (Lay_INFO,ParamName);
Par_GetParMultiToText (ParamName,StrAnswersIndexes,Svy_MAX_ANSWERS_PER_QUESTION*(10+1));
Par_GetParMultiToText (ParamName,StrAnswersIndexes,
Svy_MAX_ANSWERS_PER_QUESTION * (10 + 1));
Ptr = StrAnswersIndexes;
while (*Ptr)
{

50
swad_syllabus.c
View File

@ -60,7 +60,7 @@ extern struct Globals Gbl;
#define Syl_WIDTH_NUM_SYLLABUS 20
static const char *StyleSyllabus[1+Syl_MAX_LEVELS_SYLLABUS] =
static const char *StyleSyllabus[1 + Syl_MAX_LEVELS_SYLLABUS] =
{
"",
"T1",
@ -82,9 +82,9 @@ static const char *StyleSyllabus[1+Syl_MAX_LEVELS_SYLLABUS] =
struct ItemSyllabus
{
int Level;
int CodItem[1+Syl_MAX_LEVELS_SYLLABUS];
int CodItem[1 + Syl_MAX_LEVELS_SYLLABUS];
bool HasChildren;
char Text[Syl_MAX_BYTES_TEXT_ITEM+1];
char Text[Syl_MAX_BYTES_TEXT_ITEM + 1];
};
/*****************************************************************************/
@ -118,7 +118,7 @@ static void Syl_WriteNumItem (char *StrDst,FILE *FileTgt,int Level,int *CodItem)
void Syl_GetParamWhichSyllabus (void)
{
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
unsigned UnsignedNum;
/***** Get which syllabus I want to see *****/
@ -172,7 +172,7 @@ void Syl_PutFormWhichSyllabus (void)
void Syl_GetParamItemNumber (void)
{
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
Par_GetParToText ("NumI",UnsignedStr,10);
if (sscanf (UnsignedStr,"%u",&Gbl.Syllabus.NumItem) != 1)
@ -359,11 +359,11 @@ static void Syl_SetSyllabusTypeFromAction (void)
void Syl_LoadListItemsSyllabusIntoMemory (long CrsCod)
{
char PathFile[PATH_MAX+1];
char PathFile[PATH_MAX + 1];
long PostBeginList;
unsigned NumItem = 0;
int N;
int CodItem[1+Syl_MAX_LEVELS_SYLLABUS]; // To make numeration
int CodItem[1 + Syl_MAX_LEVELS_SYLLABUS]; // To make numeration
int Result;
unsigned NumItemsWithChildren = 0;
@ -500,12 +500,12 @@ void Syl_FreeListItemsSyllabus (void)
int Syl_ReadLevelItemSyllabus (void)
{
int Level;
char StrlLevel[11+1];
char StrlLevel[11 + 1];
if (!Str_FindStrInFile (Gbl.F.XML,"nivel=\"",Str_NO_SKIP_HTML_COMMENTS))
Lay_ShowErrorAndExit ("Wrong syllabus format.");
if (Str_ReadFileUntilBoundaryStr (Gbl.F.XML,StrlLevel,"\"",1,
(unsigned long long) (11+1)) != 1)
(unsigned long long) (11 + 1)) != 1)
Lay_ShowErrorAndExit ("Wrong syllabus format.");
if (sscanf (StrlLevel,"%d",&Level) != 1)
Lay_ShowErrorAndExit ("Wrong syllabus format.");
@ -773,7 +773,7 @@ static void Syl_ShowRowSyllabus (unsigned NumItem,
int Syl_WriteSyllabusIntoHTMLBuffer (char **HTMLBuffer)
{
char FileNameHTMLTmp[PATH_MAX+1];
char FileNameHTMLTmp[PATH_MAX + 1];
FILE *FileHTMLTmp;
size_t Length;
@ -806,7 +806,7 @@ int Syl_WriteSyllabusIntoHTMLBuffer (char **HTMLBuffer)
Length = (size_t) ftell (FileHTMLTmp);
/* Allocate memory for buffer */
if ((*HTMLBuffer = (char *) malloc (Length+1)) == NULL)
if ((*HTMLBuffer = (char *) malloc (Length + 1)) == NULL)
{
fclose (FileHTMLTmp);
unlink (FileNameHTMLTmp);
@ -977,7 +977,7 @@ void Syl_PutParamNumItem (unsigned NumItem)
static void Syl_WriteNumItem (char *StrDst,FILE *FileTgt,int Level,int *CodItem)
{
int N;
char InStr[1+10+1];
char InStr[1 + 10 + 1];
if (StrDst)
StrDst[0] = '\0';
@ -1076,9 +1076,9 @@ void Syl_DownItemSyllabus (void)
void Syl_ChangePlaceItemSyllabus (Syl_ChangePosItem_t UpOrDownPos)
{
char PathFile[PATH_MAX+1];
char PathOldFile[PATH_MAX+1];
char PathNewFile[PATH_MAX+1];
char PathFile[PATH_MAX + 1];
char PathOldFile[PATH_MAX + 1];
char PathNewFile[PATH_MAX + 1];
FILE *NewFile;
unsigned NumItem;
struct MoveSubtrees Subtree;
@ -1268,9 +1268,9 @@ void Syl_LeftItemSyllabus (void)
void Syl_ChangeLevelItemSyllabus (Syl_ChangeLevelItem_t IncreaseOrDecreaseLevel)
{
char PathFile[PATH_MAX+1];
char PathOldFile[PATH_MAX+1];
char PathNewFile[PATH_MAX+1];
char PathFile[PATH_MAX + 1];
char PathOldFile[PATH_MAX + 1];
char PathNewFile[PATH_MAX + 1];
FILE *NewFile;
/***** Set syllabus type depending on current action *****/
@ -1325,12 +1325,12 @@ void Syl_ChangeLevelItemSyllabus (Syl_ChangeLevelItem_t IncreaseOrDecreaseLevel)
void Syl_InsertItemSyllabus (void)
{
char PathFile[PATH_MAX+1];
char PathOldFile[PATH_MAX+1];
char PathNewFile[PATH_MAX+1];
char PathFile[PATH_MAX + 1];
char PathOldFile[PATH_MAX + 1];
char PathNewFile[PATH_MAX + 1];
FILE *NewFile;
unsigned NumItem;
char Txt[Syl_MAX_BYTES_TEXT_ITEM+1];
char Txt[Syl_MAX_BYTES_TEXT_ITEM + 1];
/***** Set syllabus type depending on current action *****/
Syl_SetSyllabusTypeFromAction ();
@ -1392,9 +1392,9 @@ void Syl_InsertItemSyllabus (void)
void Syl_ModifyItemSyllabus (void)
{
char PathFile[PATH_MAX+1];
char PathOldFile[PATH_MAX+1];
char PathNewFile[PATH_MAX+1];
char PathFile[PATH_MAX + 1];
char PathOldFile[PATH_MAX + 1];
char PathNewFile[PATH_MAX + 1];
FILE *NewFile;
/***** Set syllabus type depending on current action *****/

2
swad_tab.h
View File

@ -31,7 +31,7 @@
/***************************** Public constants ******************************/
/*****************************************************************************/
#define Tab_NUM_TABS (1+12)
#define Tab_NUM_TABS (1 + 12)
/*****************************************************************************/
/******************************* Public types ********************************/

128
swad_test.c
View File

@ -78,7 +78,7 @@ const char *Tst_StrAnswerTypesXML[Tst_NUM_ANS_TYPES] =
/**************************** Private constants ******************************/
/*****************************************************************************/
#define Tst_MAX_BYTES_TAGS_LIST (16*1024)
#define Tst_MAX_BYTES_TAGS_LIST (16 * 1024)
#define Tst_MAX_BYTES_FLOAT_ANSWER 30 // Maximum length of the strings that store an floating point answer
const char *Tst_PluggableDB[Tst_NUM_OPTIONS_PLUGGABLE] =
@ -497,7 +497,7 @@ void Tst_AssessTest (void)
extern const char *Txt_The_test_X_has_already_been_assessed_previously;
extern const char *Txt_There_was_an_error_in_assessing_the_test_X;
unsigned NumTst;
char YN[1+1];
char YN[1 + 1];
long TstCod = -1L; // Initialized to avoid warning
unsigned NumQstsNotBlank;
double TotalScore;
@ -580,8 +580,8 @@ void Tst_AssessTest (void)
static void Tst_GetQuestionsAndAnswersFromForm (void)
{
unsigned NumQst;
char StrQstIndOrAns[3+10+1]; // "Qstxx...x", "Indxx...x" or "Ansxx...x"
char LongStr[1+10+1];
char StrQstIndOrAns[3 + 10 + 1]; // "Qstxx...x", "Indxx...x" or "Ansxx...x"
char LongStr[1 + 10 + 1];
/***** Get questions and answers *****/
for (NumQst = 0;
@ -590,7 +590,7 @@ static void Tst_GetQuestionsAndAnswersFromForm (void)
{
/* Get question code */
sprintf (StrQstIndOrAns,"Qst%06u",NumQst);
Par_GetParToText (StrQstIndOrAns,LongStr,1+10);
Par_GetParToText (StrQstIndOrAns,LongStr,1 + 10);
if ((Gbl.Test.QstCodes[NumQst] = Str_ConvertStrCodToLongCod (LongStr)) < 0)
Lay_ShowErrorAndExit ("Code of question is missing.");
@ -1418,10 +1418,10 @@ void Tst_DisableTag (void)
static long Tst_GetParamTagCode (void)
{
char StrLong[1+10+1];
char StrLong[1 + 10 + 1];
long TagCod;
Par_GetParToText ("TagCod",StrLong,1+10);
Par_GetParToText ("TagCod",StrLong,1 + 10);
if ((TagCod = Str_ConvertStrCodToLongCod (StrLong)) < 0)
Lay_ShowErrorAndExit ("Code of tag is missing.");
@ -1437,9 +1437,9 @@ void Tst_RenameTag (void)
extern const char *Txt_You_can_not_leave_the_name_of_the_tag_X_empty;
extern const char *Txt_The_tag_X_has_been_renamed_as_Y;
extern const char *Txt_The_tag_X_has_not_changed;
char OldTagTxt[Tst_MAX_BYTES_TAG+1];
char NewTagTxt[Tst_MAX_BYTES_TAG+1];
char Query[1024+2*Tst_MAX_BYTES_TAG];
char OldTagTxt[Tst_MAX_BYTES_TAG + 1];
char NewTagTxt[Tst_MAX_BYTES_TAG + 1];
char Query[1024 + 2 * Tst_MAX_BYTES_TAG];
long ExistingTagCod;
long OldTagCod;
bool ComplexRenaming;
@ -1616,7 +1616,7 @@ static void Tst_ShowFormSelTags (unsigned long NumRows,MYSQL_RES *mysql_res,
MYSQL_ROW row;
bool TagHidden = false;
const char *Ptr;
char TagText[Tst_MAX_BYTES_TAG+1];
char TagText[Tst_MAX_BYTES_TAG + 1];
/***** Label *****/
fprintf (Gbl.F.Out,"<tr>"
@ -2106,7 +2106,7 @@ bool Tst_CheckIfCourseHaveTestsAndPluggableIsUnknown (void)
void Tst_ReceiveConfigTst (void)
{
extern const char *Txt_The_test_configuration_has_been_updated;
char IntStr[1+10+1];
char IntStr[1 + 10 + 1];
int IntNum;
long LongNum;
char Query[512];
@ -2116,21 +2116,21 @@ void Tst_ReceiveConfigTst (void)
/***** Get number of questions *****/
/* Get minimum number of questions */
Par_GetParToText ("NumQstMin",IntStr,1+10);
Par_GetParToText ("NumQstMin",IntStr,1 + 10);
if (sscanf (IntStr,"%d",&IntNum) != 1)
Lay_ShowErrorAndExit ("Minimum number of questions is missing.");
Gbl.Test.Config.Min = (IntNum < 1) ? 1 :
(unsigned) IntNum;
/* Get default number of questions */
Par_GetParToText ("NumQstDef",IntStr,1+10);
Par_GetParToText ("NumQstDef",IntStr,1 + 10);
if (sscanf (IntStr,"%d",&IntNum) != 1)
Lay_ShowErrorAndExit ("Default number of questions is missing.");
Gbl.Test.Config.Def = (IntNum < 1) ? 1 :
(unsigned) IntNum;
/* Get maximum number of questions */
Par_GetParToText ("NumQstMax",IntStr,1+10);
Par_GetParToText ("NumQstMax",IntStr,1 + 10);
if (sscanf (IntStr,"%d",&IntNum) != 1)
Lay_ShowErrorAndExit ("Maximum number of questions is missing.");
Gbl.Test.Config.Max = (IntNum < 1) ? 1 :
@ -2140,7 +2140,7 @@ void Tst_ReceiveConfigTst (void)
Tst_CheckAndCorrectNumbersQst ();
/***** Get minimum time between consecutive tests, per question *****/
Par_GetParToText ("MinTimeNxtTstPerQst",IntStr,1+10);
Par_GetParToText ("MinTimeNxtTstPerQst",IntStr,1 + 10);
if (sscanf (IntStr,"%ld",&LongNum) != 1)
Lay_ShowErrorAndExit ("Minimum time per question between two test is missing.");
Gbl.Test.Config.MinTimeNxtTstPerQst = (LongNum < 1L) ? 0UL :
@ -2173,7 +2173,7 @@ void Tst_ReceiveConfigTst (void)
static Tst_Pluggable_t Tst_GetPluggableFromForm (void)
{
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
unsigned UnsignedNum;
Par_GetParToText ("Pluggable",UnsignedStr,10);
@ -2194,7 +2194,7 @@ static Tst_Pluggable_t Tst_GetPluggableFromForm (void)
static Tst_Feedback_t Tst_GetFeedbackTypeFromForm (void)
{
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
unsigned UnsignedNum;
Par_GetParToText ("Feedback",UnsignedStr,10);
@ -2249,7 +2249,7 @@ static void Tst_ShowFormAnswerTypes (unsigned NumCols)
extern const char *Txt_All_types_of_answers;
extern const char *Txt_TST_STR_ANSWER_TYPES[Tst_NUM_ANS_TYPES];
Tst_AnswerType_t AnsType;
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
const char *Ptr;
/***** Label *****/
@ -2348,7 +2348,7 @@ void Tst_ListQuestionsToEdit (void)
/********** Get from the database several test questions for listing *********/
/*****************************************************************************/
#define Tst_MAX_LENGTH_QUERY_TEST (16*1024 - 1)
#define Tst_MAX_LENGTH_QUERY_TEST (16 * 1024 - 1)
static unsigned long Tst_GetQuestionsForEdit (MYSQL_RES **mysql_res)
{
@ -2359,10 +2359,10 @@ static unsigned long Tst_GetQuestionsForEdit (MYSQL_RES **mysql_res)
unsigned NumItemInList;
const char *Ptr;
char TagText[Tst_MAX_BYTES_TAG + 1];
char LongStr[1+10+1];
char UnsignedStr[10+1];
char LongStr[1 + 10 + 1];
char UnsignedStr[10 + 1];
Tst_AnswerType_t AnsType;
char CrsCodStr[1+10+1];
char CrsCodStr[1 + 10 + 1];
/***** Select questions *****/
/* Start query */
@ -2526,10 +2526,10 @@ static unsigned long Tst_GetQuestionsForTest (MYSQL_RES **mysql_res)
long LengthQuery;
unsigned NumItemInList;
const char *Ptr;
char TagText[Tst_MAX_BYTES_TAG+1];
char UnsignedStr[10+1];
char TagText[Tst_MAX_BYTES_TAG + 1];
char UnsignedStr[10 + 1];
Tst_AnswerType_t AnsType;
char StrNumQsts[10+1];
char StrNumQsts[10 + 1];
/***** Select questions without hidden tags *****/
/*
@ -3382,7 +3382,7 @@ static void Tst_WriteChoiceAnsViewTest (unsigned NumQst,long QstCod,bool Shuffle
MYSQL_ROW row;
unsigned Index;
bool ErrorInIndex = false;
char ParamName[3+6+1];
char ParamName[3 + 6 + 1];
/***** Get answers of a question from database *****/
Gbl.Test.Answer.NumOptions = Tst_GetAnswersQst (QstCod,&mysql_res,Shuffle); // Result: AnsInd,Answer,Correct
@ -3488,7 +3488,7 @@ static void Tst_WriteChoiceAnsAssessTest (unsigned NumQst,MYSQL_RES *mysql_res,
extern const char *Txt_TEST_Correct_answer;
unsigned NumOpt;
MYSQL_ROW row;
char StrOneIndex[10+1];
char StrOneIndex[10 + 1];
const char *Ptr;
unsigned Indexes[Tst_MAX_OPTIONS_PER_QUESTION]; // Indexes of all answers of this question
int AnsUsr;
@ -4192,7 +4192,7 @@ static void Tst_WriteScoreEnd (void)
static void Tst_WriteParamQstCod (unsigned NumQst,long QstCod)
{
char ParamName[3+6+1];
char ParamName[3 + 6 + 1];
sprintf (ParamName,"Qst%06u",NumQst);
Par_PutHiddenParamLong (ParamName,QstCod);
@ -4274,9 +4274,9 @@ static bool Tst_GetParamsTst (void)
extern const char *Txt_You_must_select_one_ore_more_tags;
extern const char *Txt_You_must_select_one_ore_more_types_of_answer;
extern const char *Txt_The_number_of_questions_must_be_in_the_interval_X;
char YN[1+1];
char YN[1 + 1];
bool Error = false;
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
unsigned UnsignedNum;
/***** Tags *****/
@ -4285,7 +4285,7 @@ static bool Tst_GetParamsTst (void)
Gbl.Test.Tags.All = (Str_ConvertToUpperLetter (YN[0]) == 'Y');
/* Get the tags */
if ((Gbl.Test.Tags.List = malloc (Tst_MAX_BYTES_TAGS_LIST+1)) == NULL)
if ((Gbl.Test.Tags.List = malloc (Tst_MAX_BYTES_TAGS_LIST + 1)) == NULL)
Lay_ShowErrorAndExit ("Not enough memory to store tags.");
Par_GetParMultiToText ("ChkTag",Gbl.Test.Tags.List,Tst_MAX_BYTES_TAGS_LIST);
@ -4350,7 +4350,7 @@ static bool Tst_GetParamsTst (void)
static unsigned Tst_GetAndCheckParamNumTst (void)
{
char IntStr[1+10+1];
char IntStr[1 + 10 + 1];
int IntNum;
/***** Get number of test *****/
@ -4375,7 +4375,7 @@ static unsigned Tst_GetAndCheckParamNumTst (void)
static void Tst_GetParamNumQst (void)
{
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
unsigned UnsignedNum;
/***** Set default number of questions *****/
@ -4394,7 +4394,7 @@ static void Tst_GetParamNumQst (void)
static bool Tst_GetCreateXMLFromForm (void)
{
char YN[1+1];
char YN[1 + 1];
Par_GetParToText ("CreateXML",YN,1);
return (Str_ConvertToUpperLetter (YN[0]) == 'Y');
@ -4408,7 +4408,7 @@ static int Tst_CountNumTagsInList (void)
{
const char *Ptr;
int NumTags = 0;
char TagText[Tst_MAX_BYTES_TAG+1];
char TagText[Tst_MAX_BYTES_TAG + 1];
/***** Go over the list Gbl.Test.Tags.List counting the number of tags *****/
if (Gbl.Test.Tags.List)
@ -4431,7 +4431,7 @@ static int Tst_CountNumAnswerTypesInList (void)
{
const char *Ptr;
int NumAnsTypes = 0;
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
/***** Go over the list Gbl.Test.ListAnsTypes counting the number of types of answer *****/
Ptr = Gbl.Test.ListAnsTypes;
@ -5280,8 +5280,8 @@ static Tst_AnswerType_t Tst_ConvertFromUnsignedStrToAnsTyp (const char *Unsigned
void Tst_ReceiveQst (void)
{
char Stem[Cns_MAX_BYTES_TEXT+1];
char Feedback[Cns_MAX_BYTES_TEXT+1];
char Stem[Cns_MAX_BYTES_TEXT + 1];
char Feedback[Cns_MAX_BYTES_TEXT + 1];
/***** Create test question *****/
Tst_QstConstructor ();
@ -5321,15 +5321,15 @@ void Tst_ReceiveQst (void)
static void Tst_GetQstFromForm (char *Stem,char *Feedback)
{
char UnsignedStr[10+1];
char YN[1+1];
char UnsignedStr[10 + 1];
char YN[1 + 1];
unsigned NumTag;
unsigned NumTagRead;
unsigned NumOpt;
char TagStr[6+10+1];
char AnsStr[6+10+1];
char FbStr[5+10+1];
char StrMultiAns[Tst_MAX_SIZE_ANSWERS_ONE_QST+1];
char TagStr[6 + 10 + 1];
char AnsStr[6 + 10 + 1];
char FbStr[5 + 10 + 1];
char StrMultiAns[Tst_MAX_SIZE_ANSWERS_ONE_QST + 1];
const char *Ptr;
unsigned NumCorrectAns;
@ -5385,7 +5385,7 @@ static void Tst_GetQstFromForm (char *Stem,char *Feedback)
if (!Tst_AllocateTextChoiceAnswer (0))
Lay_ShowErrorAndExit (Gbl.Message);
Par_GetParToText ("AnsInt",Gbl.Test.Answer.Options[0].Text,1+10);
Par_GetParToText ("AnsInt",Gbl.Test.Answer.Options[0].Text,1 + 10);
break;
case Tst_ANS_FLOAT:
if (!Tst_AllocateTextChoiceAnswer (0))
@ -5778,7 +5778,7 @@ double Tst_GetFloatAnsFromStr (char *Str)
static long Tst_GetTagCodFromTagTxt (const char *TagTxt)
{
char Query[256+Tst_MAX_BYTES_TAG];
char Query[256 + Tst_MAX_BYTES_TAG];
MYSQL_RES *mysql_res;
MYSQL_ROW row;
unsigned long NumRows;
@ -5822,7 +5822,7 @@ static long Tst_GetTagCodFromTagTxt (const char *TagTxt)
static long Tst_CreateNewTag (long CrsCod,const char *TagTxt)
{
char Query[256+Tst_MAX_BYTES_TAG];
char Query[256 + Tst_MAX_BYTES_TAG];
/***** Insert new tag into tst_tags table *****/
sprintf (Query,"INSERT INTO tst_tags (CrsCod,ChangeTime,TagTxt,TagHidden)"
@ -5880,7 +5880,7 @@ void Tst_RequestRemoveQst (void)
{
extern const char *Txt_Do_you_really_want_to_remove_the_question_X;
extern const char *Txt_Remove_question;
char YN[1+1];
char YN[1 + 1];
bool EditingOnlyThisQst;
/***** Get main parameters from form *****/
@ -5934,7 +5934,7 @@ void Tst_RemoveQst (void)
{
extern const char *Txt_Question_removed;
char Query[512];
char YN[1+1];
char YN[1 + 1];
bool EditingOnlyThisQst;
/***** Get the question code *****/
@ -5983,7 +5983,7 @@ void Tst_ChangeShuffleQst (void)
extern const char *Txt_The_answers_of_the_question_with_code_X_will_appear_shuffled;
extern const char *Txt_The_answers_of_the_question_with_code_X_will_appear_without_shuffling;
char Query[512];
char YN[1+1];
char YN[1 + 1];
bool EditingOnlyThisQst;
bool Shuffle;
@ -6029,9 +6029,9 @@ void Tst_ChangeShuffleQst (void)
static long Tst_GetQstCod (void)
{
char LongStr[1+10+1];
char LongStr[1 + 10 + 1];
Par_GetParToText ("QstCod",LongStr,1+10);
Par_GetParToText ("QstCod",LongStr,1 + 10);
return Str_ConvertStrCodToLongCod (LongStr);
}
@ -6066,7 +6066,7 @@ static void Tst_InsertOrUpdateQstIntoDB (void)
if ((Query = malloc (512 +
Gbl.Test.Stem.Length +
Gbl.Test.Feedback.Length +
Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64+
Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64 +
Img_MAX_BYTES_TITLE)) == NULL)
Lay_ShowErrorAndExit ("Not enough memory to store database query.");
@ -6171,7 +6171,7 @@ static void Tst_InsertAnswersIntoDB (void)
unsigned i;
/***** Allocate space for query *****/
if ((Query = malloc (256+Tst_MAX_BYTES_ANSWER_OR_FEEDBACK*2)) == NULL)
if ((Query = malloc (256 + Tst_MAX_BYTES_ANSWER_OR_FEEDBACK * 2)) == NULL)
Lay_ShowErrorAndExit ("Not enough memory to store database query.");
/***** Insert answers in the answers table *****/
@ -7518,7 +7518,7 @@ static void Tst_ShowTestResults (struct UsrData *UsrDat)
static void Tst_ShowDataUsr (struct UsrData *UsrDat,unsigned NumTestResults)
{
bool ShowPhoto;
char PhotoURL[PATH_MAX+1];
char PhotoURL[PATH_MAX + 1];
/***** Show user's photo and name *****/
fprintf (Gbl.F.Out,"<td ");
@ -7526,7 +7526,7 @@ static void Tst_ShowDataUsr (struct UsrData *UsrDat,unsigned NumTestResults)
fprintf (Gbl.F.Out,"rowspan=\"%u\"",NumTestResults + 1);
fprintf (Gbl.F.Out," class=\"LEFT_TOP COLOR%u\">",
Gbl.RowEvenOdd);
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (UsrDat,PhotoURL);
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (UsrDat,PhotoURL);
Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL :
NULL,
"PHOTO45x60",Pho_ZOOM,false);
@ -7573,10 +7573,10 @@ static void Tst_PutParamTstCod (long TstCod)
static long Tst_GetParamTstCod (void)
{
char LongStr[1+10+1];
char LongStr[1 + 10 + 1];
/***** Get parameter with code of test *****/
Par_GetParToText ("TstCod",LongStr,1+10);
Par_GetParToText ("TstCod",LongStr,1 + 10);
return Str_ConvertStrCodToLongCod (LongStr);
}
@ -7601,7 +7601,7 @@ void Tst_ShowOneTestResult (void)
unsigned NumQstsNotBlank;
double TotalScore;
bool ShowPhoto;
char PhotoURL[PATH_MAX+1];
char PhotoURL[PATH_MAX + 1];
bool ItsMe;
bool ICanViewTest;
bool ICanViewScore;
@ -7697,7 +7697,7 @@ void Tst_ShowOneTestResult (void)
fprintf (Gbl.F.Out,", %s",
Gbl.Usrs.Other.UsrDat.FirstName);
fprintf (Gbl.F.Out,"<br />");
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (&Gbl.Usrs.Other.UsrDat,PhotoURL);
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (&Gbl.Usrs.Other.UsrDat,PhotoURL);
Pho_ShowUsrPhoto (&Gbl.Usrs.Other.UsrDat,ShowPhoto ? PhotoURL :
NULL,
"PHOTO45x60",Pho_ZOOM,false);
@ -7925,9 +7925,9 @@ static void Tst_GetTestResultDataByTstCod (long TstCod,time_t *TstTimeUTC,
static void Tst_StoreOneTestResultQstInDB (long TstCod,long QstCod,unsigned NumQst,double Score)
{
char Query[256+Tst_MAX_SIZE_INDEXES_ONE_QST+Tst_MAX_SIZE_ANSWERS_ONE_QST];
char Indexes[Tst_MAX_SIZE_INDEXES_ONE_QST+1];
char Answers[Tst_MAX_SIZE_ANSWERS_ONE_QST+1];
char Query[256 + Tst_MAX_SIZE_INDEXES_ONE_QST + Tst_MAX_SIZE_ANSWERS_ONE_QST];
char Indexes[Tst_MAX_SIZE_INDEXES_ONE_QST + 1];
char Answers[Tst_MAX_SIZE_ANSWERS_ONE_QST + 1];
/***** Replace each separator of multiple parameters by a comma *****/
/* In database commas are used as separators instead of special chars */

6
swad_test.h
View File

@ -38,8 +38,8 @@
#define Tst_MAX_LENGTH_TAG (256 -1)
#define Tst_MAX_BYTES_TAG (Tst_MAX_LENGTH_TAG*Str_MAX_CHARACTER)
#define Tst_MAX_OPTIONS_PER_QUESTION 10
#define Tst_MAX_SIZE_INDEXES_ONE_QST (Tst_MAX_OPTIONS_PER_QUESTION*(10+1))
#define Tst_MAX_SIZE_ANSWERS_ONE_QST (Tst_MAX_OPTIONS_PER_QUESTION*(10+1))
#define Tst_MAX_SIZE_INDEXES_ONE_QST (Tst_MAX_OPTIONS_PER_QUESTION * (10 + 1))
#define Tst_MAX_SIZE_ANSWERS_ONE_QST (Tst_MAX_OPTIONS_PER_QUESTION * (10 + 1))
#define Tst_MAX_LENGTH_ANSWER 1000
#define Tst_MAX_BYTES_ANSWER_OR_FEEDBACK (Tst_MAX_LENGTH_ANSWER*Str_MAX_CHARACTER)
@ -86,7 +86,7 @@ struct Tst_Config
};
#define Tst_NUM_ANS_TYPES 6
#define Tst_MAX_BYTES_LIST_ANSWER_TYPES (10+(Tst_NUM_ANS_TYPES-1)*(1+10))
#define Tst_MAX_BYTES_LIST_ANSWER_TYPES (10 + (Tst_NUM_ANS_TYPES-1) * (1 + 10))
typedef enum
{
Tst_ANS_INT = 0,

2
swad_test_import.c
View File

@ -167,7 +167,7 @@ void TsI_CreateXML (unsigned long NumRows,MYSQL_RES *mysql_res)
extern const char *Tst_StrAnswerTypesXML[Tst_NUM_ANS_TYPES];
extern const char *Txt_NEW_LINE;
extern const char *Txt_XML_file;
char PathPubFile[PATH_MAX+1];
char PathPubFile[PATH_MAX + 1];
unsigned long NumRow;
MYSQL_ROW row;
long QstCod;

44
swad_text.c
View File

@ -105,7 +105,7 @@ const char *Txt_NEW_LINE = "\r\n"; // End of line in a file. If we put only \n t
// i with tilde: &#297;
/***** Languages *****/
const char *Txt_STR_LANG_ID[1+Txt_NUM_LANGUAGES] = // ISO 639-1 language codes
const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES] = // ISO 639-1 language codes
{
"", // Txt_LANGUAGE_UNKNOWN
"ca", // Txt_LANGUAGE_CA
@ -139,7 +139,7 @@ const unsigned Txt_Current_CGI_SWAD_Language = Txt_LANGUAGE_PL;
const unsigned Txt_Current_CGI_SWAD_Language = Txt_LANGUAGE_PT;
#endif
const char *Txt_STR_LANG_NAME[1+Txt_NUM_LANGUAGES] =
const char *Txt_STR_LANG_NAME[1 + Txt_NUM_LANGUAGES] =
{
"",
"Catal&agrave;",
@ -152,7 +152,7 @@ const char *Txt_STR_LANG_NAME[1+Txt_NUM_LANGUAGES] =
"Polski",
"Portugu&ecirc;s",
};
const char *Txt_Do_you_want_to_change_the_language_to_LANGUAGE[1+Txt_NUM_LANGUAGES] =
const char *Txt_Do_you_want_to_change_the_language_to_LANGUAGE[1 + Txt_NUM_LANGUAGES] =
{
"",
"Voleu canviar l'idioma a catal&agrave;?",
@ -165,7 +165,7 @@ const char *Txt_Do_you_want_to_change_the_language_to_LANGUAGE[1+Txt_NUM_LANGUAG
"Czy chcesz zmieni&cacute; j&eogon;zyk na polski?",
"Voc&ecirc; quer mudar o idioma para portugu&ecirc;s?",
};
const char *Txt_Do_you_want_to_change_your_language_to_LANGUAGE[1+Txt_NUM_LANGUAGES] =
const char *Txt_Do_you_want_to_change_your_language_to_LANGUAGE[1 + Txt_NUM_LANGUAGES] =
{
"",
"Voleu canviar el seu idioma a catal&agrave;?",
@ -178,7 +178,7 @@ const char *Txt_Do_you_want_to_change_your_language_to_LANGUAGE[1+Txt_NUM_LANGUA
"Czy chcesz zmieni&cacute; j&eogon;zyk na polski?",
"Voc&ecirc; quer mudar suo idioma para portugu&ecirc;s?",
};
const char *Txt_Switch_to_LANGUAGE[1+Txt_NUM_LANGUAGES] =
const char *Txt_Switch_to_LANGUAGE[1 + Txt_NUM_LANGUAGES] =
{
"",
"Canviar a catal&agrave;",
@ -191,7 +191,7 @@ const char *Txt_Switch_to_LANGUAGE[1+Txt_NUM_LANGUAGES] =
"Prze&lstrok;&aogon;cz na polski",
"Mudar para portugu&ecirc;s",
};
const char *Txt_Switching_to_LANGUAGE[1+Txt_NUM_LANGUAGES] =
const char *Txt_Switching_to_LANGUAGE[1 + Txt_NUM_LANGUAGES] =
{
"",
"Canviant a catal&agrave;&hellip;",
@ -261,7 +261,7 @@ const char *Txt_Confirmation_of_your_email_NO_HTML = // Don't use HTML entities
// The following variables are compilated together in all languages because they are used in emails...
// ...and each email is sent in the language of the recipient
const char *Txt_Course_NO_HTML[1+Txt_NUM_LANGUAGES] = // Don't use HTML entities like &egrave; here
const char *Txt_Course_NO_HTML[1 + Txt_NUM_LANGUAGES] = // Don't use HTML entities like &egrave; here
{
"",
"Assignatura",
@ -275,7 +275,7 @@ const char *Txt_Course_NO_HTML[1+Txt_NUM_LANGUAGES] = // Don't use HTML entities
"Disciplina",
};
const char *Txt_Dear_NO_HTML[Usr_NUM_SEXS][1+Txt_NUM_LANGUAGES] = // Don't use HTML entities like &oacute; here
const char *Txt_Dear_NO_HTML[Usr_NUM_SEXS][1 + Txt_NUM_LANGUAGES] = // Don't use HTML entities like &oacute; here
{
{
// Usr_SEX_UNKNOWN
@ -331,7 +331,7 @@ const char *Txt_Dear_NO_HTML[Usr_NUM_SEXS][1+Txt_NUM_LANGUAGES] = // Don't use H
}
};
const char *Txt_Forum_NO_HTML[1+Txt_NUM_LANGUAGES] = // Don't use HTML entities like &oacute; here
const char *Txt_Forum_NO_HTML[1 + Txt_NUM_LANGUAGES] = // Don't use HTML entities like &oacute; here
{
"",
"Fòrum",
@ -345,7 +345,7 @@ const char *Txt_Forum_NO_HTML[1+Txt_NUM_LANGUAGES] = // Don't use HTML entities
"Fórum",
};
const char *Txt_General_NO_HTML[1+Txt_NUM_LANGUAGES] = // Don't use HTML entities like &eacute; here
const char *Txt_General_NO_HTML[1 + Txt_NUM_LANGUAGES] = // Don't use HTML entities like &eacute; here
{
"",
"General",
@ -359,7 +359,7 @@ const char *Txt_General_NO_HTML[1+Txt_NUM_LANGUAGES] = // Don't use HTML entitie
"Geral",
};
const char *Txt_Go_to_NO_HTML[1+Txt_NUM_LANGUAGES] = // Don't use HTML entities like &agrave; here
const char *Txt_Go_to_NO_HTML[1 + Txt_NUM_LANGUAGES] = // Don't use HTML entities like &agrave; here
{
"",
"Anar a",
@ -457,7 +457,7 @@ const char *Txt_If_you_just_request_from_X_the_confirmation_of_your_email_Y_NO_H
" if you have confirmed your email address.\n\n"; // Necessita de tradução
#endif
const char *Txt_If_you_no_longer_wish_to_receive_email_notifications_NO_HTML[1+Txt_NUM_LANGUAGES] = // Don't use HTML entities like &egrave; here
const char *Txt_If_you_no_longer_wish_to_receive_email_notifications_NO_HTML[1 + Txt_NUM_LANGUAGES] = // Don't use HTML entities like &egrave; here
{
"",
"Si no desitgeu rebre més avisos per correu,"
@ -501,7 +501,7 @@ const char *Txt_Institutions_NO_HTML =
"Instituções";
#endif
const char *Txt_MSG_From_NO_HTML[1+Txt_NUM_LANGUAGES] = // Don't use HTML entities like &egrave; here
const char *Txt_MSG_From_NO_HTML[1 + Txt_NUM_LANGUAGES] = // Don't use HTML entities like &egrave; here
{
"",
"De",
@ -515,7 +515,7 @@ const char *Txt_MSG_From_NO_HTML[1+Txt_NUM_LANGUAGES] = // Don't use HTML entiti
"De",
};
const char *Txt_Notifications_NO_HTML[1+Txt_NUM_LANGUAGES] = // Don't use HTML entities like &egrave; here
const char *Txt_Notifications_NO_HTML[1 + Txt_NUM_LANGUAGES] = // Don't use HTML entities like &egrave; here
{
"",
"Notificacions",
@ -529,7 +529,7 @@ const char *Txt_Notifications_NO_HTML[1+Txt_NUM_LANGUAGES] = // Don't use HTML e
"Notificações",
};
const char *Txt_New_password_NO_HTML[1+Txt_NUM_LANGUAGES] = // Don't use HTML entities like &ntilde; here.
const char *Txt_New_password_NO_HTML[1 + Txt_NUM_LANGUAGES] = // Don't use HTML entities like &ntilde; here.
{
"",
"Nova contrasenya",
@ -543,7 +543,7 @@ const char *Txt_New_password_NO_HTML[1+Txt_NUM_LANGUAGES] = // Don't use HTML en
"Nova senha",
};
const char *Txt_NOTIFY_EVENTS_SINGULAR_NO_HTML[Ntf_NUM_NOTIFY_EVENTS][1+Txt_NUM_LANGUAGES] = // Don't use HTML entities like &uuml; here.
const char *Txt_NOTIFY_EVENTS_SINGULAR_NO_HTML[Ntf_NUM_NOTIFY_EVENTS][1 + Txt_NUM_LANGUAGES] = // Don't use HTML entities like &uuml; here.
{
{
// Ntf_EVENT_UNKNOWN
@ -807,7 +807,7 @@ const char *Txt_NOTIFY_EVENTS_SINGULAR_NO_HTML[Ntf_NUM_NOTIFY_EVENTS][1+Txt_NUM_
},
};
const char *Txt_NOTIFY_EVENTS_There_is_a_new_event_NO_HTML[1+Txt_NUM_LANGUAGES] = // Warning: it is very important to include %s in the following sentences
const char *Txt_NOTIFY_EVENTS_There_is_a_new_event_NO_HTML[1 + Txt_NUM_LANGUAGES] = // Warning: it is very important to include %s in the following sentences
{ // Don't use HTML entities like &uuml; here.
"",
"Hi ha un nou esdeveniment en %s",
@ -821,7 +821,7 @@ const char *Txt_NOTIFY_EVENTS_There_is_a_new_event_NO_HTML[1+Txt_NUM_LANGUAGES]
"Existe um novo evento em %s",
};
const char *Txt_NOTIFY_EVENTS_There_are_X_new_events_NO_HTML[1+Txt_NUM_LANGUAGES] = // Warning: it is very important to include %u and %s in the following sentences
const char *Txt_NOTIFY_EVENTS_There_are_X_new_events_NO_HTML[1 + Txt_NUM_LANGUAGES] = // Warning: it is very important to include %u and %s in the following sentences
{ // Don't use HTML entities like &uuml; here.
"",
"Hi ha %u nous esdeveniments en %s",
@ -835,7 +835,7 @@ const char *Txt_NOTIFY_EVENTS_There_are_X_new_events_NO_HTML[1+Txt_NUM_LANGUAGES
"Há %u novos eventos em %s",
};
const char *Txt_only_teachers_NO_HTML[1+Txt_NUM_LANGUAGES] = // Don't use HTML entities like &oacute; here
const char *Txt_only_teachers_NO_HTML[1 + Txt_NUM_LANGUAGES] = // Don't use HTML entities like &oacute; here
{
"",
", professors",
@ -849,7 +849,7 @@ const char *Txt_only_teachers_NO_HTML[1+Txt_NUM_LANGUAGES] = // Don't use HTML e
", professores",
};
const char *Txt_Please_do_not_reply_to_this_automatically_generated_email_NO_HTML[1+Txt_NUM_LANGUAGES] = // Don't use HTML entities like &egrave; here
const char *Txt_Please_do_not_reply_to_this_automatically_generated_email_NO_HTML[1 + Txt_NUM_LANGUAGES] = // Don't use HTML entities like &egrave; here
{
"",
"Si us plau, no respongui a aquest correu generat automàticament.",
@ -863,7 +863,7 @@ const char *Txt_Please_do_not_reply_to_this_automatically_generated_email_NO_HTM
"Por favor, não responda a este email gerado automaticamente.",
};
const char *Txt_TAB_Messages_NO_HTML[1+Txt_NUM_LANGUAGES] = // Don't use HTML entities like &egrave; here
const char *Txt_TAB_Messages_NO_HTML[1 + Txt_NUM_LANGUAGES] = // Don't use HTML entities like &egrave; here
{
"",
"Missatges",
@ -1267,7 +1267,7 @@ const char *Txt_UPLOAD_FILE_Upload_time_too_long_maximum_X_minutes_NO_HTML = //
"Tempo de upload muito longo (máximo %lu minutos).";
#endif
const char *Txt_user_NO_HTML[Usr_NUM_SEXS][1+Txt_NUM_LANGUAGES] = // Don't use HTML entities like &egrave; here
const char *Txt_user_NO_HTML[Usr_NUM_SEXS][1 + Txt_NUM_LANGUAGES] = // Don't use HTML entities like &egrave; here
{
{
// Usr_SEX_UNKNOWN

2
swad_theme.c
View File

@ -317,7 +317,7 @@ void The_ChangeTheme (void)
The_Theme_t The_GetParamTheme (void)
{
char ThemeId[MAX_THEME_ID+1];
char ThemeId[MAX_THEME_ID + 1];
The_Theme_t Theme;
Par_GetParToText ("Theme",ThemeId,MAX_THEME_ID);

26
swad_timetable.c
View File

@ -59,10 +59,10 @@ extern struct Globals Gbl;
#define TT_PERCENT_WIDTH_OF_A_DAY (TT_PERCENT_WIDTH_OF_A_MINICOLUMN*TT_NUM_MINICOLUMNS_PER_DAY) // Width (%) of each day
#define TT_PERCENT_WIDTH_OF_ALL_DAYS (TT_PERCENT_WIDTH_OF_A_DAY*TT_DAYS) // Width (%) of all days
#define TT_PERCENT_WIDTH_OF_A_SEPARATION_COLUMN 1 // Width (%) of left and right columns (frame)
#define TT_PERCENT_WIDTH_OF_AN_HOUR_COLUMN ((100-TT_PERCENT_WIDTH_OF_ALL_DAYS-TT_PERCENT_WIDTH_OF_A_SEPARATION_COLUMN*2)/2) // Width (%) of the separation columns
#define TT_PERCENT_WIDTH_OF_AN_HOUR_COLUMN ((100 - TT_PERCENT_WIDTH_OF_ALL_DAYS - TT_PERCENT_WIDTH_OF_A_SEPARATION_COLUMN * 2) / 2) // Width (%) of the separation columns
#define TT_MAX_BYTES_STR_CLASS_TYPE 256
#define TT_MAX_BYTES_STR_DURATION ((2+1+2+1+1)*Str_LENGTH_STR_HEX) // "hh:mm h"
#define TT_MAX_BYTES_STR_DURATION ((2 + 1 + 2 + 1 + 1) * Str_LENGTH_STR_HEX) // "hh:mm h"
#define TT_MAX_LENGTH_PLACE 32
/*****************************************************************************/
@ -106,8 +106,8 @@ struct
{
unsigned NumColumns;
struct TimeTableColumn Columns[TT_MAX_COLUMNS_PER_CELL];
} TimeTable[TT_DAYS][TT_HOURS_PER_DAY*2];
bool TimeTableHoursChecked[TT_HOURS_PER_DAY*2];
} TimeTable[TT_DAYS][TT_HOURS_PER_DAY * 2];
bool TimeTableHoursChecked[TT_HOURS_PER_DAY * 2];
/*****************************************************************************/
/***************************** Internal prototypes **************************/
@ -162,10 +162,10 @@ static void TT_ShowTimeTableGrpsSelected (void)
static void TT_GetParamsTimeTable (void)
{
char UnsignedStr[10+1];
char LongStr[1+10+1];
char StrClassType[TT_MAX_BYTES_STR_CLASS_TYPE+1];
char StrDuration[TT_MAX_BYTES_STR_DURATION+1];
char UnsignedStr[10 + 1];
char LongStr[1 + 10 + 1];
char StrClassType[TT_MAX_BYTES_STR_CLASS_TYPE + 1];
char StrDuration[TT_MAX_BYTES_STR_DURATION + 1];
unsigned Hours,Minutes;
/***** Get day (0: monday, 1: tuesday,..., 4: friday *****/
@ -203,14 +203,14 @@ static void TT_GetParamsTimeTable (void)
Par_GetParToText ("ModHorGrp",Gbl.TimeTable.Group,TT_MAX_BYTES_GROUP);
/***** Get group code *****/
Par_GetParToText ("ModTTGrpCod",LongStr,1+10);
Par_GetParToText ("ModTTGrpCod",LongStr,1 + 10);
if (LongStr[0])
{
if (sscanf (LongStr,"%ld",&Gbl.TimeTable.GrpCod) != 1)
Lay_ShowErrorAndExit ("Wrong code of group.");
}
else
Gbl.TimeTable.GrpCod = -1;
Gbl.TimeTable.GrpCod = -1L;
/***** Get place *****/
Par_GetParToText ("ModHorLugar",Gbl.TimeTable.Place,TT_MAX_BYTES_PLACE);
@ -879,7 +879,8 @@ static void TT_DrawTimeTable (void)
" style=\"width:%u%%; height:40px;\">"
"%2u:00"
"</td>",
TT_PERCENT_WIDTH_OF_AN_HOUR_COLUMN,TT_START_HOUR + (Hour+1)/2);
TT_PERCENT_WIDTH_OF_AN_HOUR_COLUMN,
TT_START_HOUR + (Hour + 1) / 2);
/* Empty column used to adjust height */
TT_DrawCellAlignTimeTable ();
@ -944,7 +945,8 @@ static void TT_DrawTimeTable (void)
" style=\"width:%u%%; height:40px;\">"
"%2u:00"
"</td>",
TT_PERCENT_WIDTH_OF_AN_HOUR_COLUMN,TT_START_HOUR + (Hour+1)/2);
TT_PERCENT_WIDTH_OF_AN_HOUR_COLUMN,
TT_START_HOUR + (Hour + 1) / 2);
fprintf (Gbl.F.Out,"</tr>");
}

91
swad_user.c
View File

@ -94,7 +94,7 @@ const char *Usr_IconsClassPhotoOrList[Usr_NUM_USR_LIST_TYPES] =
#define Usr_NUM_ALL_FIELDS_DATA_TCH 11
const char *Usr_UsrDatMainFieldNames[Usr_NUM_MAIN_FIELDS_DATA_USR];
#define Usr_MAX_LENGTH_QUERY_GET_LIST_USRS (16*1024 - 1)
#define Usr_MAX_LENGTH_QUERY_GET_LIST_USRS (16 * 1024 - 1)
/*****************************************************************************/
/****************************** Internal types *******************************/
@ -450,7 +450,7 @@ void Usr_GetEncryptedUsrCodFromUsrCod (struct UsrData *UsrDat) // TODO: Remove t
void Usr_GetUsrDataFromUsrCod (struct UsrData *UsrDat)
{
extern const bool Cal_DayIsValidAsFirstDayOfWeek[7];
extern const char *Txt_STR_LANG_ID[1+Txt_NUM_LANGUAGES];
extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES];
extern const char *The_ThemeId[The_NUM_THEMES];
extern const char *Ico_IconSetId[Ico_NUM_ICON_SETS];
char Query[1024];
@ -1001,14 +1001,19 @@ unsigned Usr_GetNumUsrsInCrssOfAUsr (long UsrCod,Rol_Role_t UsrRole,
bool Usr_CheckIfICanViewRecordStd (const struct UsrData *UsrDat)
{
bool HeIsAStudentInCurrentCrs = UsrDat->RoleInCurrentCrsDB == Rol_STUDENT;
bool IBelongToCurrentCrs = Gbl.Usrs.Me.UsrDat.RoleInCurrentCrsDB == Rol_STUDENT ||
Gbl.Usrs.Me.UsrDat.RoleInCurrentCrsDB == Rol_TEACHER;
bool IAmLoggedAsSysAdm = Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM;
if (UsrDat->RoleInCurrentCrsDB != Rol_STUDENT) // Not a student in the current course
return false;
return HeIsAStudentInCurrentCrs && // Course is selected and user is student in it
(IBelongToCurrentCrs || // I am student or teacher in current course
IAmLoggedAsSysAdm); // I am logged as system admin
// The user is a student in the current course
switch (Gbl.Usrs.Me.LoggedRole)
{
case Rol_STUDENT:
case Rol_TEACHER:
case Rol_SYS_ADM:
return true;
default:
return false;
}
}
/*****************************************************************************/
@ -1793,7 +1798,7 @@ bool Usr_CheckIfIBelongToCrs (long CrsCod)
unsigned Usr_GetCtysFromUsr (long UsrCod,MYSQL_RES **mysql_res)
{
extern const char *Txt_STR_LANG_ID[1+Txt_NUM_LANGUAGES];
extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES];
char Query[512];
/***** Get the institutions a user belongs to from database *****/
@ -2097,7 +2102,7 @@ void Usr_WelcomeUsr (void)
extern const char *Txt_Welcome_X_and_happy_birthday[Usr_NUM_SEXS];
extern const char *Txt_Welcome_X[Usr_NUM_SEXS];
extern const char *Txt_Welcome[Usr_NUM_SEXS];
extern const char *Txt_Switching_to_LANGUAGE[1+Txt_NUM_LANGUAGES];
extern const char *Txt_Switching_to_LANGUAGE[1 + Txt_NUM_LANGUAGES];
bool CongratulateMyBirthday;
if (Gbl.Usrs.Me.Logged)
@ -2239,7 +2244,7 @@ void Usr_WriteLoggedUsrHead (void)
extern const char *Txt_Role;
extern const char *Txt_ROLES_SINGUL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
bool ShowPhoto;
char PhotoURL[PATH_MAX+1];
char PhotoURL[PATH_MAX + 1];
char UsrName[Usr_MAX_BYTES_NAME + 1];
/***** User's role *****/
@ -2261,7 +2266,7 @@ void Usr_WriteLoggedUsrHead (void)
}
/***** Show my photo *****/
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (&Gbl.Usrs.Me.UsrDat,PhotoURL);
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (&Gbl.Usrs.Me.UsrDat,PhotoURL);
Pho_ShowUsrPhoto (&Gbl.Usrs.Me.UsrDat,ShowPhoto ? PhotoURL :
NULL,
"PHOTO18x24",Pho_ZOOM,false);
@ -2417,7 +2422,7 @@ void Usr_PutParamOtherUsrCodEncrypted (void)
Usr_PutParamUsrCodEncrypted (Gbl.Usrs.Other.UsrDat.EncryptedUsrCod);
}
void Usr_PutParamUsrCodEncrypted (const char EncryptedUsrCod[Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64+1])
void Usr_PutParamUsrCodEncrypted (const char EncryptedUsrCod[Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64 + 1])
{
Par_PutHiddenParamString ("OtherUsrCod",EncryptedUsrCod);
}
@ -3189,7 +3194,7 @@ void Usr_WriteRowUsrMainData (unsigned NumUsr,struct UsrData *UsrDat,
{
/***** Show user's photo *****/
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE %s\">",BgColor);
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (UsrDat,PhotoURL);
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (UsrDat,PhotoURL);
Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL :
NULL,
"PHOTO21x28",Pho_ZOOM,false);
@ -3223,7 +3228,7 @@ void Usr_WriteRowUsrMainData (unsigned NumUsr,struct UsrData *UsrDat,
static void Usr_WriteRowGstAllData (struct UsrData *UsrDat)
{
char PhotoURL[PATH_MAX+1];
char PhotoURL[PATH_MAX + 1];
bool ShowPhoto;
struct Instit Ins;
struct Centre Ctr;
@ -3237,7 +3242,7 @@ static void Usr_WriteRowGstAllData (struct UsrData *UsrDat)
/***** Show guest's photo *****/
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE COLOR%u\">",
Gbl.RowEvenOdd);
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (UsrDat,PhotoURL);
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (UsrDat,PhotoURL);
Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL :
NULL,
"PHOTO21x28",Pho_NO_ZOOM,false);
@ -3321,7 +3326,7 @@ static void Usr_WriteRowGstAllData (struct UsrData *UsrDat)
static void Usr_WriteRowStdAllData (struct UsrData *UsrDat,char *GroupNames)
{
char PhotoURL[PATH_MAX+1];
char PhotoURL[PATH_MAX + 1];
bool ShowPhoto;
unsigned NumGrpTyp,NumField;
MYSQL_RES *mysql_res;
@ -3339,7 +3344,7 @@ static void Usr_WriteRowStdAllData (struct UsrData *UsrDat,char *GroupNames)
/***** Show student's photo *****/
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE COLOR%u\">",
Gbl.RowEvenOdd);
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (UsrDat,PhotoURL);
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (UsrDat,PhotoURL);
Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL :
NULL,
"PHOTO21x28",Pho_NO_ZOOM,false);
@ -3441,7 +3446,7 @@ static void Usr_WriteRowStdAllData (struct UsrData *UsrDat,char *GroupNames)
static void Usr_WriteRowTchAllData (struct UsrData *UsrDat)
{
char PhotoURL[PATH_MAX+1];
char PhotoURL[PATH_MAX + 1];
bool ShowPhoto;
struct Instit Ins;
bool ItsMe = (Gbl.Usrs.Me.UsrDat.UsrCod == UsrDat->UsrCod);
@ -3458,7 +3463,7 @@ static void Usr_WriteRowTchAllData (struct UsrData *UsrDat)
/***** Show teacher's photo *****/
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE COLOR%u\">",
Gbl.RowEvenOdd);
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (UsrDat,PhotoURL);
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (UsrDat,PhotoURL);
Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL :
NULL,
"PHOTO21x28",Pho_NO_ZOOM,false);
@ -3519,7 +3524,7 @@ static void Usr_WriteRowTchAllData (struct UsrData *UsrDat)
static void Usr_WriteRowAdmData (unsigned NumUsr,struct UsrData *UsrDat)
{
char PhotoURL[PATH_MAX+1];
char PhotoURL[PATH_MAX + 1];
bool ShowPhoto;
struct Instit Ins;
@ -3537,7 +3542,7 @@ static void Usr_WriteRowAdmData (unsigned NumUsr,struct UsrData *UsrDat)
/***** Show administrator's photo *****/
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE COLOR%u\">",
Gbl.RowEvenOdd);
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (UsrDat,PhotoURL);
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (UsrDat,PhotoURL);
Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL :
NULL,
"PHOTO21x28",Pho_ZOOM,false);
@ -3607,7 +3612,7 @@ static void Usr_WriteMainUsrDataExceptUsrID (struct UsrData *UsrDat,
static void Usr_WriteEmail (struct UsrData *UsrDat,const char *BgColor)
{
bool ShowEmail;
char MailLink[7+Usr_MAX_BYTES_USR_EMAIL+1]; // mailto:mail_address
char MailLink[7 + Usr_MAX_BYTES_USR_EMAIL + 1]; // mailto:mail_address
if (UsrDat->Email[0])
{
@ -3935,7 +3940,7 @@ static void Usr_BuildQueryToGetUsrsLstCrs (Rol_Role_t Role,
{
unsigned NumPositiveCods = 0;
unsigned NumNegativeCods = 0;
char LongStr[1+10+1];
char LongStr[1 + 10 + 1];
unsigned NumGrpSel;
long GrpCod;
unsigned NumGrpTyp;
@ -4253,7 +4258,7 @@ void Usr_GetListUsrs (Rol_Role_t Role,Sco_Scope_t Scope)
void Usr_SearchListUsrs (Rol_Role_t Role)
{
char Query[4*1024];
char Query[4 * 1024];
const char *QueryFields =
"DISTINCT usr_data.UsrCod,"
"usr_data.EncryptedUsrCod,"
@ -4499,7 +4504,7 @@ void Usr_SearchListUsrs (Rol_Role_t Role)
void Usr_CreateTmpTableAndSearchCandidateUsrs (const char *SearchQuery)
{
char Query[16*1024];
char Query[16 * 1024];
/***** Create temporary table with candidate users *****/
/*
@ -5046,7 +5051,7 @@ void Usr_FreeUsrsList (Rol_Role_t Role)
bool Usr_GetIfShowBigList (unsigned NumUsrs,const char *OnSubmit)
{
bool ShowBigList;
char YN[1+1];
char YN[1 + 1];
/***** If list of users is too big... *****/
if (NumUsrs > Cfg_MIN_NUM_USERS_TO_CONFIRM_SHOW_BIG_LIST)
@ -5157,8 +5162,8 @@ Lay_ShowErrorAndExit (Gbl.Message);
if (Gbl.Usrs.Select.All[0])
if ((Length = strlen (Gbl.Usrs.Select.All)) < Usr_MAX_BYTES_LIST_ENCRYPTED_USR_CODS)
{
Gbl.Usrs.Select.All[Length ] = Par_SEPARATOR_PARAM_MULTIPLE;
Gbl.Usrs.Select.All[Length+1] = '\0';
Gbl.Usrs.Select.All[Length ] = Par_SEPARATOR_PARAM_MULTIPLE;
Gbl.Usrs.Select.All[Length + 1] = '\0';
}
Str_Concat (Gbl.Usrs.Select.All,Gbl.Usrs.Select.Tch,
Usr_MAX_BYTES_LIST_ENCRYPTED_USR_CODS);
@ -5170,8 +5175,8 @@ Lay_ShowErrorAndExit (Gbl.Message);
if (Gbl.Usrs.Select.All[0])
if ((Length = strlen (Gbl.Usrs.Select.All)) < Usr_MAX_BYTES_LIST_ENCRYPTED_USR_CODS)
{
Gbl.Usrs.Select.All[Length ] = Par_SEPARATOR_PARAM_MULTIPLE;
Gbl.Usrs.Select.All[Length+1] = '\0';
Gbl.Usrs.Select.All[Length ] = Par_SEPARATOR_PARAM_MULTIPLE;
Gbl.Usrs.Select.All[Length + 1] = '\0';
}
Str_Concat (Gbl.Usrs.Select.All,Gbl.Usrs.Select.Std,
Usr_MAX_BYTES_LIST_ENCRYPTED_USR_CODS);
@ -5193,7 +5198,7 @@ bool Usr_GetListMsgRecipientsWrittenExplicitelyBySender (bool WriteErrorMsgs)
size_t LengthSelectedUsrsCods;
size_t LengthUsrCod;
const char *Ptr;
char UsrIDNickOrEmail[1024+1];
char UsrIDNickOrEmail[1024 + 1];
struct UsrData UsrDat;
struct ListUsrCods ListUsrCods;
bool Error = false;
@ -5366,7 +5371,7 @@ bool Usr_GetListMsgRecipientsWrittenExplicitelyBySender (bool WriteErrorMsgs)
bool Usr_FindUsrCodInListOfSelectedUsrs (const char *EncryptedUsrCodToFind)
{
const char *Ptr;
char EncryptedUsrCod[Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64+1];
char EncryptedUsrCod[Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64 + 1];
if (Gbl.Usrs.Select.All)
{
@ -5880,7 +5885,8 @@ static void Usr_ListMainDataStds (bool PutCheckBoxToSelectUsr)
if (Gbl.Usrs.LstUsrs[Rol_STUDENT].NumUsrs)
{
/***** Allocate memory for the string with the list of group names where student belongs to *****/
if ((GroupNames = (char *) malloc ((Grp_MAX_LENGTH_GROUP_NAME+3)*Gbl.CurrentCrs.Grps.GrpTypes.NumGrpsTotal)) == NULL)
if ((GroupNames = (char *) malloc ((Grp_MAX_LENGTH_GROUP_NAME + 3) *
Gbl.CurrentCrs.Grps.GrpTypes.NumGrpsTotal)) == NULL)
Lay_ShowErrorAndExit ("Not enough memory to store names of groups.");
/***** Start table with list of students *****/
@ -6761,7 +6767,7 @@ void Usr_PutParamUsrListType (Usr_ShowUsrsType_t ListType)
static bool Usr_GetUsrListTypeFromForm (void)
{
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
unsigned UnsignedNum;
Gbl.Usrs.Me.ListType = Usr_SHOW_USRS_TYPE_DEFAULT;
@ -6864,7 +6870,7 @@ void Usr_PutParamColsClassPhoto (void)
static bool Usr_GetParamColsClassPhotoFromForm (void)
{
char UnsignedStr[10+1];
char UnsignedStr[10 + 1];
/***** Get parameter with number of users per row *****/
Par_GetParToText ("ColsClassPhoto",UnsignedStr,10);
@ -6971,7 +6977,7 @@ void Usr_PutParamListWithPhotos (void)
static bool Usr_GetParamListWithPhotosFromForm (void)
{
char YN[1+1];
char YN[1 + 1];
/***** Get if exists parameter with preference about photos in users' list *****/
Par_GetParToText ("WithPhotosExists",YN,1);
@ -7258,7 +7264,6 @@ void Usr_SeeStudents (void)
ICanViewRecords = (Gbl.Scope.Current == Sco_SCOPE_CRS &&
(Gbl.Usrs.Me.LoggedRole == Rol_STUDENT ||
Gbl.Usrs.Me.LoggedRole == Rol_TEACHER ||
Gbl.Usrs.Me.LoggedRole == Rol_DEG_ADM ||
Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM));
/***** Get groups to show ******/
@ -7876,7 +7881,7 @@ static void Usr_DrawClassPhoto (Usr_ClassPhotoType_t ClassPhotoType,
bool UsrIsTheMsgSender;
const char *ClassPhoto = "PHOTO21x28"; // Default photo size
int LengthUsrData = 10; // Maximum number of characters of user data
char PhotoURL[PATH_MAX+1];
char PhotoURL[PATH_MAX + 1];
struct UsrData UsrDat;
/***** Set width and height of photos *****/
@ -7933,7 +7938,7 @@ static void Usr_DrawClassPhoto (Usr_ClassPhotoType_t ClassPhotoType,
Usr_PutCheckboxToSelectUser (&UsrDat,UsrIsTheMsgSender);
/***** Show photo *****/
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (&UsrDat,PhotoURL);
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (&UsrDat,PhotoURL);
Pho_ShowUsrPhoto (&UsrDat,ShowPhoto ? PhotoURL :
NULL,
ClassPhoto,Pho_ZOOM,false);
@ -8021,8 +8026,8 @@ void Usr_PutSelectorNumColsClassPhoto (void)
void Usr_ConstructPathUsr (long UsrCod,char *PathUsr)
{
char PathUsrs[PATH_MAX+1];
char PathAboveUsr[PATH_MAX+1];
char PathUsrs[PATH_MAX + 1];
char PathAboveUsr[PATH_MAX + 1];
/***** Path for users *****/
sprintf (PathUsrs,"%s/%s",Cfg_PATH_SWAD_PRIVATE,Cfg_FOLDER_USR);

8
swad_user.h
View File

@ -67,7 +67,7 @@
#define Usr_MAX_BYTES_USR_EMAIL (128 - 1)
#define Usr_BIRTHDAY_STR_DB_LENGTH (4+1+2+1+2) // "'%04u-%02u-%02u'"
#define Usr_BIRTHDAY_STR_DB_LENGTH (4 + 1 + 2 + 1 + 2) // "'%04u-%02u-%02u'"
#define Usr_MAX_LENGTH_PHONE 16
#define Usr_MAX_BYTES_PHONE 16
@ -77,7 +77,7 @@
#define Usr_LIST_WITH_PHOTOS_DEF false
#define Usr_MAX_BYTES_LIST_ENCRYPTED_USR_CODS (Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64*Cfg_MAX_USRS_IN_LIST)
#define Usr_MAX_BYTES_LIST_ENCRYPTED_USR_CODS (Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64 * Cfg_MAX_USRS_IN_LIST)
#define Usr_NUM_MAIN_FIELDS_DATA_USR 8
@ -184,7 +184,7 @@ struct UsrLast
struct UsrInList
{
long UsrCod;
char EncryptedUsrCod[Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64+1];
char EncryptedUsrCod[Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64 + 1];
char Password[Cry_LENGTH_ENCRYPTED_STR_SHA512_BASE64 + 1];
char Surname1 [Usr_MAX_BYTES_NAME + 1];
char Surname2 [Usr_MAX_BYTES_NAME + 1];
@ -300,7 +300,7 @@ void Usr_GetParamUsrIdLogin (void);
unsigned Usr_GetParamOtherUsrIDNickOrEMailAndGetUsrCods (struct ListUsrCods *ListUsrCods);
void Usr_PutParamOtherUsrCodEncrypted (void);
void Usr_PutParamUsrCodEncrypted (const char EncryptedUsrCod[Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64+1]);
void Usr_PutParamUsrCodEncrypted (const char EncryptedUsrCod[Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64 + 1]);
void Usr_GetParamOtherUsrCodEncrypted (struct UsrData *UsrDat);
void Usr_GetParamOtherUsrCodEncryptedAndGetListIDs (void);
bool Usr_GetParamOtherUsrCodEncryptedAndGetUsrData (void);

71
swad_web_service.c
View File

@ -127,7 +127,7 @@ extern const char Str_BIN_TO_BASE64URL[64];
/*****************************************************************************/
// Add new functions at the end
static const char *Svc_Functions[1+Svc_NUM_FUNCTIONS] =
static const char *Svc_Functions[1 + Svc_NUM_FUNCTIONS] =
{
"?", // 0 ==> unknown function
"loginBySession", // 1
@ -281,7 +281,7 @@ void Svc_Exit (const char *DetailErrorMessage)
static int Svc_GetPlgCodFromAppKey (const char *appKey)
{
char Query[256+Plg_MAX_LENGTH_PLUGIN_APP_KEY];
char Query[256 + Plg_MAX_LENGTH_PLUGIN_APP_KEY];
MYSQL_RES *mysql_res;
MYSQL_ROW row;
@ -1083,7 +1083,7 @@ int swad__getNewPassword (struct soap *soap,
MYSQL_RES *mysql_res;
MYSQL_ROW row;
unsigned NumRows;
char NewRandomPlainPassword[Pwd_MAX_LENGTH_PLAIN_PASSWORD+1];
char NewRandomPlainPassword[Pwd_MAX_LENGTH_PLAIN_PASSWORD + 1];
/***** Initializations *****/
Gbl.soap = soap;
@ -1459,7 +1459,7 @@ int swad__findUsers (struct soap *soap,
struct swad__getUsersOutput *getUsersOut) // output
{
int ReturnCode;
char SearchQuery[Sch_MAX_LENGTH_SEARCH_QUERY+1];
char SearchQuery[Sch_MAX_LENGTH_SEARCH_QUERY + 1];
Rol_Role_t Role;
bool FilterTooShort = false;
@ -1849,7 +1849,7 @@ int swad__sendMyGroups (struct soap *soap,
int ReturnCode;
struct ListCodGrps LstGrpsIWant;
const char *Ptr;
char LongStr[1+10+1];
char LongStr[1 + 10 + 1];
unsigned NumGrp;
char Query[512];
MYSQL_RES *mysql_res;
@ -1902,7 +1902,7 @@ int swad__sendMyGroups (struct soap *soap,
for (NumGrp = 0, Ptr = myGroups;
*Ptr;
NumGrp++)
Str_GetNextStringUntilComma (&Ptr,LongStr,1+10);
Str_GetNextStringUntilComma (&Ptr,LongStr,1 + 10);
LstGrpsIWant.NumGrps = NumGrp;
if (LstGrpsIWant.NumGrps) // If I have selected groups...
@ -1915,7 +1915,7 @@ int swad__sendMyGroups (struct soap *soap,
NumGrp++)
{
/* Find next string in text until comma (leading and trailing spaces are removed) */
Str_GetNextStringUntilComma (&Ptr,LongStr,1+10);
Str_GetNextStringUntilComma (&Ptr,LongStr,1 + 10);
LstGrpsIWant.GrpCods[NumGrp] = Str_ConvertStrCodToLongCod (LongStr);
}
}
@ -2227,7 +2227,7 @@ static void Svc_GetListGrpsInAttendanceEventFromDB (long AttCod,char **ListGroup
long NumGrps;
long NumGrp;
long GrpCod;
char GrpCodStr[10+1];
char GrpCodStr[10 + 1];
size_t Length;
/***** Get list of groups *****/
@ -2446,14 +2446,14 @@ int swad__removeAttendanceEvent (struct soap *soap,
static void Svc_GetLstGrpsSel (const char *Groups)
{
const char *Ptr;
char LongStr[1+10+1];
char LongStr[1 + 10 + 1];
unsigned NumGrp;
/***** Count number of groups *****/
for (Ptr = Groups, NumGrp = 0;
*Ptr;
NumGrp++)
Str_GetNextStringUntilComma (&Ptr,LongStr,1+10);
Str_GetNextStringUntilComma (&Ptr,LongStr,1 + 10);
Gbl.CurrentCrs.Grps.LstGrpsSel.NumGrps = NumGrp;
/***** Create a list of groups selected *****/
@ -2469,7 +2469,7 @@ static void Svc_GetLstGrpsSel (const char *Groups)
*Ptr;
)
{
Str_GetNextStringUntilComma (&Ptr,LongStr,1+10);
Str_GetNextStringUntilComma (&Ptr,LongStr,1 + 10);
Gbl.CurrentCrs.Grps.LstGrpsSel.GrpCods[NumGrp] = Str_ConvertStrCodToLongCod (LongStr);
if (Grp_CheckIfGroupBelongsToCourse (Gbl.CurrentCrs.Grps.LstGrpsSel.GrpCods[NumGrp],Gbl.CurrentCrs.Crs.CrsCod))
NumGrp++;
@ -2672,7 +2672,7 @@ int swad__sendAttendanceUsers (struct soap *soap,
int ReturnCode;
struct AttendanceEvent Att;
const char *Ptr;
char LongStr[1+10+1];
char LongStr[1 + 10 + 1];
long UsrCod;
unsigned NumCodsInList;
char SubQuery[256];
@ -2722,10 +2722,10 @@ int swad__sendAttendanceUsers (struct soap *soap,
*Ptr;
NumCodsInList++)
/* Find next string in text until comma (leading and trailing spaces are removed) */
Str_GetNextStringUntilComma (&Ptr,LongStr,1+10);
Str_GetNextStringUntilComma (&Ptr,LongStr,1 + 10);
/* Start query used to mark not present users as absent */
Length = 256 + NumCodsInList * (1+1+10+1) - 1;
Length = 256 + NumCodsInList * (1 + 1 + 10 + 1) - 1;
if ((Query = (char *) malloc (Length + 1)) == NULL)
return soap_receiver_fault (Gbl.soap,
"Not enough memory",
@ -2740,7 +2740,7 @@ int swad__sendAttendanceUsers (struct soap *soap,
)
{
/* Find next string in text until comma (leading and trailing spaces are removed) */
Str_GetNextStringUntilComma (&Ptr,LongStr,1+10);
Str_GetNextStringUntilComma (&Ptr,LongStr,1 + 10);
if ((UsrCod = Str_ConvertStrCodToLongCod (LongStr)) > 0)
if (Usr_ChkIfUsrCodExists (UsrCod))
// The user must belong to course,
@ -3028,7 +3028,7 @@ int swad__getNotifications (struct soap *soap,
static int Svc_GetMyLanguage (void)
{
extern const char *Txt_STR_LANG_ID[1+Txt_NUM_LANGUAGES];
extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES];
char Query[512];
MYSQL_RES *mysql_res;
MYSQL_ROW row;
@ -3075,7 +3075,7 @@ int swad__markNotificationsAsRead (struct soap *soap,
{
int ReturnCode;
const char *Ptr;
char LongStr[1+10+1];
char LongStr[1 + 10 + 1];
unsigned NumNtf;
unsigned NumNtfsMarkedAsRead = 0;
long NtfCod;
@ -3109,7 +3109,7 @@ int swad__markNotificationsAsRead (struct soap *soap,
NumNtf++)
{
/* Find next string in text until comma (leading and trailing spaces are removed) */
Str_GetNextStringUntilComma (&Ptr,LongStr,1+10);
Str_GetNextStringUntilComma (&Ptr,LongStr,1 + 10);
if ((NtfCod = Str_ConvertStrCodToLongCod (LongStr)) > 0)
{
/***** Mark notification as read in the database *****/
@ -3134,7 +3134,7 @@ int swad__markNotificationsAsRead (struct soap *soap,
/****************** Send a message to one or more users **********************/
/*****************************************************************************/
#define Svc_MAX_LENGTH_QUERY_RECIPIENTS (10*1024 - 1)
#define Svc_MAX_LENGTH_QUERY_RECIPIENTS (10 * 1024 - 1)
int swad__sendMessage (struct soap *soap,
char *wsKey,int messageCode,char *to,char *subject,char *body, // input
@ -3142,7 +3142,7 @@ int swad__sendMessage (struct soap *soap,
{
int ReturnCode;
long ReplyUsrCod = -1L;
char Nickname[Nck_MAX_BYTES_NICKNAME_FROM_FORM+1];
char Nickname[Nck_MAX_BYTES_NICKNAME_FROM_FORM + 1];
char Query[Svc_MAX_LENGTH_QUERY_RECIPIENTS + 1];
MYSQL_RES *mysql_res;
MYSQL_ROW row;
@ -3248,7 +3248,8 @@ int swad__sendMessage (struct soap *soap,
Str_RemoveLeadingArrobas (Nickname);
/* Check for overflow in query */
if (strlen (Query)+Nck_MAX_LENGTH_NICKNAME_WITHOUT_ARROBA+32 > Svc_MAX_LENGTH_QUERY_RECIPIENTS)
if (strlen (Query) + Nck_MAX_LENGTH_NICKNAME_WITHOUT_ARROBA + 32 >
Svc_MAX_LENGTH_QUERY_RECIPIENTS)
return soap_sender_fault (Gbl.soap,
"Can not send message",
"Too many recipients");
@ -3345,7 +3346,7 @@ static int Svc_SendMessageToUsr (long OriginalMsgCod,
{
static bool MsgAlreadyInserted = false;
static long NewMsgCod;
char Query[512+Cns_MAX_BYTES_SUBJECT+Cns_MAX_BYTES_LONG_TEXT];
char Query[512 + Cns_MAX_BYTES_SUBJECT + Cns_MAX_BYTES_LONG_TEXT];
/***** Create message *****/
if (!MsgAlreadyInserted) // The message is inserted only once in the table of messages sent
@ -3411,7 +3412,7 @@ int swad__sendNotice (struct soap *soap,
struct swad__sendNoticeOutput *sendNoticeOut) // output
{
int ReturnCode;
char Query[512+Cns_MAX_BYTES_TEXT];
char Query[512 + Cns_MAX_BYTES_TEXT];
long NotCod;
/***** Initializations *****/
@ -3691,7 +3692,7 @@ int swad__getTests (struct soap *soap,
static int Svc_GetTstTags (long CrsCod,struct swad__getTestsOutput *getTestsOut)
{
extern const char *Txt_STR_LANG_ID[1+Txt_NUM_LANGUAGES];
extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES];
char Query[512];
MYSQL_RES *mysql_res;
MYSQL_ROW row;
@ -3997,10 +3998,10 @@ int swad__getTrivialQuestion (struct soap *soap,
extern const char *Tst_StrAnswerTypesXML[Tst_NUM_ANS_TYPES];
int ReturnCode;
const char *Ptr;
char LongStr[1+10+1];
char LongStr[1 + 10 + 1];
char DegreesStr[Svc_MAX_LENGTH_DEGREES_STR + 1];
char DegStr[ 1+1+1+ 10 +1+ 1];
// DegStr=", ' - number ' \0"
char DegStr[ 1 + 1 + 1 + 10 + 1 + 1];
// DegStr=", ' - number ' \0"
long DegCod;
bool FirstDegree = true;
char Query[4096];
@ -4038,7 +4039,7 @@ int swad__getTrivialQuestion (struct soap *soap,
/*
if (Gbl.Usrs.Me.UsrDat.UsrCod == 19543)
{
char QueryDebug[512*1024];
char QueryDebug[512 * 1024];
sprintf (QueryDebug,"INSERT INTO debug (DebugTime,Txt) VALUES (NOW(),'degrees = %s')",degrees);
DB_QueryINSERT (QueryDebug,"Error inserting in debug table");
@ -4047,7 +4048,7 @@ int swad__getTrivialQuestion (struct soap *soap,
while (*Ptr)
{
/* Find next string in text until comma (leading and trailing spaces are removed) */
Str_GetNextStringUntilComma (&Ptr,LongStr,1+10);
Str_GetNextStringUntilComma (&Ptr,LongStr,1 + 10);
/* Check if degree code from string is a valid code */
if (sscanf (LongStr,"%ld",&DegCod) == 1) // Degree code
@ -4112,7 +4113,7 @@ int swad__getTrivialQuestion (struct soap *soap,
/*
if (Gbl.Usrs.Me.UsrDat.UsrCod == 19543)
{
char QueryDebug[512*1024];
char QueryDebug[512 * 1024];
sprintf (QueryDebug,"INSERT INTO debug (DebugTime,Txt) VALUES (NOW(),'Una pregunta devuelta')");
DB_QueryINSERT (QueryDebug,"Error inserting in debug table");
@ -4241,8 +4242,8 @@ int swad__getDirectoryTree (struct soap *soap,
{
extern const char *Brw_RootFolderInternalNames[Brw_NUM_TYPES_FILE_BROWSER];
int ReturnCode;
char PathXMLPriv[PATH_MAX+1];
char XMLFileName[PATH_MAX+1];
char PathXMLPriv[PATH_MAX + 1];
char XMLFileName[PATH_MAX + 1];
unsigned long FileSize;
unsigned long NumBytesRead;
@ -4386,8 +4387,8 @@ static void Svc_ListDir (unsigned Level,const char *Path,const char *PathInTree)
struct dirent **FileList;
int NumFile;
int NumFiles;
char PathFileRel[PATH_MAX+1];
char PathFileInExplTree[PATH_MAX+1];
char PathFileRel[PATH_MAX + 1];
char PathFileInExplTree[PATH_MAX + 1];
struct stat FileStatus;
/***** Scan directory *****/
@ -4681,7 +4682,7 @@ int swad__getMarks (struct soap *soap,
{
int ReturnCode;
struct FileMetadata FileMetadata;
char SummaryStr[NAME_MAX+1]; // Really not used
char SummaryStr[NAME_MAX + 1]; // Really not used
char *ContentStr;
size_t Length;

42
swad_zip.c
View File

@ -50,8 +50,8 @@
/***************************** Internal constants ****************************/
/*****************************************************************************/
#define ZIP_MiB (1024ULL*1024ULL)
#define ZIP_MAX_SIZE_UNCOMPRESSED (1024ULL*ZIP_MiB)
#define ZIP_MiB (1024ULL * 1024ULL)
#define ZIP_MAX_SIZE_UNCOMPRESSED (1024ULL * ZIP_MiB)
const Act_Action_t ZIP_ActZIPFolder[Brw_NUM_TYPES_FILE_BROWSER] =
{
@ -140,7 +140,7 @@ static void ZIP_PutLinkToCreateZIPAsgWrkParams (void)
bool ZIP_GetCreateZIPFromForm (void)
{
char YN[1+1];
char YN[1 + 1];
Par_GetParToText ("CreateZIP",YN,1);
return (Str_ConvertToUpperLetter (YN[0]) == 'Y');
@ -156,14 +156,14 @@ void ZIP_CreateZIPAsgWrk (void)
extern const char *Txt_works_ZIP_FILE_NAME;
struct UsrData UsrDat;
const char *Ptr;
char StrZip[100+PATH_MAX*2+1];
char Path[PATH_MAX+1];
char StrZip[100 + PATH_MAX * 2 + 1];
char Path[PATH_MAX + 1];
int Result;
char FileNameZIP[NAME_MAX+1];
char PathFileZIP[PATH_MAX+1];
char FileNameZIP[NAME_MAX + 1];
char PathFileZIP[PATH_MAX + 1];
struct stat FileStatus;
char URLWithSpaces[PATH_MAX+1];
char URL[PATH_MAX+1];
char URLWithSpaces[PATH_MAX + 1];
char URL[PATH_MAX + 1];
/***** Create zip file
with the assignments and works
@ -258,8 +258,8 @@ void ZIP_CreateZIPAsgWrk (void)
static void ZIP_CreateTmpDirForCompression (void)
{
char PathZipPriv[PATH_MAX+1];
char PathDirTmp[PATH_MAX+1];
char PathZipPriv[PATH_MAX + 1];
char PathDirTmp[PATH_MAX + 1];
/***** If the private directory does not exist, create it *****/
sprintf (PathZipPriv,"%s/%s",Cfg_PATH_SWAD_PRIVATE,Cfg_FOLDER_ZIP);
@ -407,15 +407,15 @@ static void ZIP_CompressFolderIntoZIP (void)
extern const char *Txt_The_folder_is_empty;
extern const char *Txt_The_contents_of_the_folder_are_too_big;
unsigned long long UncompressedSize;
char StrZip[100+PATH_MAX*2+1];
char Path[PATH_MAX+1];
char PathCompression[PATH_MAX+1];
char StrZip[100 + PATH_MAX * 2 + 1];
char Path[PATH_MAX + 1];
char PathCompression[PATH_MAX + 1];
int Result;
char FileNameZIP[NAME_MAX+1];
char PathFileZIP[PATH_MAX+1];
char FileNameZIP[NAME_MAX + 1];
char PathFileZIP[PATH_MAX + 1];
struct stat FileStatus;
char URLWithSpaces[PATH_MAX+1];
char URL[PATH_MAX+1];
char URLWithSpaces[PATH_MAX + 1];
char URL[PATH_MAX + 1];
/***** Create temporary private directory
for the compression of folder *****/
@ -515,9 +515,9 @@ static unsigned long long ZIP_CloneDir (const char *Path,const char *PathClone,c
struct dirent **FileList;
int NumFile;
int NumFiles;
char PathFile[PATH_MAX+1];
char PathFileClone[PATH_MAX+1];
char PathFileInTree[PATH_MAX+1];
char PathFile[PATH_MAX + 1];
char PathFileClone[PATH_MAX + 1];
char PathFileInTree[PATH_MAX + 1];
struct stat FileStatus;
Brw_FileType_t FileType;
bool Hidden;