[Openfirst-cvscommit] update account.php,1.5,1.6 system.php,1.5,1.6
Brought to you by:
xtimg
Menu
▾
▴
[Openfirst-cvscommit] update account.php,1.5,1.6 system.php,1.5,1.6
|
From: Tim G. <xt...@us...> - 2004-11-19 14:02:06
|
Update of /cvsroot/openfirst/update In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30647 Modified Files: account.php system.php Log Message: Have frontend better represrent the actual status of the backend. Fix system error in account.php Index: account.php =================================================================== RCS file: /cvsroot/openfirst/update/account.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** account.php 18 Nov 2004 13:02:45 -0000 1.5 --- account.php 19 Nov 2004 14:01:52 -0000 1.6 *************** *** 65,79 **** </fieldset><br /> - <!--fieldset id="systems"> - <legend><img src="foobar.png"> Your Servers</legend> - <ul> - <?php - foreach($Servers as $Name => $Ops) { - echo "<li><a href=\"system.php?server=".$Ops['ID']."\">".$Name."</a> (".$Ops['URL'].")</li>"; - } - ?> - </ul><br /> - <a href="system.php?new=true">Add a new server.</a> - </fieldset--> <center><input type='submit' value='Update Account Information'></center> </form> --- 65,68 ---- Index: system.php =================================================================== RCS file: /cvsroot/openfirst/update/system.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** system.php 18 Nov 2004 13:02:45 -0000 1.5 --- system.php 19 Nov 2004 14:01:52 -0000 1.6 *************** *** 24,27 **** --- 24,29 ---- die(include_once($footer)); } else { + $system = mysql_fetch_object(mysql_query("SELECT * FROM ofirst_systems WHERE id='" . $_REQUEST["id"] . "';")); + $NewServer = False; $Modules = array( *************** *** 50,65 **** } - function GetCurrentModule($ModuleName) { - //Gets the version of the given module that is in the default release - if ($ModuleName == 'Base') { - return '1.0.1'; - } - if ($ModuleName == 'GuestBook') { - return '1.0.2'; - } - } - - //End Debug Stuff - function PrintValue($Setting) { if (isset($Setting) && !$NewServer) { --- 52,55 ---- *************** *** 67,78 **** } } ! ! function ModuleVersion($ModuleName) { ! if ($NewServer) { ! echo GetCurrentModule($ModuleName); ! } else { ! echo $Modules[$ModuleName]['Version']; ! } ! } ?> <form action="system.php" method="post"> --- 57,61 ---- } } ! ?> <form action="system.php" method="post"> *************** *** 87,91 **** <td> <input type='checkbox' checked='checked'>use account default<br /> ! or <input type='text' name='admin' <?php PrintValue($AdminEmail); ?>> </td> </tr> --- 70,79 ---- <td> <input type='checkbox' checked='checked'>use account default<br /> ! or <input type='text' name='admin' ! <?php ! if(isset($system->email) && $system->email != "") { echo ! "value='$system->email'"; } ! ?> ! > </td> </tr> *************** *** 101,105 **** <th>Display Name</th> <td> ! <input type='text' name='display' <?php PrintValue($FTPServerName); ?>> </td> </tr> --- 89,97 ---- <th>Display Name</th> <td> ! <input type='text' name='display' ! <?php ! if(isset($system->displayname) && $system->displayname != "") { echo ! "value='$system->displayname'"; } ! ?>> </td> </tr> *************** *** 107,111 **** <th>FTP Username</th> <td> ! <input type='text' name='ftpuser'> </td> </tr> --- 99,108 ---- <th>FTP Username</th> <td> ! <input type='text' name='ftpuser' ! <?php ! if(isset($system->ftpusername) && $system->ftpusername != "") { echo ! "value='$system->ftpusername'"; } ! ?> ! > </td> </tr> *************** *** 125,129 **** <th>FTP URL</th> <td> ! <input type='text' name='ftpserver' <?php PrintValue($FTPServer); ?>> </td> </tr> --- 122,130 ---- <th>FTP URL</th> <td> ! <input type='text' name='ftpserver' ! <?php ! if(isset($system->ftpserver) && $system->ftpserver != "") { echo ! "value='$system->ftpserver'"; } ! ?>> </td> </tr> *************** *** 144,151 **** </th> <td> ! <input type='checkbox' checked='checked' <?php PrintValue($AutoFix); ?>>Automatically install security fixes<br /> ! <input type='checkbox' checked='checked' <?php PrintValue($AutoUpdate); ?>>Automatically install new versions<br /> ! <input type='checkbox' checked='checked' <?php PrintValue($NotifyNewVer); ?>>Notify admin via e-mail when an update is available.<br /> ! <input type='checkbox' checked='checked' <?php PrintValue($NotifyFinished); ?>>Notify admin via e-mail when an update is complete. </td> </tr> --- 145,170 ---- </th> <td> ! <input type='checkbox' checked='checked' name='autoinstallsecurity' ! <?php ! if(isset($system->autoinstallsecurity) && $system->autoinstallsecurity == 1) { ! echo "checked='checked'"; } ! ?>> ! Automatically install security fixes<br /> ! <input type='checkbox' name='autoinstallnewversions' ! <?php ! if(isset($system->autoinstallnewversions) && $system->autoinstallnewversions == 1) { ! echo "checked='checked'"; } ! ?>>Automatically install new versions<br /> ! <input type='checkbox' name='notifywhenupdatesavailable' ! <?php ! if(isset($system->notifywhenupdatesavailable) && $system->notifywhenupdatesavailable == 1) { ! echo "checked='checked'"; } ! ?>>Notify admin via e-mail when an update is available.<br /> ! <input type='checkbox' name='notifywhenupdatecomplete' ! <?php ! if(isset($system->notifywhenupdatecomplete ! ) && $system->notifywhenupdatecomplete == 1) { ! echo "checked='checked'"; } ! ?>>Notify admin via e-mail when an update is complete. </td> </tr> *************** *** 163,168 **** </th> <td> ! <input type='checkbox' checked='checked' <?php PrintValue($Modules['Base']['Installed']); ?>>Base system (version <?php ModuleVersion('Base'); ?>) [<a href='#'>Remove</a>]<br/> ! <input type='checkbox' checked='checked' <?php PrintValue($Modules['GuestBook']['Installed']); ?>>Guestbook (version <?php ModuleVersion('GuestBook'); ?>) [<a href='#'>Remove</a>] </td> </tr> --- 182,197 ---- </th> <td> ! <?php ! $sq = mysql_query("SELECT * FROM ofirst_system_software WHERE system='$system->id';"); ! while($s = mysql_fetch_object($sq)) { ! $pq = mysql_query("SELECT * FROM ofirst_directory_software WHERE id='$s->package';"); ! if($pq) { ! $p = mysql_fetch_object($pq); ! $v = mysql_fetch_object(mysql_query("SELECT * FROM ofirst_directory_software_versions WHERE id='$s->version';")); ! echo "<input type='checkbox' name='$s->id' value='$s->id'>$p->name (version: $v->versionname) [<a href='#'>Remove</a>]<br />"; ! } ! } ! ! ?> </td> </tr> |
