Version 15.243

This commit is contained in:
Antonio Cañas Vargas 2016-07-20 20:24:16 +02:00
parent 438d952b5d
commit 1c8dfbd2ed
5 changed files with 358 additions and 227 deletions

View File

@ -701,16 +701,6 @@
and replace it by:<br />
<code>DirectoryIndex index.html index.htm index.php</code><br />
</li>
<li>
Optionally, if we want to redirect from http://... to https://...
we should add the following lines at the end of the
<code>Section 3: Virtual Hosts</code>:<br />
<code>&lt;VirtualHost _default_:*&gt;<br />
Redirect permanent / https://openswad.org/<br />
&lt;/VirtualHost&gt;</code><br />
(replace https://openswad.org/ by our https address).
</li>
</ul>
</td>
@ -850,6 +840,40 @@
</tr>
</table>
</p>
<p>
Optionally, if we want to redirect from http://... to https://...
we should add some lines to configuration files:
<table width="100%">
<tr>
<th>CentOS 6.5</th>
<th>Ubuntu 14.04</th>
</tr>
<tr>
<td width="50%" valign="top">
Edit the file <code>/etc/httpd/conf/httpd.conf</code>,
add the following lines at the end of the
<code>Section 3: Virtual Hosts</code> section:<br />
<code>&lt;VirtualHost _default_:*&gt;<br />
Redirect permanent / https://openswad.org/<br />
&lt;/VirtualHost&gt;</code><br />
(replace https://openswad.org/ by your https address),
and save it.
</td>
<td width="50%" valign="top">
Edit the file <code>/etc/apache2/sites-available/000-default.conf</code>,
add the following line into the
<code>&lt;VirtualHost *:80&gt;</code> section:<br />
<code>Redirect permanent / https://openswad.org/</code><br />
(replace https://openswad.org/ by your https address),
and save it.
</td>
</tr>
</table>
</p>
<p>
Restart the Apache web server with the changes just made:

View File

@ -138,13 +138,15 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.242.6 (2016-07-15)"
#define Log_PLATFORM_VERSION "SWAD 15.243 (2016-07-20)"
#define CSS_FILE "swad15.229.css"
#define JS_FILE "swad15.238.1.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 15.243: Jul 20, 2016 Fixed bug in web service (getNotifications).
Code refactoring in web service. (203956 lines)
Version 15.242.6: Jul 15, 2016 Fixed bug in creation of database table tst_config. (203850 lines)
Version 15.242.5: Jul 15, 2016 Fixed bug in user's registration. (203849 lines)
Version 15.242.4: Jul 15, 2016 Fixed bug in creation of database table file_browser_size. (203847 lines)

View File

@ -28,10 +28,10 @@
/** Uncomment one of the following installations of SWAD or create your own **/
/*****************************************************************************/
//#define LOCALHOST_UBUNTU // Comment this line if not applicable
#define LOCALHOST_UBUNTU // Comment this line if not applicable
//#define OPENSWAD_ORG // Comment this line if not applicable
//#define SWAD_UGR_ES // Comment this line if not applicable
#define SWADBERRY_UGR_ES // Comment this line if not applicable
//#define SWADBERRY_UGR_ES // Comment this line if not applicable
/*****************************************************************************/
/********************************* Headers ***********************************/

View File

@ -623,8 +623,9 @@ static bool Tst_CheckIfNextTstAllowed (void)
long NumSecondsFromNowToNextAccTst = -1L; // Access allowed when this number <= 0
time_t TimeNextTestUTC = (time_t) 0;
/***** Superusers are allowed to do all tests they want *****/
if (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM)
/***** Teachers and superusers are allowed to do all tests they want *****/
if (Gbl.Usrs.Me.LoggedRole == Rol_TEACHER ||
Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM)
return true;
/***** Get date of next allowed access to test from database *****/

File diff suppressed because it is too large Load Diff