openfirst-cvscommit Mailing List for openFIRST (Page 46)
Brought to you by:
xtimg
Menu
▾
▴
openfirst-cvscommit — Notify subscribers of changes to files in CVS.
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(41) |
Jun
(210) |
Jul
(39) |
Aug
(153) |
Sep
(147) |
Oct
(173) |
Nov
(81) |
Dec
(163) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(33) |
Feb
(18) |
Mar
|
Apr
(62) |
May
|
Jun
(100) |
Jul
(38) |
Aug
(58) |
Sep
(1) |
Oct
|
Nov
(25) |
Dec
(172) |
| 2005 |
Jan
(31) |
Feb
(12) |
Mar
(67) |
Apr
(92) |
May
(247) |
Jun
(34) |
Jul
(36) |
Aug
(192) |
Sep
(15) |
Oct
(42) |
Nov
(92) |
Dec
(4) |
| 2006 |
Jan
|
Feb
(21) |
Mar
|
Apr
|
May
|
Jun
(53) |
Jul
(7) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
(4) |
Apr
(4) |
May
|
Jun
(15) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <bug...@we...> - 2004-12-20 16:03:07
|
http://bugzilla.openfirst.org/show_bug.cgi?id=178 ti...@op... changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Platform| |All Resolution| |DUPLICATE ------- Additional Comments From ti...@op... 2004-12-20 10:03 ------- *** This bug has been marked as a duplicate of 176 *** ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. You reported the bug, or are watching the reporter. |
|
From: <bug...@we...> - 2004-12-20 16:02:47
|
http://bugzilla.openfirst.org/show_bug.cgi?id=176 ------- Additional Comments From ti...@op... 2004-12-20 10:02 ------- *** Bug 177 has been marked as a duplicate of this bug. *** ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. You reported the bug, or are watching the reporter. |
|
From: <bug...@we...> - 2004-12-20 16:02:47
|
http://bugzilla.openfirst.org/show_bug.cgi?id=177 ti...@op... changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Platform| |All Resolution| |DUPLICATE ------- Additional Comments From ti...@op... 2004-12-20 10:02 ------- *** This bug has been marked as a duplicate of 176 *** ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. You reported the bug, or are watching the reporter. |
|
From: <bug...@we...> - 2004-12-20 16:01:55
|
http://bugzilla.openfirst.org/show_bug.cgi?id=170 ------- Additional Comments From ti...@op... 2004-12-20 10:01 ------- *** Bug 174 has been marked as a duplicate of this bug. *** ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. You reported the bug, or are watching the reporter. |
|
From: <bug...@we...> - 2004-12-20 16:01:55
|
http://bugzilla.openfirst.org/show_bug.cgi?id=174 ti...@op... changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Platform| |All Resolution| |DUPLICATE ------- Additional Comments From ti...@op... 2004-12-20 10:01 ------- *** This bug has been marked as a duplicate of 170 *** ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. You reported the bug, or are watching the reporter. |
|
From: <bug...@we...> - 2004-12-20 16:01:30
|
http://bugzilla.openfirst.org/show_bug.cgi?id=172 ti...@op... changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Platform| |All Resolution| |DUPLICATE ------- Additional Comments From ti...@op... 2004-12-20 10:01 ------- *** This bug has been marked as a duplicate of 170 *** ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. You reported the bug, or are watching the reporter. |
|
From: <bug...@we...> - 2004-12-20 16:01:30
|
http://bugzilla.openfirst.org/show_bug.cgi?id=170 ------- Additional Comments From ti...@op... 2004-12-20 10:01 ------- *** Bug 172 has been marked as a duplicate of this bug. *** ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. You reported the bug, or are watching the reporter. |
|
From: <bug...@we...> - 2004-12-20 15:25:25
|
http://bugzilla.openfirst.org/show_bug.cgi?id=167 ti...@op... changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Platform| |All Resolution| |DUPLICATE ------- Additional Comments From ti...@op... 2004-12-20 09:25 ------- *** This bug has been marked as a duplicate of 157 *** ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. You reported the bug, or are watching the reporter. |
|
From: <bug...@we...> - 2004-12-20 15:25:25
|
http://bugzilla.openfirst.org/show_bug.cgi?id=157 ------- Additional Comments From ti...@op... 2004-12-20 09:25 ------- *** Bug 167 has been marked as a duplicate of this bug. *** ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. You reported the bug, or are watching the reporter. |
|
From: <bug...@we...> - 2004-12-20 02:28:55
|
http://bugzilla.openfirst.org/show_bug.cgi?id=185 Summary: After submitting base configuration page, error reports non-object on line 184 in dbase.php Product: openFIRST Version: 1.0.x Platform: PC URL: http://www.repressitol.com/phptest/openfirstdev OS/Version: Windows XP Status: NEW Severity: normal Priority: P2 Component: base AssignedTo: de...@op... ReportedBy: me...@bu... Fatal error: Call to a member function on a non-object in /home/repressi/public_html/phptest/openfirstdev/config/dbase.php on line 184 The line above is what I get. There is a "0" above that on it's own line, but I doubt that matters (the "0" is reproducable). I am running this is a locked out area, but I would gladly give access to whomever needed to get in to check things out. Send me an e-mail with name and pass you would like. This openfirstdev directory is the nightly build. I used this name because I had tried the release and got the same problem (except line 180) and didn't want to waste the time spent uploading 1600 files on FTP :) Server info: OS: FreeBSD 4.8-RELEASE-p24 database: mysql Ver 12.22 Distrib 4.0.16 php: PHP 4.3.8 Thanks and let me know if you need any more info. It's probable that the problem is on my end :) ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. |
|
From: Tim G. <xt...@us...> - 2004-12-01 22:23:32
|
Update of /cvsroot/openfirst/update In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16290 Modified Files: selectinstalldir.php sql.php Log Message: Make system sort of work moreso (fix parse errors, typos, etc.) Index: selectinstalldir.php =================================================================== RCS file: /cvsroot/openfirst/update/selectinstalldir.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** selectinstalldir.php 1 Dec 2004 22:16:55 -0000 1.5 --- selectinstalldir.php 1 Dec 2004 22:23:24 -0000 1.6 *************** *** 24,43 **** mysql_query("UPDATE ofirst_systems SET dbasetype='" . $_REQUEST["dbasetype"] . "', ! peardb='" . $_REQUEST["dbasetype"] . "', ! ostype='" . $_REQUEST["dbasetype"] . "', ! encryption='" . $_REQUEST["dbasetype"] . "', ! title='" . $_REQUEST["dbasetype"] . "', ! version='" . $_REQUEST["dbasetype"] . "', ! sqlserver='" . $_REQUEST["dbasetype"] . "', ! sqluser='" . $_REQUEST["dbasetype"] . "', ! sqlpassword='" . $_REQUEST["dbasetype"] . "', ! sqldatabase='" . $_REQUEST["dbasetype"] . "', ! regenabled='" . $_REQUEST["dbasetype"] . "', ! home='" . $_REQUEST["dbasetype"] . "', ! header='" . $_REQUEST["dbasetype"] . "', ! footer='" . $_REQUEST["dbasetype"] . "', ! mailnotify='" . $_REQUEST["dbasetype"] . "', ! mailfrom='" . $_REQUEST["dbasetype"] . "', ! fbasepath='" . $_REQUEST["dbasetype"] . "' WHERE id='" . $_REQUEST["sysid"] . "' AND owner='$user->id';"); --- 24,43 ---- mysql_query("UPDATE ofirst_systems SET dbasetype='" . $_REQUEST["dbasetype"] . "', ! peardb='" . $_REQUEST["peardb"] . "', ! ostype='" . $_REQUEST["ostype"] . "', ! encryption='" . $_REQUEST["encryption"] . "', ! title='" . $_REQUEST["title"] . "', ! version='" . $_REQUEST["version"] . "', ! sqlserver='" . $_REQUEST["sqlserver"] . "', ! sqluser='" . $_REQUEST["sqluser"] . "', ! sqlpassword='" . $_REQUEST["sqlpassword"] . "', ! sqldatabase='" . $_REQUEST["sqldatabase"] . "', ! regenabled='" . $_REQUEST["regenabled"] . "', ! home='" . $_REQUEST["home"] . "', ! header='" . $_REQUEST["header"] . "', ! footer='" . $_REQUEST["footer"] . "', ! mailnotify='" . $_REQUEST["mailnotify"] . "', ! mailfrom='" . $_REQUEST["mailfrom"] . "', ! fbasepath='" . $_REQUEST["fbasepath"] . "' WHERE id='" . $_REQUEST["sysid"] . "' AND owner='$user->id';"); Index: sql.php =================================================================== RCS file: /cvsroot/openfirst/update/sql.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** sql.php 1 Dec 2004 22:17:21 -0000 1.1 --- sql.php 1 Dec 2004 22:23:24 -0000 1.2 *************** *** 53,87 **** echo("<td><b><font color='Green'>Module Installed</font></b></td></tr>"); } - } else { - chdir(".."); - $handle=@opendir(getcwd()); - while ($file = readdir($handle)){ - if(is_dir("$file") && $file != "." && $file != "..") { - $handl=@opendir(getcwd() . "/$file/setup/"); - while ($fil = @readdir($handl)){ - if($fil != ".." && $fil != "." && $fil != "" && strpos($fil, $dbasetype) > 0) { - $filename = "../$file/setup/$fil"; - $sqlf = str_replace(".", "-", str_replace(".$dbasetype", "",substr(strrchr($filename, "/"), 1))); - $dir = str_replace(".", "-", str_replace(".$dbasetype", "", substr(strchr($filename, "/"), 1))); - echo("<br /> <input type='checkbox' name='$dir'>$sqlf - $dir</input>"); - - $q = ofirst_dbquery("CREATE table IF NOT EXISTS `ofirst_config` (`modulename` CHAR(25) NOT NULL, - `showonmenu` BOOL, `active` BOOL, `adminnavigation` TEXT, - `modulenavigation` TEXT, `includes` TEXT, PRIMARY KEY (`modulename`));"); - - $filename = "$file/setup/$fil"; - $sf = fopen($filename, "r"); - $query = ""; - while($line = fgets($sf, 4096)) { - if(substr($line, 0, 2) != "--" && substr($line, 0, 1) != "#" && strlen($line) > 0) { - $q = ofirst_dbquery(trim($line)); - } - } - echo(" - <b>Submitted, and added.</b>"); - fclose($sf); - $filename = "../$file/setup/$fil"; - } - } - } } ?> --- 53,56 ---- |
|
From: Tim G. <xt...@us...> - 2004-12-01 22:17:30
|
Update of /cvsroot/openfirst/update In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15011 Added Files: sql.php Log Message: Add sql.php which just installs databases (it's called remotely) --- NEW FILE: sql.php --- <?php /* * FTP Installer created file for installing database files. * * Copyright (C) 2004, * openFIRST Project * Original Author: Tim Ginn <ti...@op...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ // Purpose: set up OpenFIRST modules include("../config/globals.php"); ini_set("max_execution_time", 600); // Bypass problem of timeouts when many modules are installed // 10 minutes should be sufficient, even for remote database servers if(function_exists("glob")) { foreach (glob("../*/setup/*.$dbasetype") as $filename) { $sqlf = str_replace(".", "-", str_replace(".$dbasetype", "",substr(strrchr($filename, "/"), 1))); $dir = str_replace(".", "-", str_replace(".$dbasetype", "", substr(strchr($filename, "/"), 1))); echo("<tr><td><br /> <input type='checkbox' name='$dir'>$sqlf - $dir</input></td>"); $q = ofirst_dbquery("CREATE table IF NOT EXISTS `ofirst_config` (`modulename` CHAR(25) NOT NULL, `showonmenu` BOOL, `active` BOOL, `adminnavigation` TEXT, `modulenavigation` TEXT, `includes` TEXT, PRIMARY KEY (`modulename`));"); $sf = fopen($filename, "r"); $query = ""; while($line = fgets($sf)) { if(substr($line, 0, 2) != "--" && substr($line, 0, 1) != "#" && strlen($line) > 0) { $q = ofirst_dbquery(trim($line)); } } fclose($sf); echo("<td><b><font color='Green'>Module Installed</font></b></td></tr>"); } } else { chdir(".."); $handle=@opendir(getcwd()); while ($file = readdir($handle)){ if(is_dir("$file") && $file != "." && $file != "..") { $handl=@opendir(getcwd() . "/$file/setup/"); while ($fil = @readdir($handl)){ if($fil != ".." && $fil != "." && $fil != "" && strpos($fil, $dbasetype) > 0) { $filename = "../$file/setup/$fil"; $sqlf = str_replace(".", "-", str_replace(".$dbasetype", "",substr(strrchr($filename, "/"), 1))); $dir = str_replace(".", "-", str_replace(".$dbasetype", "", substr(strchr($filename, "/"), 1))); echo("<br /> <input type='checkbox' name='$dir'>$sqlf - $dir</input>"); $q = ofirst_dbquery("CREATE table IF NOT EXISTS `ofirst_config` (`modulename` CHAR(25) NOT NULL, `showonmenu` BOOL, `active` BOOL, `adminnavigation` TEXT, `modulenavigation` TEXT, `includes` TEXT, PRIMARY KEY (`modulename`));"); $filename = "$file/setup/$fil"; $sf = fopen($filename, "r"); $query = ""; while($line = fgets($sf, 4096)) { if(substr($line, 0, 2) != "--" && substr($line, 0, 1) != "#" && strlen($line) > 0) { $q = ofirst_dbquery(trim($line)); } } echo(" - <b>Submitted, and added.</b>"); fclose($sf); $filename = "../$file/setup/$fil"; } } } } ?> </table> |
|
From: Tim G. <xt...@us...> - 2004-12-01 22:17:04
|
Update of /cvsroot/openfirst/update In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14890 Modified Files: install.php selectinstalldir.php Log Message: Make everything sort of work (or at least be closer to the stage of working) Index: selectinstalldir.php =================================================================== RCS file: /cvsroot/openfirst/update/selectinstalldir.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** selectinstalldir.php 1 Dec 2004 17:52:40 -0000 1.4 --- selectinstalldir.php 1 Dec 2004 22:16:55 -0000 1.5 *************** *** 17,21 **** } ! ftp_chdir($ftpreachable, $system->installdirectory . "/config/"); --- 17,21 ---- } ! ftp_mkdir($ftpreachable, $system->installdirectory . "/config/"); ftp_chdir($ftpreachable, $system->installdirectory . "/config/"); Index: install.php =================================================================== RCS file: /cvsroot/openfirst/update/install.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** install.php 1 Dec 2004 17:52:40 -0000 1.4 --- install.php 1 Dec 2004 22:16:54 -0000 1.5 *************** *** 15,27 **** if(isset($_REQUEST["version"])) { ! $sq = mysql_query("SELECT id, displayname FROM ofirst_systems WHERE owner='$user->id';"); while($s = mysql_fetch_object($sq)) { if(isset($_REQUEST["$s->id"])) { if(mysql_num_rows(mysql_query("SELECT * FROM ofirst_system_software WHERE system='$s->id' AND package='" ! . $_REQUEST["id"] . "'")) == 0) { $q = mysql_query("INSERT INTO ofirst_system_software (system, package, version) VALUES ('$s->id', '" . $_REQUEST["id"] . "', '" . $_REQUEST["version"] . "');"); echo "Added package to $s->displayname<br>"; ! // TODO: Do install here ! } else { --- 15,142 ---- if(isset($_REQUEST["version"])) { ! $sq = mysql_query("SELECT * FROM ofirst_systems WHERE owner='$user->id';"); while($s = mysql_fetch_object($sq)) { if(isset($_REQUEST["$s->id"])) { if(mysql_num_rows(mysql_query("SELECT * FROM ofirst_system_software WHERE system='$s->id' AND package='" ! . $_REQUEST["id"] . "'")) == 0) { ! ! $system = $s; ! ! $ftpreachable = ftp_connect($system->ftpserver); ! if($ftpreachable) { ! $loginokay = @ftp_login($ftpreachable, $system->ftpusername, $system->ftppassword); ! } ! if(! $ftpreachable || ! $loginokay) { ! echo "FTP server is unreachable or cannot login properly."; ! include_once($footer); ! die(); ! } ! ! ! $q = mysql_query("INSERT INTO ofirst_system_software (system, package, version) VALUES ('$s->id', '" . $_REQUEST["id"] . "', '" . $_REQUEST["version"] . "');"); echo "Added package to $s->displayname<br>"; ! flush(); ! $p = mysql_fetch_object(mysql_query("SELECT * FROM ofirst_directory_software_versions WHERE id='" . $_REQUEST["id"] . "';")); ! ! //fetch file ! echo "Getting file...<br>"; ! flush(); ! if(! is_readable("/tmp/systems/")) { ! mkdir("/tmp/systems"); ! } ! if(! is_readable("/tmp/systems/$s->id")) { ! mkdir("/tmp/systems/$s->id"); ! } ! if(! is_readable("/tmp/systems/$s->id/$p->id")) { ! mkdir("/tmp/systems/$s->id/$p->id"); ! } ! // system("wget $p->packageaddress -O /tmp/systems/$s->id/$p->id/pkg.tgz"); ! echo "done."; ! flush(); ! echo "Extracting file...<br>"; ! flush(); ! // extract file ! chdir("/tmp/systems/$s->id/$p->id/"); ! system("tar xzf pkg.tgz"); ! ! // remove globals ! @unlink("base/config/globals.php"); ! @unlink("openfirst/config/globals.php"); ! system("mv base/* .; rm -rf base/"); ! system("mv openfirst/* .; rm -rf openfirst/"); ! @unlink("pkg.tgz"); ! ! echo "done."; ! flush(); ! ! // upload files ! ! ! function rglob($sDir, $sPattern, $nFlags = NULL) { ! $sDir = escapeshellcmd($sDir); ! ! $aFiles = glob("$sDir/$sPattern", $nFlags); ! ! foreach (glob("$sDir/*", GLOB_ONLYDIR) as $sSubDir) { ! // Do not follow symbolic links, as this can cause infinite recursion as this can cause infinite recursion if a link within a directory points to its parent. ! if(! is_link($sSubDir)) { ! $aSubFiles = rglob($sSubDir, $sPattern, $nFlags); ! $aFiles = array_merge($aFiles, $aSubFiles); ! } ! } ! ! // The array we return contains the files we found, and the ! // files all of our children found. ! ! return $aFiles; ! } ! ! ! echo "Creating directory skeleton\n"; ! flush; ! foreach (rglob("/tmp/systems/$s->id/$p->id/", "*") as $filename) { ! if(is_dir($filename) && ! is_link($filename)) { ! ftp_mkdir($ftpreachable, $s->installdirectory . "/" . str_replace("/tmp/systems/$s->id/$p->id/", "", $filename)); ! unset($filename); ! } ! } ! echo "done\n"; ! flush; ! echo "Upload files\n"; ! flush; ! foreach (rglob("/tmp/systems/$s->id/$p->id/", "*") as $filename) { ! if(is_file($filename) && ! is_link($filename)) { ! $ftp = fopen($filename, 'r'); ! @ftp_fput($ftpreachable, $s->installdirectory . "/" . str_replace("/tmp/systems/$s->id/$p->id/", "", $filename), $ftp, FTP_BINARY); ! fclose($ftp); ! unset($filename); ! } ! } ! echo "done"; ! flush; ! ! ! ! ! ! ! ! ! ! ! ! echo "Uploading database installer."; ! flush(); ! // upload sql installer ! $ftp = fopen('/home/ofirst/public_html/update/test/update/sql.php', 'r'); ! ftp_fput($ftpreachable, $s->installdirectory . "/config/sql.php", $ftp, FTP_BINARY); ! fclose($ftp); ! flush(); ! echo "installing databases.<br>"; ! flush(); ! // run sql installer ! include_once("http://$s->home" . $s->basepath . "/config/sql.php"); ! flush(); } else { |
|
From: Tim G. <xt...@us...> - 2004-12-01 17:52:49
|
Update of /cvsroot/openfirst/update In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13965 Modified Files: install.php selectinstalldir.php system.php Log Message: Update status as to whether or not a package is enabled for automatic updates, finish up uploading/creation of globals.php, add marker where actual file installations will go Index: selectinstalldir.php =================================================================== RCS file: /cvsroot/openfirst/update/selectinstalldir.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** selectinstalldir.php 30 Nov 2004 21:55:32 -0000 1.3 --- selectinstalldir.php 1 Dec 2004 17:52:40 -0000 1.4 *************** *** 18,21 **** --- 18,46 ---- + ftp_chdir($ftpreachable, $system->installdirectory . "/config/"); + + + // Update database configuration entries (used as a backup incase globals.php is deleted.) + mysql_query("UPDATE ofirst_systems SET + dbasetype='" . $_REQUEST["dbasetype"] . "', + peardb='" . $_REQUEST["dbasetype"] . "', + ostype='" . $_REQUEST["dbasetype"] . "', + encryption='" . $_REQUEST["dbasetype"] . "', + title='" . $_REQUEST["dbasetype"] . "', + version='" . $_REQUEST["dbasetype"] . "', + sqlserver='" . $_REQUEST["dbasetype"] . "', + sqluser='" . $_REQUEST["dbasetype"] . "', + sqlpassword='" . $_REQUEST["dbasetype"] . "', + sqldatabase='" . $_REQUEST["dbasetype"] . "', + regenabled='" . $_REQUEST["dbasetype"] . "', + home='" . $_REQUEST["dbasetype"] . "', + header='" . $_REQUEST["dbasetype"] . "', + footer='" . $_REQUEST["dbasetype"] . "', + mailnotify='" . $_REQUEST["dbasetype"] . "', + mailfrom='" . $_REQUEST["dbasetype"] . "', + fbasepath='" . $_REQUEST["dbasetype"] . "' + WHERE id='" . $_REQUEST["sysid"] . "' AND owner='$user->id';"); + + // TODO // Run tests to make sure that configuration works successfully. If it does not, abort. *************** *** 24,28 **** - // Write the new globals.php file --- 49,52 ---- *************** *** 178,188 **** fclose($of); ! // TODO: Upload the new globals.php file here. ! // Done. ! // unlink($tmpfname); include_once($footer); --- 202,213 ---- fclose($of); ! ftp_put($ftpreachable, basename($tmpfname), $tmpfname, FTP_ASCII); + ftp_rename($ftpreachable, basename($tmpfname), "globals.php"); // Done. + unlink($tmpfname); ! echo "New configuration file uploaded to server."; include_once($footer); Index: install.php =================================================================== RCS file: /cvsroot/openfirst/update/install.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** install.php 18 Nov 2004 13:02:45 -0000 1.3 --- install.php 1 Dec 2004 17:52:40 -0000 1.4 *************** *** 22,25 **** --- 22,28 ---- $q = mysql_query("INSERT INTO ofirst_system_software (system, package, version) VALUES ('$s->id', '" . $_REQUEST["id"] . "', '" . $_REQUEST["version"] . "');"); echo "Added package to $s->displayname<br>"; + // TODO: Do install here + + } else { echo "Package already being maintained for $s->displayname, no action taken."; Index: system.php =================================================================== RCS file: /cvsroot/openfirst/update/system.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** system.php 19 Nov 2004 22:03:18 -0000 1.10 --- system.php 1 Dec 2004 17:52:40 -0000 1.11 *************** *** 28,32 **** <img src='network.png'></th><td> <a href='system.php?id=$s->id'>$s->displayname</a></td><td> ! [ <a href=\"javascript: alert('Remove system functionality has not been added yet.');\">Remove System</a> | <a href='selectinstalldir.php?sysid=$s->id'>Change installation directory</a> ] </td></tr>"; } --- 28,32 ---- <img src='network.png'></th><td> <a href='system.php?id=$s->id'>$s->displayname</a></td><td> ! [ <a href=\"javascript: alert('Remove system functionality has not been added yet.');\">Remove System</a> | <a href='selectinstalldir.php?sysid=$s->id'>Change installation information</a> ] </td></tr>"; } *************** *** 58,62 **** $system = mysql_fetch_object(mysql_query("SELECT * FROM ofirst_systems WHERE id='" . mysql_insert_id() . "' AND owner='$user->id';")); ! include("selectinstalldir.php"); // Add as a new system --- 58,64 ---- $system = mysql_fetch_object(mysql_query("SELECT * FROM ofirst_systems WHERE id='" . mysql_insert_id() . "' AND owner='$user->id';")); ! if(! isset($system->installdirectory) || $system->installdirectory == "") { ! include("selectinstalldir.php"); ! } // Add as a new system *************** *** 96,100 **** $system = mysql_fetch_object(mysql_query("SELECT * FROM ofirst_systems WHERE id='" . $_REQUEST["id"] . "' AND owner='$user->id';")); ! include("selectinstalldir.php"); // Update existing system configuration --- 98,104 ---- $system = mysql_fetch_object(mysql_query("SELECT * FROM ofirst_systems WHERE id='" . $_REQUEST["id"] . "' AND owner='$user->id';")); ! if(! isset($system->installdirectory) || $system->installdirectory == "") { ! include("selectinstalldir.php"); ! } // Update existing system configuration *************** *** 254,258 **** $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=\"javascript: alert('Remove functionality for packages has not yet been implemented.');\">Remove</a>]<br />"; } } --- 258,264 ---- $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'"; ! if(mysql_num_rows(mysql_query("SELECT * FROM ofirst_system_software WHERE id='$s->id' AND autoupdate='1'")) > 0) { echo "checked='checked'"; } ! echo">$p->name (version: $v->versionname) [<a href=\"javascript: alert('Remove functionality for packages has not yet been implemented.');\">Remove</a>]<br />"; } } |
|
From: Tim G. <xt...@us...> - 2004-11-30 21:55:41
|
Update of /cvsroot/openfirst/update In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14361 Modified Files: selectinstalldir.php Log Message: Add writing of globals.php file (not yet uploaded). Fix typos. Index: selectinstalldir.php =================================================================== RCS file: /cvsroot/openfirst/update/selectinstalldir.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** selectinstalldir.php 30 Nov 2004 16:14:59 -0000 1.2 --- selectinstalldir.php 30 Nov 2004 21:55:32 -0000 1.3 *************** *** 1,4 **** --- 1,194 ---- <?php + if(isset($_REQUEST["createnewglobals"])) { + include_once("../config/globals.php"); + include_once($header); + + $system = mysql_fetch_object(mysql_query("SELECT * FROM ofirst_systems WHERE id='" . $_REQUEST["sysid"] . "' AND owner='$user->id';")); + + $ftpreachable = ftp_connect($system->ftpserver); + if($ftpreachable) { + $loginokay = @ftp_login($ftpreachable, $system->ftpusername, $system->ftppassword); + } + if(! $ftpreachable || ! $loginokay) { + echo "FTP server is unreachable or cannot login properly."; + include_once($footer); + die(); + } + + + // TODO + // Run tests to make sure that configuration works successfully. If it does not, abort. + // If it does, continue. + + + + + // Write the new globals.php file + + + + $tmpfname = tempnam("/tmp", "OFIRSTINSTALLER_"); + + $of = fopen($tmpfname, "w"); + + + if(isset($_POST["cookielogins"])&&$_POST["cookielogins"]=="yes"){ + $cookielogins=""; + }else{ + $cookielogins='$pass_save_disabled=true;'; + } + if(isset($_POST["allowreg"])&&$_POST["allowreg"]=="yes"){ + $allowreg='$regenabled=true;'; + }else{ + $allowreg='$regenabled=false;'; + } + + if(! isset($_POST["peardb"])) { $_POST["peardb"] = false; } + + fputs($of, "<?php + /* + * openFIRST base configuration file + * This file has been automatically generated by the openFIRST + * Remote FTP installer. See: http://www.openfirst.org/ + * for more information. The globals.php file + * contains the basic configuration options required to + * operate the OpenFIRST web portal software. Note, that + * most configuration options are now stored in the MySQL + * database, in the ofirst_config table. Changes to this file + * which are made manually may be lost due to remote updates. + * + * If you encounter such problems, contact the openFIRST team. + */ + \$dbasetype = \"" . $_POST["dbasetype"] . "\"; + \$peardb = " . $_POST["peardb"] . "; + \$ostype = '" . $_POST["ostype"] . "'; + if (\$ostype == \"windows\") { + ini_set(\"include_path\", ini_get(\"include_path\") . \"../config/;.\"); + include_once('dbase.php'); + } else { + ini_set(\"include_path\", ini_get(\"include_path\") . \"../config/:.\"); + include_once('dbase.php'); + } + + \$encryption = '" . $_POST["encryption"] . "'; + + \$title = '" . $_POST["title"] . "'; + \$version = '" . $_POST["version"] . "'; + \$sqlserver = '" . $_POST["sqlserver"] . "'; + \$sqluser = '" . $_POST["sqluser"] . "'; + \$sqlpassword = '" . $_POST["sqlpassword"] . "'; + \$sqldatabase = '" . $_POST["sqldatabase"] . "'; + if(function_exists(\"ofirst_dbconnect\") == false) { + die(\"Your version of PHP has not been compiled with MySQL support, therefore the openFIRST web portal system cannot run on this system. Please contact your system administrator to request MySQL support for your version of PHP.\"); + } + + \$sqlconnection = ofirst_dbconnect(\"\$sqlserver\",\"\$sqluser\",\"\$sqlpassword\"); + + if(\$peardb) { + \$sqlconnection = ofirst_select_db(\$sqldatabase); + } else { + ofirst_select_db(\$sqldatabase); + } + + $cookielogins + $allowreg + \$home = '" . $_POST["home"] . "'; + \$header = '" . $_POST["header"] . "'; + \$footer = '" . $_POST["footer"] . "'; + \$mailnotify = '" . $_POST["mailnotify"] . "'; + \$mailfrom = '" . $_POST["mailfrom"] . "'; + \$basepath = '" . $_POST["basepath"] . "'; + \$fbasepath = '" . $_POST["fbasepath"] . "'; + + // Determine what module the user is viewing + + \$currentmodule = str_replace(\$basepath, \"\", \$_SERVER[\"SCRIPT_NAME\"]); + \$currentmodule = substr(\$currentmodule, 1, strpos(\$currentmodule, \"/\", 2) - 1); + + + session_start(); + include('auth.php'); + if(function_exists(\"glob\")) { + // Include the functions using glob(); + if(is_readable(getcwd() . \"/../config/functions/\")) { + foreach (glob(getcwd() . \"/../config/functions/*.php\") as \$filename) { + include(\$filename); + } + } elseif (is_readable(getcwd() . \"/../../config/functions/\")) { + foreach (glob(getcwd() . \"/../../config/functions/*.php\") as \$filename) { + include(\$filename); + } + } + } else { + // Include the functions without using glob(); + } + + \$headers = \"\"; + + ofirst_select_db(\$sqldatabase, \$sqlconnection); + \$incl = ofirst_dbquery(\"SELECT * FROM ofirst_config\"); + + // If there is no error then run the module add feature + if(ofirst_dberrno() == 0) { + // Begin to loop through modules from the databaes + while(\$module = ofirst_dbfetch_object(\$incl)) { + // Check if the value is try, if it is then run an include + if( (bool) \$module->active == true) { + // Check if there are includes that need to be included + if(! \$module->includes == \"\"){ + // If the list is not empty then explode the value and put it into inclist + \$inclist = explode(\",\",\$module->includes); + // This is to remove an error that you have if you don't check if there are more then 2 + if(count(\$inclist) >= 2){ + + // Loop through the inclist and add them according to their paths + foreach(\$inclist As \$inc){ + include(\"\$fbasepath/\$module->modulename/\$inc\"); + } + } else { + // If there is only 1 include available then use this line to include it instead + include(\"\$fbasepath/\$module->modulename/\$module->includes\"); + } + } + + // If the module has requested to be shown on the menu then add it + if( (bool) \$module->showonmenu == true) { + // If it is the current module then color the item + if (\$currentmodule == \$module->modulename){ + \$headers .= \" » <font color='red'><u><a class='menu' href='\$basepath/\$module->modulename'>\".ucwords(\$module->modulename).\"</a></u></font> |\"; + + // Declare important variables so that headers can pick them up and preview them + + \$adminnav = str_replace(\"\\\$basepath\", \$basepath, \$module->adminnavigation) . \" <a href='http://bugzilla.openfirst.org'>Report Bug</a>\"; + \$subnav = str_replace(\"\\\$basepath\", \$basepath, \$module->modulenavigation); + + } else { + \$headers .= \" » <a class='menu' href='\$basepath/\$module->modulename'>\".ucwords(\$module->modulename).\"</a> |\"; + } + } + } + } + } + + session_write_close(); + ?>"); + + + fclose($of); + + // TODO: Upload the new globals.php file here. + + + + // Done. + + // unlink($tmpfname); + + include_once($footer); + die(); + } + + if(! isset($ftpreachable)) { *************** *** 157,161 **** $syscfg->fbasepath = $system->fbasepath; } ! if(! isset($syscfg->dbasetype)) { $syscfg->basepath = $system->basepath; } --- 347,351 ---- $syscfg->fbasepath = $system->fbasepath; } ! if(! isset($syscfg->basepath)) { $syscfg->basepath = $system->basepath; } *************** *** 169,172 **** --- 359,365 ---- <h1>Base Configuration</h1> <p><form action="<?php echo($_SERVER["PHP_SELF"]); ?>" method="post"> + <input type='hidden' name='createnewglobals' value='createnewglobals'> + <input type='hidden' name='sysid' value='<?php echo $_REQUEST["sysid"]; ?>'> + Congratulations on your choice of openFIRST software. Please proceed through this setup wizard to get your new openFIRST portal software set up and working *************** *** 341,345 **** <td>The file system path to the basepath<br> <font size="1">(example: <strong>/home/openfirst/htdocs/openfirst</strong> or c:\inetpub\wwwroot\openfirst) this should not have a ending slash.</font></td> ! <td><input type="text" name="fbasepath" value="<?php $syscfg->fbasepath; ?>"></td> </tr> <tr> --- 534,538 ---- <td>The file system path to the basepath<br> <font size="1">(example: <strong>/home/openfirst/htdocs/openfirst</strong> or c:\inetpub\wwwroot\openfirst) this should not have a ending slash.</font></td> ! <td><input type="text" name="fbasepath" value="<?php echo $syscfg->fbasepath; ?>"></td> </tr> <tr> |
|
From: Tim G. <xt...@us...> - 2004-11-30 16:15:14
|
Update of /cvsroot/openfirst/update In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20562 Modified Files: selectinstalldir.php Log Message: Add some more steps towards a working configuration generator similar to first.php but done remotely. Index: selectinstalldir.php =================================================================== RCS file: /cvsroot/openfirst/update/selectinstalldir.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** selectinstalldir.php 19 Nov 2004 22:03:18 -0000 1.1 --- selectinstalldir.php 30 Nov 2004 16:14:59 -0000 1.2 *************** *** 23,26 **** --- 23,438 ---- echo "Install directory for $system->displayname updated."; mysql_query("UPDATE ofirst_systems SET installdirectory='" . $_REQUEST["dir"] . "' WHERE id='$system->id' AND owner='$user->id';"); + // Check whether an install is there or not. + if( + ftp_size($ftpreachable, $_REQUEST["dir"] . "/config/globals.php") == -1 + && ftp_size($ftpreachable, $_REQUEST["dir"] . "/config/globals-default.php") == -1 + ) { + echo "<p>There is not currently an openFIRST install in the directory."; + echo "<p>Please specify this configuration information:"; + + } else { + echo "<p>There is already an installation in that directory. + <p>Attempting to read the settings from that configuration... (please + verify these values:)"; + $syscfg = ""; + $cfg = fopen("ftp://" . $system->ftpusername . ":" . $system->ftppassword . "@" . $system->ftpserver . + substr($_REQUEST["dir"] . "/config/globals.php", 1), "r"); + if($cfg) { + while(! feof($cfg)) { + $line = fgets($cfg, 2048); + if(strpos($line, "dbasetype")) { + $lin = explode("\"", $line); + $syscfg->dbasetype = $lin[1]; + } elseif(strpos($line, "peardb = false")) { + $syscfg->peardb = 'false'; + } elseif(strpos($line, "peardb = true")) { + $syscfg->peardb = 'true'; + } elseif(strpos($line, "\$ostype = ")) { + $lin = explode("'", $line); + $syscfg->ostype = $lin[1]; + } elseif(strpos($line, "encryption")) { + $lin = explode("'", $line); + $syscfg->encryption = $lin[1]; + } elseif(strpos($line, "title")) { + $lin = explode("'", $line); + $syscfg->title = $lin[1]; + } elseif(strpos($line, "\$version")) { + $lin = explode("'", $line); + $syscfg->version = $lin[1]; + } elseif(strpos($line, "\$sqlserver = ")) { + $lin = explode("'", $line); + $syscfg->sqlserver = $lin[1]; + } elseif(strpos($line, "\$sqluser = ")) { + $lin = explode("'", $line); + $syscfg->sqluser = $lin[1]; + } elseif(strpos($line, "\$sqlpassword = ")) { + $lin = explode("'", $line); + $syscfg->sqlpassword = $lin[1]; + } elseif(strpos($line, "\$sqldatabase =")) { + $lin = explode("'", $line); + $syscfg->sqldatabase = $lin[1]; + } elseif(strpos($line, "regenabled=true")) { + $syscfg->regenabled = true; + } elseif(strpos($line, "regenabled=false")) { + $syscfg->regenabled = false; + } elseif(strpos($line, "\$home =")) { + $lin = explode("'", $line); + $syscfg->home = $lin[1]; + } elseif(strpos($line, "\$header = ")) { + $lin = explode("'", $line); + $syscfg->header = $lin[1]; + } elseif(strpos($line, "\$footer = ")) { + $lin = explode("'", $line); + $syscfg->footer = $lin[1]; + } elseif(strpos($line, "mailnotify")) { + $lin = explode("'", $line); + $syscfg->mailnotify = $lin[1]; + } elseif(strpos($line, "mailfrom")) { + $lin = explode("'", $line); + $syscfg->mailfrom = $lin[1]; + } elseif(strpos($line, "\$fbasepath =")) { + $lin = explode("'", $line); + $syscfg->fbasepath = $lin[1]; + } elseif(strpos($line, "\$basepath = ")) { + $lin = explode("'", $line); + $syscfg->basepath = $lin[1]; + } + + } + } else { + echo "Cannot open file"; + } + } + + // check if isset for each variable. + if(! isset($syscfg->dbasetype)) { + $syscfg->dbasetype = $system->dbasetype; + } + if(! isset($syscfg->peardb)) { + $syscfg->peardb = $system->peardb; + } + if(! isset($syscfg->ostype)) { + $syscfg->ostype = $system->ostype; + } + if(! isset($syscfg->encryption)) { + $syscfg->encryption = $system->encryption; + } + if(! isset($syscfg->title)) { + $syscfg->title = $system->title; + } + if(! isset($syscfg->version)) { + $syscfg->version = $system->version; + } + if(! isset($syscfg->sqlserver)) { + $syscfg->sqlserver = $system->sqlserver; + } + if(! isset($syscfg->sqluser)) { + $syscfg->sqluser = $system->sqluser; + } + if(! isset($syscfg->sqlpassword)) { + $syscfg->sqlpassword = $system->sqlpassword; + } + if(! isset($syscfg->sqldatabase)) { + $syscfg->sqldatabase = $system->sqldatabase; + } + if(! isset($syscfg->regenabled)) { + $syscfg->regenabled = $system->regenabled; + } + if(! isset($syscfg->home)) { + $syscfg->home = $system->home; + } + if(! isset($syscfg->header)) { + $syscfg->header = $system->header; + } + if(! isset($syscfg->footer)) { + $syscfg->footer = $system->footer; + } + if(! isset($syscfg->mailnotify)) { + $syscfg->mailnotify = $system->mailnotify; + } + if(! isset($syscfg->mailfrom)) { + $syscfg->mailfrom = $system->mailfrom; + } + if(! isset($syscfg->fbasepath)) { + $syscfg->fbasepath = $system->fbasepath; + } + if(! isset($syscfg->dbasetype)) { + $syscfg->basepath = $system->basepath; + } + + + // Very similar to first.php (submitting this form should update + // the database and create then upload a new globals.php file) + + + ?> + <h1>Base Configuration</h1> + <p><form action="<?php echo($_SERVER["PHP_SELF"]); ?>" method="post"> + Congratulations on your choice of openFIRST software. Please proceed through + this setup wizard to get your new openFIRST portal software set up and working + quickly and painlessly. Also please make sure that before installing this script + that you have the appropriate permissions set on config/globals.php (if not + then you may receive a collection of errors after submitting this form).<br> + <br> + <table width="608"> + <tr> + <th width="390">Option</th> + <th width="206">Value</th> + </tr> + <tr> + <td class="sub"><div align="center">Database Setup</div></td> + <td class="sub"> </td> + </tr> + <tr> + <td>Operating System of Web Server</td> + <td><select name="ostype"> + <?php + if ($syscfg->ostype == "windows") { + echo("<option value='unix'>UNIX</option> + <option value='windows' selected='selected'>Windows</option>"); + } else { + echo("<option value='unix' selected='selected'>UNIX</option> + <option value='windows'>Windows</option>"); + } + ?> + </select> <font size="2">(UNIX includes variants, such as Linux, Mac OS + X, and BeOS) </font></td> + </tr> + <tr> + <td>Database Type + <?php + if($syscfg->peardb == "true") { + echo ("<br>The PEAR Database Abstraction layer exists and will be used."); + } + ?> + </td> + <td><?php if(! $syscfg->peardb == "true") { ?> + <input type='hidden' name='peardb' value='false'> + <select name="dbasetype"> + <option value="mysql" + <?php if($syscfg->dbasetype == "mysql") { ?> selected="selected"<?php } ?> + >MySQL</option> + <option value="mssql" + <?php if($syscfg->dbasetype == "mssql") { ?> selected="selected"<?php } ?> + >Microsoft SQL</option> + <option value="odbc" + <?php if($syscfg->dbasetype == "odbc") { ?> selected="selected"<?php } ?> + >ODBC</option> + </select> + + <?php } else { ?> + <input type='hidden' name='peardb' value='true'> + <select name="dbasetype"> + <option value="dbase" + <?php if($syscfg->dbasetype == "dbase") { ?> selected="selected"<?php } ?> + + >dBase (through PEAR DB)</option> + <option value="fbsql" + <?php if($syscfg->dbasetype == "fbsql") { ?> selected="selected"<?php } ?> + + >FrontBase (through PEAR DB)</option> + <option value="ibase" + <?php if($syscfg->dbasetype == "ibase") { ?> selected="selected"<?php } ?> + + >InterBase (through PEAR DB)</option> + <option value="ifx" + <?php if($syscfg->dbasetype == "ifx") { ?> selected="selected"<?php } ?> + + >Informix (through PEAR DB)</option> + <option value="msql" + <?php if($syscfg->dbasetype == "msql") { ?> selected="selected"<?php } ?> + + >Mini SQL (through PEAR DB)</option> + <option value="mssql" + <?php if($syscfg->dbasetype == "mssql") { ?> selected="selected"<?php } ?> + + >Microsoft SQL Server (through PEAR DB)</option> + <option value="mysql" + <?php if($syscfg->dbasetype == "mysql") { ?> selected="selected"<?php } ?> + + >MySQL (for servers running MySQL <= 4.0) (through PEAR DB)</option> + <option value="mysqli" + <?php if($syscfg->dbasetype == "mysqli") { ?> selected="selected"<?php } ?> + + >MySQL (for servers running MySQL >= 4.1) (through PEAR DB)</option> + <option value="oci8" + <?php if($syscfg->dbasetype == "oci8") { ?> selected="selected"<?php } ?> + + >Oracle 7/8/9 (through PEAR DB)</option> + <option value="odbc" + <?php if($syscfg->dbasetype == "odbc") { ?> selected="selected"<?php } ?> + + >ODBC (Open Database Connectivity) (through PEAR DB)</option> + <option value="pgsql" + <?php if($syscfg->dbasetype == "pgsql") { ?> selected="selected"<?php } ?> + >PostgreSQL (through PEAR DB)</option> + <option value="sqlite" + <?php if($syscfg->dbasetype == "sqlite") { ?> selected="selected"<?php } + ?> + + >SQLite (through PEAR DB)</option> + <option value="sybase" + <?php if($syscfg->dbasetype == "sybase") { ?> selected="selected"<?php } + ?> + + >Sybase (through PEAR DB)</option> + </select> + <?php } ?> + <tr> + <td>Title of Website</td> + <td><input type="text" name="title" value="<?php echo $syscfg->title; ?>" /></td> + </tr> + <tr> + <td>Version of Website</td> + <td><input type="text" name="version" value="<?php echo $syscfg->version; ?>" /></td> + </tr> + <tr> + <td>Database Server Address</td> + <td><input type="text" name="sqlserver" value="<?php + echo $syscfg->sqlserver; ?>" /></td> + </tr> + <tr> + <td>Database User Name</td> + <td><input type="text" name="sqluser" value="<?php + echo($syscfg->sqluser); + ?>" /></td> + </tr> + <tr> + <td>Database User Password</td> + <td><input type="password" name="sqlpassword" value="<?php + echo $syscfg->sqlpassword; + ?>" /></td> + </tr> + <tr> + <td>Database Name<br> <font size="1">(if this database does not already exist, the user entered above + must have access to create it)</font></td> + <td><input type="text" name="sqldatabase" value="<?php + echo $syscfg->sqldatabase; + ?>" /></td> + </tr> + <tr> + <td class="sub"><div align="center">Linking Options</div></td> + <td class="sub"> </td> + </tr> + <tr> + <td>Home Site<br> <font size="1">(the address scripts will use for linking + to your main page) <em>Note:</em> Do not place a slash after the link + ie. http://www.yoursite.com</font></td> + <td> <input type="text" name="home" value="<?php echo($syscfg->home); ?>" ></td> + </tr> + <tr> + <td>Header file<br> <font size="1">(this should be a full system path) ie. + c:\inetpub\wwwroot\openfirst\config\header.php or /home/site/public_html/openfirst/config/headers.php</font></td> + <td><input type="text" name="header" value="<?php echo($syscfg->header); ?>" /></td> + </tr> + <tr> + <td>Footer file<br> <font size="1">(this should be a full system path) ie. + c:\inetpub\wwwroot\openfirst\config\footers.php or /home/site/public_html/openfirst/config/footers.php</font></td> + <td><input type="text" name="footer" value="<?php + echo($syscfg->footer); ?>" /></td> + </tr> + <tr> + <td>The base path to the openFIRST software<br> <font size="1">ie. example: + http://openfirst.sourceforge.net<strong>/openfirst</strong>) this should + always have a beginning slash but no ending slash.</font></td> + <td><input type="text" name="basepath" value="<?php echo($syscfg->basepath); ?>"></td> + </tr> + <tr> + <td>The file system path to the basepath<br> <font size="1">(example: <strong>/home/openfirst/htdocs/openfirst</strong> + or c:\inetpub\wwwroot\openfirst) this should not have a ending slash.</font></td> + <td><input type="text" name="fbasepath" value="<?php $syscfg->fbasepath; ?>"></td> + </tr> + <tr> + <td class="sub"><div align="center">Security Options</div></td> + <td class="sub"> </td> + </tr> + <tr> + <td>Type of encryption to use on database passwords?<br> + <font size="1">If you are migrating from an existing system, this should be the same encryption + style that system uses, otherwise all users will have to reset their password; otherwise, in + most cases the default option is fine.</font></td> + <td> + <select name="encryption"> + <option value='md5' + <?php if($syscfg->encryption == "md5") { ?> selected='selected' <?php } ?> + + >MD5 Message-Digest Algorithm</option> + <option value='crypt' + <?php if($syscfg->encryption == "crypt") { ?> selected='selected' <?php } ?> + + >Standard Unix DES-based encryption algorthm</option> + <option value='crc32' + <?php if($syscfg->encryption == "crc32") { ?> selected='selected' <?php } ?> + + >crc32 Polynomial</option> + <option value='sha1' + <?php if($syscfg->encryption == "sha1") { ?> selected='selected' <?php } ?> + + >US Secure Hash Algorithm 1 (sha1)</option> + </select> + </td></tr> + <td>Allow openFIRST users to save their passwords?<br> <font size="1">This feature uses cookies to + automatically log in users into the openFIRST portal.</font></td> + <td><input type="checkbox" name="cookielogins" id="cookielogins" value="yes" checked> + <label for="cookielogins">Allowed</label></td> + </tr> + <tr> + <td>Allow users to register on the portal?<br> <font size="1">Enabling this option will + allow users to register on the website and log in to access the members area. Be careful when + using this option.</font></td> + <td><input type="checkbox" name="allowreg" id="allowreg" value="yes" + <?php if($syscfg->regenabled == "true") { echo "checked='checked'"; } ?>> + <label for="allowreg">Allowed</label></td> + </tr> + <tr> + <td class="sub"><div align="center">Mailing Options</div></td> + <td class="sub"> </td> + </tr> + <tr> + <td>Mail Notification<br> <font size="1">(the e-mail address used to notify + you when significant events occur)</font></td> + <td><input type="text" name="mailnotify" value="<?php echo + $syscfg->mailnotify; ?>"></td> + </tr> + <tr> + <td>Mail From<br> <font size="1">(the e-mail address that mail from the + openFIRST site should appear to be from)</font></td> + <td><input type="text" name="mailfrom" value="<?php + echo $syscfg->mailfrom; + ?>"></td> + </tr> + <tr> + <td></td> + <td><input type="submit" value="Set up OpenFIRST"></td> + </tr> + </table> + </form> + + + + + <?php + + + + + + + + + + + + + + + + + + + + + + include_once($footer); die(); |
|
From: Tim G. <xt...@us...> - 2004-11-19 22:03:28
|
Update of /cvsroot/openfirst/update In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17574 Modified Files: system.php Added Files: folder1.png selectinstalldir.php Log Message: Add selection of installation directory to system settings. --- NEW FILE: selectinstalldir.php --- <?php if(! isset($ftpreachable)) { include_once("../config/globals.php"); include_once($header); $standalone = true; $system = mysql_fetch_object(mysql_query("SELECT * FROM ofirst_systems WHERE id='" . $_REQUEST["sysid"] . "' AND owner='$user->id';")); $ftpreachable = ftp_connect($system->ftpserver); if($ftpreachable) { $loginokay = @ftp_login($ftpreachable, $system->ftpusername, $system->ftppassword); } if(! $ftpreachable || ! $loginokay) { echo "FTP server is unreachable or cannot login properly."; include_once($footer); die(); } if(ftp_size($ftpreachable, $_REQUEST["dir"]) == -1 && isset($_REQUEST["dir"])) { // update database echo "Install directory for $system->displayname updated."; mysql_query("UPDATE ofirst_systems SET installdirectory='" . $_REQUEST["dir"] . "' WHERE id='$system->id' AND owner='$user->id';"); include_once($footer); die(); } elseif(isset($_REQUEST["dir"])) { echo "Could not browse to directory. Change for $system->displayname aborted."; die(); } } function displaylist($ftpdir = "") { global $ftpreachable; global $system; if($ftpdir != "") { $dirs = ftp_nlist($ftpreachable, $ftpdir); if(is_array($dirs)) { foreach($dirs as $dir) { if(ftp_size($ftpreachable, $dir) == -1) { echo "<tr><td><img src='folder1.png' alt=''></td><td><a href='selectinstalldir.php?sysid=$system->id&dir=$dir'>$dir</a></td></tr>"; displaylist($dir); } } } } } echo "Specify installation directory on server"; echo "<br>" . ftp_pwd($ftpreachable); echo "<table>"; displaylist(ftp_pwd($ftpreachable)); echo "</table>"; if(isset($standalone)) { include_once($footer); } ?> --- NEW FILE: folder1.png --- (This appears to be a binary file; contents omitted.) Index: system.php =================================================================== RCS file: /cvsroot/openfirst/update/system.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** system.php 19 Nov 2004 20:46:21 -0000 1.9 --- system.php 19 Nov 2004 22:03:18 -0000 1.10 *************** *** 25,33 **** $sq = mysql_query("SELECT id, displayname FROM ofirst_systems WHERE owner='$user->id' ORDER BY displayname;"); while($s = mysql_fetch_object($sq)) { ! echo "<tr ! ><th> <img src='network.png'></th><td> <a href='system.php?id=$s->id'>$s->displayname</a></td><td> ! [ <a href=\"javascript: alert('Remove system functionality has not been added yet.');\">Remove System</a> ] </td></tr>"; } --- 25,32 ---- $sq = mysql_query("SELECT id, displayname FROM ofirst_systems WHERE owner='$user->id' ORDER BY displayname;"); while($s = mysql_fetch_object($sq)) { ! echo "<tr><th> <img src='network.png'></th><td> <a href='system.php?id=$s->id'>$s->displayname</a></td><td> ! [ <a href=\"javascript: alert('Remove system functionality has not been added yet.');\">Remove System</a> | <a href='selectinstalldir.php?sysid=$s->id'>Change installation directory</a> ] </td></tr>"; } *************** *** 57,60 **** --- 56,63 ---- echo "FTP connection okay.<br>"; + $system = mysql_fetch_object(mysql_query("SELECT * FROM ofirst_systems WHERE id='" . mysql_insert_id() + . "' AND owner='$user->id';")); + include("selectinstalldir.php"); + // Add as a new system mysql_query("INSERT INTO ofirst_systems *************** *** 92,95 **** --- 95,100 ---- echo "FTP connection okay.<br>"; + $system = mysql_fetch_object(mysql_query("SELECT * FROM ofirst_systems WHERE id='" . $_REQUEST["id"] . "' AND owner='$user->id';")); + include("selectinstalldir.php"); // Update existing system configuration |
|
From: Tim G. <xt...@us...> - 2004-11-19 20:46:32
|
Update of /cvsroot/openfirst/update In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31386 Modified Files: system.php Log Message: Ensure that FTP server is reachable after any relevant information changes. Index: system.php =================================================================== RCS file: /cvsroot/openfirst/update/system.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** system.php 19 Nov 2004 18:19:44 -0000 1.8 --- system.php 19 Nov 2004 20:46:21 -0000 1.9 *************** *** 45,49 **** die(include_once($footer)); } elseif(! isset($_REQUEST["id"])) { ! // DEBUG HERE. // Add as a new system --- 45,59 ---- die(include_once($footer)); } elseif(! isset($_REQUEST["id"])) { ! echo "Testing FTP connection...<br>"; ! $ftpreachable = ftp_connect($_REQUEST["ftpserver"]); ! if($ftpreachable) { ! $loginokay = @ftp_login($ftpreachable, $_REQUEST["ftpusername"], $_REQUEST["ftppassword"]); ! } ! if(! $ftpreachable || ! $loginokay) { ! echo "FTP server is unreachable or cannot login properly. <p>Fatal error: System profile not created<br>"; ! include_once($footer); ! die(); ! } ! echo "FTP connection okay.<br>"; // Add as a new system *************** *** 59,62 **** --- 69,96 ---- die(include_once($footer)); } elseif(isset($_REQUEST["id"])) { + if($_REQUEST["ftppassword"] == $_REQUEST["ftpconfirmpassword"] && $_REQUEST["ftppassword"] != "") { + mysql_query("UPDATE ofirst_systems SET ftppassword='" . $_REQUEST["ftppassword"] . "' WHERE id='" . $_REQUEST["id"] . "' AND owner='$user->id';"); + echo "<br />FTP password updated.<br>"; + } else { + echo "<br/ >FTP password not changed.<br>"; + } + + echo "Testing FTP connection...<br>"; + $ftpreachable = ftp_connect($_REQUEST["ftpserver"]); + if($ftpreachable) { + if($_REQUEST["ftppassword"] == "") { + $loginokay = @ftp_login($ftpreachable, $_REQUEST["ftpusername"], $system->ftppassword); + } else { + $loginokay = @ftp_login($ftpreachable, $_REQUEST["ftpusername"], $_REQUEST["ftppassword"]); + } + } + if(! $ftpreachable || ! $loginokay) { + echo "FTP server is unreachable or cannot login properly. <p>Fatal error: System profile not updated<br>"; + include_once($footer); + die(); + } + echo "FTP connection okay.<br>"; + + // Update existing system configuration echo "<br>Installation settings updated.<br>"; *************** *** 72,81 **** WHERE id='" . $_REQUEST["id"] . "' AND owner='$user->id';"); echo "<br>" . mysql_error(); ! if($_REQUEST["ftppassword"] == $_REQUEST["ftpconfirmpassword"] && $_REQUEST["ftppassword"] != "") { ! mysql_query("UPDATE ofirst_systems SET ftppassword='" . $_REQUEST["ftppassword"] . "' WHERE id='" . $_REQUEST["id"] . "' AND owner='$user->id';"); ! echo "<br />FTP password updated."; ! } else { ! echo "<br/ >FTP password not changed."; ! } include_once($footer); die(); --- 106,110 ---- WHERE id='" . $_REQUEST["id"] . "' AND owner='$user->id';"); echo "<br>" . mysql_error(); ! include_once($footer); die(); |
|
From: Tim G. <xt...@us...> - 2004-11-19 18:19:54
|
Update of /cvsroot/openfirst/update In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26993 Modified Files: system.php Log Message: Make adding new machines work again, add removing of systems error. Index: system.php =================================================================== RCS file: /cvsroot/openfirst/update/system.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** system.php 19 Nov 2004 17:06:30 -0000 1.7 --- system.php 19 Nov 2004 18:19:44 -0000 1.8 *************** *** 16,27 **** echo "Setup New System"; $NewServer = True; ! } elseif(! isset($_REQUEST["id"])) { echo "<a href='system.php?new=new'>Create new system profile</a> or <p>"; ! echo "Please select the system to edit."; $sq = mysql_query("SELECT id, displayname FROM ofirst_systems WHERE owner='$user->id' ORDER BY displayname;"); while($s = mysql_fetch_object($sq)) { ! echo "<br><img src='network.png'> <a href='system.php?id=$s->id'>$s->displayname</a>"; } die(include_once($footer)); } else { --- 16,36 ---- echo "Setup New System"; $NewServer = True; ! } elseif(! isset($_REQUEST["id"]) && ! isset($_REQUEST["ftpusername"])) { echo "<a href='system.php?new=new'>Create new system profile</a> or <p>"; ! echo "Please select the system to edit. ! <br><table> ! <tr><th> </th><th>System Name ! <br><small>(click to edit)</small></th><th>Actions</th></tr>"; $sq = mysql_query("SELECT id, displayname FROM ofirst_systems WHERE owner='$user->id' ORDER BY displayname;"); while($s = mysql_fetch_object($sq)) { ! echo "<tr ! ><th> ! <img src='network.png'></th><td> ! <a href='system.php?id=$s->id'>$s->displayname</a></td><td> ! [ <a href=\"javascript: alert('Remove system functionality has not been added yet.');\">Remove System</a> ] ! </td></tr>"; } + echo "</table>"; die(include_once($footer)); } else { *************** *** 46,51 **** ftpserver, owner) ! VALUES ('" . $_REQUEST["admin"] ."', ! '" . $_REQUEST["display"] . "', '" . $_REQUEST["ftpuser"] . "', '" . $_REQUEST["ftppassword"] . "', '" . $_REQUEST["ftpserver"] . "', '$user->id');"); echo "System setup"; die(include_once($footer)); --- 55,59 ---- ftpserver, owner) ! VALUES ('" . $_REQUEST["email"] ."', '" . $_REQUEST["displayname"] . "', '" . $_REQUEST["ftpusername"] . "', '" . $_REQUEST["ftppassword"] . "', '" . $_REQUEST["ftpserver"] . "', '$user->id');"); echo "System setup"; die(include_once($footer)); |
|
From: Tim G. <xt...@us...> - 2004-11-19 17:06:40
|
Update of /cvsroot/openfirst/update In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9501 Modified Files: system.php Log Message: Make frontend actually update backend for some variables. Index: system.php =================================================================== RCS file: /cvsroot/openfirst/update/system.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** system.php 19 Nov 2004 14:01:52 -0000 1.6 --- system.php 19 Nov 2004 17:06:30 -0000 1.7 *************** *** 17,20 **** --- 17,22 ---- $NewServer = True; } elseif(! isset($_REQUEST["id"])) { + echo "<a href='system.php?new=new'>Create new system profile</a> or <p>"; + echo "Please select the system to edit."; $sq = mysql_query("SELECT id, displayname FROM ofirst_systems WHERE owner='$user->id' ORDER BY displayname;"); *************** *** 27,34 **** $NewServer = False; - $Modules = array( - 'Base' => array('Version' => '1.0.1', 'Installed' => True), - 'Guestbook' => array('Version' => '1.0.2', 'Installed' => True) - ); } --- 29,32 ---- *************** *** 38,41 **** --- 36,42 ---- die(include_once($footer)); } elseif(! isset($_REQUEST["id"])) { + // DEBUG HERE. + + // Add as a new system mysql_query("INSERT INTO ofirst_systems (email, *************** *** 49,52 **** --- 50,75 ---- echo "System setup"; die(include_once($footer)); + } elseif(isset($_REQUEST["id"])) { + // Update existing system configuration + echo "<br>Installation settings updated.<br>"; + mysql_query("UPDATE ofirst_systems SET + email='" . $_REQUEST["email"] . "', + displayname='" . $_REQUEST["displayname"] . "', + ftpusername='" . $_REQUEST["ftpusername"] . "', + ftpserver='" . $_REQUEST["ftpserver"] . "', + notifywhenupdatesavailable='" . $_REQUEST["notifywhenupdatesavailable"] . "', + autoinstallsecurity='". $_REQUEST["autoinstallsecurity"] . "', + autoinstallnewversions='" . $_REQUEST["autoinstallnewversions"] . "', + notifywhenupdatecomplete='" . $_REQUEST["notifywhenupdatecomplete"] . "' + WHERE id='" . $_REQUEST["id"] . "' AND owner='$user->id';"); + echo "<br>" . mysql_error(); + if($_REQUEST["ftppassword"] == $_REQUEST["ftpconfirmpassword"] && $_REQUEST["ftppassword"] != "") { + mysql_query("UPDATE ofirst_systems SET ftppassword='" . $_REQUEST["ftppassword"] . "' WHERE id='" . $_REQUEST["id"] . "' AND owner='$user->id';"); + echo "<br />FTP password updated."; + } else { + echo "<br/ >FTP password not changed."; + } + include_once($footer); + die(); } } *************** *** 89,93 **** <th>Display Name</th> <td> ! <input type='text' name='display' <?php if(isset($system->displayname) && $system->displayname != "") { echo --- 112,116 ---- <th>Display Name</th> <td> ! <input type='text' name='displayname' <?php if(isset($system->displayname) && $system->displayname != "") { echo *************** *** 99,103 **** <th>FTP Username</th> <td> ! <input type='text' name='ftpuser' <?php if(isset($system->ftpusername) && $system->ftpusername != "") { echo --- 122,126 ---- <th>FTP Username</th> <td> ! <input type='text' name='ftpusername' <?php if(isset($system->ftpusername) && $system->ftpusername != "") { echo *************** *** 145,149 **** </th> <td> ! <input type='checkbox' checked='checked' name='autoinstallsecurity' <?php if(isset($system->autoinstallsecurity) && $system->autoinstallsecurity == 1) { --- 168,172 ---- </th> <td> ! <input type='checkbox' value='1' name='autoinstallsecurity' <?php if(isset($system->autoinstallsecurity) && $system->autoinstallsecurity == 1) { *************** *** 151,165 **** ?>> 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 --- 174,188 ---- ?>> Automatically install security fixes<br /> ! <input type='checkbox' value='1' name='autoinstallnewversions' <?php if(isset($system->autoinstallnewversions) && $system->autoinstallnewversions == 1) { echo "checked='checked'"; } ?>>Automatically install new versions<br /> ! <input type='checkbox' value='1' 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' value='1' name='notifywhenupdatecomplete' <?php if(isset($system->notifywhenupdatecomplete *************** *** 189,193 **** $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 />"; } } --- 212,216 ---- $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=\"javascript: alert('Remove functionality for packages has not yet been implemented.');\">Remove</a>]<br />"; } } |
|
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> |
|
From: Tim G. <xt...@us...> - 2004-11-18 13:02:55
|
Update of /cvsroot/openfirst/update In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27336 Modified Files: account.php directory.php install.php system.php Log Message: Make updating of account preferences work. Force login when required. Index: account.php =================================================================== RCS file: /cvsroot/openfirst/update/account.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** account.php 7 Nov 2004 02:36:15 -0000 1.4 --- account.php 18 Nov 2004 13:02:45 -0000 1.5 *************** *** 3,22 **** include_once("../config/globals.php"); include_once("$header"); ! ! //Debug settings ! $Servers = array( ! 'Foo' => array('ID' => 0, 'URL' => 'ftp://foo.com/'), ! 'Bar' => array('ID' => 1, 'URL' => 'ftp://bar.com/') ! ); ! //End Debug Stuff ! ! function PrintValue($Setting) { ! if (isset($Setting) && !$NewServer) { ! echo " value=\"$Setting\""; } } ! ?> ! <form> <fieldset id="Account"> <legend><img src="yast_sysadmin.png"> Account Information</legend> --- 3,30 ---- include_once("../config/globals.php"); include_once("$header"); ! ! if(! isset($user)) { showlogin(); include_once($footer); die(); } ! ! if(isset($_REQUEST["user"])) { ! $ns = mysql_query("UPDATE ofirst_members SET user='" . $_REQUEST["user"] . "' WHERE user='$user->user' LIMIT 1;"); ! $user = mysql_fetch_object(mysql_query("SELECT * FROM ofirst_members WHERE id='$user->id' LIMIT 1;")); ! if(! $ns) { echo "Could not update username, selected username is already in use."; } ! if($_REQUEST["password"] == $_REQUEST["confirmpassword"] && $_REQUEST["password"] != "") { ! mysql_query("UPDATE ofirst_members SET password='" . md5sum($_REQUEST["password"]) . "' WHERE id = '$user->id';"); ! } else { ! echo "<br>Password remains unchanged."; } + if($_REQUEST["email"] == $user->email) { + echo "<br>e-mail address remains unchanged."; + } else { + mysql_query("UPDATE ofirst_members SET email='" . $_REQUEST["email"] . "' WHERE id='$user->id'"); + echo "<br>e-mail address updated"; + } + include_once($footer); + die(""); } ! ?> ! <form action="account.php" method="post"> <fieldset id="Account"> <legend><img src="yast_sysadmin.png"> Account Information</legend> *************** *** 27,31 **** <th>Username</th> <td> ! <input type='text' name='user' <?php PrintValue($Name); ?>> </td> </tr> --- 35,39 ---- <th>Username</th> <td> ! <input type='text' name='user' value="<?php echo $user->user; ?>"> </td> </tr> *************** *** 45,49 **** <th>E-mail Address</th> <td> ! <input type='text' name='email' <?php PrintValue($Email); ?>> </td> </tr> --- 53,63 ---- <th>E-mail Address</th> <td> ! <input type='text' name='email' ! <?php ! if (isset($user->email)) { ! echo " value=\"$user->email\""; ! } ! ?> ! > </td> </tr> Index: directory.php =================================================================== RCS file: /cvsroot/openfirst/update/directory.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** directory.php 7 Nov 2004 00:52:25 -0000 1.1 --- directory.php 18 Nov 2004 13:02:45 -0000 1.2 *************** *** 4,7 **** --- 4,8 ---- include_once("$header"); + if(! isset($user)) { showlogin(); include_once($footer); die(); } ?> Index: install.php =================================================================== RCS file: /cvsroot/openfirst/update/install.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** install.php 7 Nov 2004 03:10:14 -0000 1.2 --- install.php 18 Nov 2004 13:02:45 -0000 1.3 *************** *** 4,7 **** --- 4,9 ---- include_once($header); + if(! isset($user)) { showlogin(); include_once($footer); die(); } + if(! isset($_REQUEST["id"])) { echo "No package selected."; die(include_once($footer)); } $vq = mysql_query("SELECT * FROM ofirst_directory_software_versions WHERE parent='" . $_REQUEST["id"] . "'"); Index: system.php =================================================================== RCS file: /cvsroot/openfirst/update/system.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** system.php 7 Nov 2004 02:36:15 -0000 1.4 --- system.php 18 Nov 2004 13:02:45 -0000 1.5 *************** *** 4,7 **** --- 4,9 ---- include_once($header); + if(! isset($user)) { showlogin(); include_once($footer); die(); } + if(isset($_REQUEST["id"])) { echo "Update System Configuration"; } |
|
From: <bug...@we...> - 2004-11-18 12:35:13
|
http://bugzilla.openfirst.org/show_bug.cgi?id=161 ti...@op... changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Platform| |All Resolution| |INVALID Summary|Automated Bug Report - |Using obsoleted config |config |module rather than base | |module causes problems ------- Additional Comments From ti...@op... 2004-11-18 06:35 ------- This type of error results in using the obsolete config package rather than the base package. ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. You reported the bug, or are watching the reporter. |
|
From: <bug...@we...> - 2004-11-18 12:33:37
|
http://bugzilla.openfirst.org/show_bug.cgi?id=163 ti...@op... changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Platform| |All Resolution| |INVALID ------- Additional Comments From ti...@op... 2004-11-18 06:33 ------- A local site permissions change caused this error. ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. You reported the bug, or are watching the reporter. |
|
From: <bug...@we...> - 2004-11-18 12:31:55
|
http://bugzilla.openfirst.org/show_bug.cgi?id=164 ti...@op... changed: What |Removed |Added ---------------------------------------------------------------------------- Platform| |All Summary|Automated Bug Report - |Add debugging before trying |members |to copy to members workspace ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. You reported the bug, or are watching the reporter. |
7 messages has been excluded from this view by a project administrator.
