diff --git a/swad_QR.c b/swad_QR.c index ece13c325..04ab12440 100644 --- a/swad_QR.c +++ b/swad_QR.c @@ -70,12 +70,11 @@ static void QR_ImageQRCode (const char *QRString); /***************** Put a link to a print view of a QR code *******************/ /*****************************************************************************/ -void QR_PutLinkToPrintQRCode (const char *Nickname,bool PrintText) +void QR_PutLinkToPrintQRCode (bool PrintText) { extern const char *Txt_QR_code; /***** Link to print QR *****/ - Gbl.Usrs.NicknameForQR = Nickname; Lay_PutContextualLink (ActPrnUsrQR,QR_PutParamQRString, "qr64x64.gif", Txt_QR_code,PrintText ? Txt_QR_code : @@ -89,10 +88,7 @@ void QR_PutLinkToPrintQRCode (const char *Nickname,bool PrintText) static void QR_PutParamQRString (void) { - char NicknameWithArroba[Nck_MAX_BYTES_NICKNAME_WITH_ARROBA+1]; - - sprintf (NicknameWithArroba,"@%s",Gbl.Usrs.NicknameForQR); - Par_PutHiddenParamString ("QRString",NicknameWithArroba); + Par_PutHiddenParamString ("QRString",Gbl.QR.Str); } /*****************************************************************************/ diff --git a/swad_QR.h b/swad_QR.h index cca5ab996..2dc0d04de 100644 --- a/swad_QR.h +++ b/swad_QR.h @@ -39,7 +39,7 @@ /***************************** Public prototypes *****************************/ /*****************************************************************************/ -void QR_PutLinkToPrintQRCode (const char *Nickname,bool PrintText); +void QR_PutLinkToPrintQRCode (bool PrintText); void QR_PrintQRCode (void); void QR_LinkTo (unsigned Size,const char *ParamStr,long Cod); diff --git a/swad_attendance.c b/swad_attendance.c index 41534c83f..af7be3b49 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -140,6 +140,8 @@ static void Att_ListAttEventsForAStd (unsigned NumStd,struct UsrData *UsrDat); void Att_SeeAttEvents (void) { + char NicknameWithArroba[Nck_MAX_BYTES_NICKNAME_WITH_ARROBA+1]; + /***** Get parameters *****/ Att_GetParamAttOrderType (); Grp_GetParamWhichGrps (); @@ -171,7 +173,11 @@ void Att_SeeAttEvents (void) /* Put link to my QR code */ if (Gbl.Usrs.Me.UsrDat.Nickname[0]) - QR_PutLinkToPrintQRCode (Gbl.Usrs.Me.UsrDat.Nickname,true); + { + sprintf (NicknameWithArroba,"@%s",Gbl.Usrs.Me.UsrDat.Nickname); + Gbl.QR.Str = NicknameWithArroba; + QR_PutLinkToPrintQRCode (true); + } fprintf (Gbl.F.Out,""); } diff --git a/swad_changelog.h b/swad_changelog.h index 03beb9046..f57f3451a 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -179,17 +179,20 @@ // TODO: When teacher sees "No hay estudiantes", put a button to add students // TODO: When admin sees "No hay profesores", put a button to add teachers +// TODO: Al entrar sin identificar a ver una agenda, por ejemplo, https://localhost/swad/pt?agd=@rms, el idioma cambia ¿? + /*****************************************************************************/ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.86.9 (2016-12-05)" +#define Log_PLATFORM_VERSION "SWAD 16.86.10 (2016-12-05)" #define CSS_FILE "swad16.86.5.css" #define JS_FILE "swad16.84.2.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.86.10: Dec 05, 2016 Code refactoring related to user's QR (nickname). (209904 lines) Version 16.86.9: Dec 05, 2016 Link to QR in user's agenda. Not finished. (209889 lines) Version 16.86.8: Dec 05, 2016 Changes in layout of user's agenda. (209864 lines) Version 16.86.7: Dec 05, 2016 Changes in icons for open/closed and public/private. (209852 lines) diff --git a/swad_global.h b/swad_global.h index 19b19c847..c67dae84f 100644 --- a/swad_global.h +++ b/swad_global.h @@ -398,7 +398,6 @@ struct Globals } Connected; 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 - const char *NicknameForQR; // Used as parameter in contextual links } Usrs; struct { @@ -730,6 +729,10 @@ struct Globals float MaxPercent; } DegPhotos; } Stat; + struct + { + char *Str; + } QR; }; /*****************************************************************************/ diff --git a/swad_nickname.c b/swad_nickname.c index e017fde33..c49ae92ec 100644 --- a/swad_nickname.c +++ b/swad_nickname.c @@ -196,6 +196,7 @@ void Nck_ShowFormChangeUsrNickname (void) MYSQL_ROW row; unsigned NumNicks; unsigned NumNick; + char NicknameWithArroba[Nck_MAX_BYTES_NICKNAME_WITH_ARROBA+1]; /***** Get my nicknames *****/ sprintf (Query,"SELECT Nickname FROM usr_nicknames" @@ -250,7 +251,11 @@ void Nck_ShowFormChangeUsrNickname (void) /* Link to QR code */ if (NumNick == 1 && Gbl.Usrs.Me.UsrDat.Nickname[0]) - QR_PutLinkToPrintQRCode (Gbl.Usrs.Me.UsrDat.Nickname,false); + { + sprintf (NicknameWithArroba,"@%s",Gbl.Usrs.Me.UsrDat.Nickname); + Gbl.QR.Str = NicknameWithArroba; + QR_PutLinkToPrintQRCode (false); + } fprintf (Gbl.F.Out,""); diff --git a/swad_record.c b/swad_record.c index 51e5ad57f..e1e29576b 100644 --- a/swad_record.c +++ b/swad_record.c @@ -2591,6 +2591,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_WITH_ARROBA+1]; fprintf (Gbl.F.Out,"" "" @@ -2611,7 +2612,9 @@ static void Rec_ShowNickname (struct UsrData *UsrDat,bool PutFormLinks) Act_FormEnd (); /* Link to QR code */ - QR_PutLinkToPrintQRCode (UsrDat->Nickname,false); + sprintf (NicknameWithArroba,"@%s",UsrDat->Nickname); + Gbl.QR.Str = NicknameWithArroba; + QR_PutLinkToPrintQRCode (false); } } fprintf (Gbl.F.Out,""