[Change to session handling and rejigging global settings
tony@tonywhitmore.co.uk**20060222203649
 * Added session_name() function to each .php file. This ensures there are no conflicting sessions with other PHP programs served from the same host. Well, unless they have their session_name set to "STORM" too...
 * Login: Fixed ICT Support Team Members table header
 * Added support phone number as a database option
 * Added description field to the settings table, which will prevent need to edit login/settings.php when adding new settings. Converted login/settings.php to work with the new field, which basically involved removing a satisfying large number of lines. :)
] {
hunk ./CHANGELOG 5
+* Added session_name() function to each .php file. This ensures there are no conflicting sessions with other PHP programs served from the same host. Well, unless they have their session_name set to "STORM" too...
+* Added support phone number as a database option
+* Added description field to the settings table, which will prevent need to edit login/settings.php when adding new settings. Converted login/settings.php to work with the new field, which basically involved removing a satisfying large number of lines. :)
hunk ./CHANGELOG 24
+* Login: Fixed ICT Support Team Members table header
hunk ./INSTALL 30
-11) Edit the file login/login.php to include your helpdesk phone number.
-12) Ensure that the common/img/catalogue directory is read-writeable by the user running Apache. (On Debian GNU/Linux this is www-data.)
+11) Ensure that the common/img/catalogue directory is read-writeable by the user running Apache. (On Debian GNU/Linux this is www-data.)
hunk ./INSTALL 47
-12) Edit the file login/login.php to include your helpdesk phone number.
hunk ./SATYR/cancel.php 25
+session_name(STORM);
hunk ./SATYR/closed.php 25
+session_name(STORM);
hunk ./SATYR/deletejob.php 25
+session_name(STORM);
hunk ./SATYR/detail.php 25
+session_name(STORM);
hunk ./SATYR/editcategory.php 25
+session_name(STORM);
hunk ./SATYR/evaluate.php 25
+session_name(STORM);
hunk ./SATYR/help.php 25
+session_name(STORM);
hunk ./SATYR/intro.php 24
+// Start / resume session
+session_name(STORM);
+session_start();
+
hunk ./SATYR/joblock.php 25
+session_name(STORM);
hunk ./SATYR/recent.php 25
+session_name(STORM);
hunk ./SATYR/search.php 25
+session_name(STORM);
hunk ./SATYR/settings.php 25
+session_name(STORM);
hunk ./SATYR/submit.php 25
+session_name(STORM);
hunk ./SATYR/update.php 25
+session_name(STORM);
hunk ./chknet/device.php 25
+session_name(STORM);
hunk ./chknet/group.php 25
+session_name(STORM);
hunk ./chknet/help.php 25
+session_name(STORM);
hunk ./chknet/intro.php 25
+session_name(STORM);
hunk ./chknet/settings.php 25
+session_name(STORM);
hunk ./includes/STORM/login/html/nav_admin.inc 62
-     <a href='settings.php' class='ictnavigation'>System Settings</a>
+     <a href='settings.php' class='ictnavigation'>Global Settings</a>
hunk ./login/about.php 25
+session_name(STORM);
hunk ./login/changemail.php 25
+session_name(STORM);
hunk ./login/changepass.php 25
+session_name(STORM);
hunk ./login/chunknames.php 25
+session_name(STORM);
hunk ./login/deleteuser.php 25
+session_name(STORM);
hunk ./login/editaccess.php 25
+session_name(STORM);
hunk ./login/editname.php 25
+session_name(STORM);
hunk ./login/editusername.php 25
+session_name(STORM);
hunk ./login/forcepass.php 25
+session_name(STORM);
hunk ./login/login.php 25
+session_name(STORM);
hunk ./login/logout.php 25
+session_name(STORM);
hunk ./login/menu.php 25
+session_name(STORM);
hunk ./login/moduledefaults.php 25
+session_name(STORM);
hunk ./login/pass_reset.php 25
+session_name(STORM);
hunk ./login/register.php 25
+session_name(STORM);
hunk ./login/resetpass.php 25
+session_name(STORM);
hunk ./login/roomlist.php 25
+session_name(STORM);
hunk ./login/settings.php 25
+session_name(STORM);
hunk ./login/settings.php 290
-	echo "<b>System-wide Settings for<br>\"School Tools for On-line Resource Management\"</b>\n";
+	echo "<b>Global Settings for<br>\"School Tools for On-line Resource Management\"</b>\n";
hunk ./login/settings.php 299
-	      {
-	      extract ($row);
-	      echo "<tr class='tablerow'>\n";
-	      echo "<td bgcolor='#FFFF99'>\n";
-	      echo "<b>";
-	      // Small if loop that presents a nice version of the variable name
-	      if ( $function == "passwordexpiredays" )
-	         {
-	         echo "Maximum Password Age (days)";
-	         }
-	      elseif ( $function == "chunksperday" )
-	         {
-	         echo "Number of bookable \"Chunks\" per day";
-	         }
-	      elseif ( $function == "dayspercycle" )
-	         {
-	         echo "Number of days per cycle (e.g. week or fortnight)";
-	         }
-	      elseif ( $function == "urgentequiptosatyr" )
-	      	{
-	      	echo "Submit late EQuip bookings to SATYR";
-	      	}
-	      elseif ( $function == "urgentequipdays" )
-	      	{
-	      	echo "Time in days that an EQuip booking should be considered \"last minute\"";
-	      	}
-	      elseif ( $function == "daysSinceDay" )
-	      	{
-	      	echo "Day of the month used as the first day of the year";
-	      	}
-	      elseif ( $function == "daysSinceMon" )
-	      	{
-	      	echo "Month used as the first month of the year";
-	      	}
-	      elseif ( $function == "pingpath" )
-	      	{
-	      	echo "Full path to ping executable";
-	      	}
-	      elseif ( $function == "pingoptions" )
-	      	{
-	      	echo "Options to be passed to ping before list of hostname";
-	      	}
-	      elseif ( $function == "chknetrefresh" )
-	      	{
-	      	echo "Automatic refresh period for ChkNet status page (in seconds)";
-	      	}
-	      elseif ( $function == "mailServer" )
-	      	{
-	      	echo "Mail Server";
-	      	}
-	      elseif ( $function == "mailFrom" )
-	      	{
-	      	echo "E-mail address from which e-mails should be sent";
-	      	}	      	
-	      else
-	          {
-	          echo $function;
-	          }
-	      echo "</b>\n";
-	      echo "</td>\n";
-	      echo "<td bgcolor='#FFFF99'>\n";
-	      echo "<input type='text' name='" . $function . "' size='10' maxlength='30' value='" . $value . "'>\n";
-	      echo "</td>\n";
-	      echo "</tr>\n";
-	      }
+		{
+		extract ($row);
+		echo "<tr class='tablerow'>\n";
+		echo "<td bgcolor='#FFFF99'>\n";
+		echo "<b>" . $description . "</b>\n";
+		echo "</td>\n";
+	    echo "<td bgcolor='#FFFF99'>\n";
+	    echo "<input type='text' name='" . $function . "' size='20' maxlength='30' value='" . $value . "'>\n";
+	    echo "</td>\n";
+	    echo "</tr>\n";
+	    }
hunk ./login/settings.php 321
-	echo "<h4>N.B.: Most features can be disabled by setting their value to \"0\".</h4>\n";
+	echo "<h4>N.B.: Some features can be disabled by setting their value to \"0\", please see the documentation for more details.</h4>\n";
hunk ./login/teammember.php 25
+session_name(STORM);
hunk ./login/teammember.php 98
-   echo "<b>Room List for modules</b>\n";
+   echo "<b>ICT Support Team Members</b>\n";
hunk ./login/teammember.php 102
-	// Fetch the contents of the table that holds the rooms
+	// Fetch the contents of the table that holds the ICT team members
}