usual typos

svn path=/; revision=28

2 files changed, 86 insertions, 9 deletions

diff --git a/webgli/configfiles.php b/webgli/configfiles.php
index 1ea1d30..c5924cc 100644
--- a/webgli/configfiles.php
+++ b/webgli/configfiles.php
@@ -10,10 +10,12 @@ $smarty->compile_dir = './templates_c';
 $smarty->cache_dir = './cache';
 $smarty->config_dir = './configs';
 
-$ip = InstallProfile();
-$ip.parse($_POST['xmlfile']);
-$etc_files = $ip.get("etc_files");
+$ip = new InstallProfile();
+$ip->parse('test.xml');
+$etc_files = $ip->get("etc_files");
+var_dump($etc_files);
 $error_msg = "";
+
 if ($_POST['SaveConfigFiles']) {
 	$keymap = "";
 	$windowkeys = "";
@@ -48,22 +50,22 @@ if ($_POST['SaveConfigFiles']) {
 		$xsession = $_POST['xsession'];
 	}
 
-	if(!array_key_exists("conf.d/keymaps", $etc_files) {
+	if(!array_key_exists("conf.d/keymaps", $etc_files)) {
 		if($keymap || $windowkeys || $ext_keymap) {
 			$etc_files['conf.d/keymaps'] = array();
 		}
 	}
-	if(!array_key_exists("conf.d/consolefont", $etc_files) {
+	if(!array_key_exists("conf.d/consolefont", $etc_files)) {
 		if($font) {
 			$etc_files['conf.d/consolefont'] = array();
 		}
 	}
-	if(!array_key_exists("conf.d/clock", $etc_files) {
+	if(!array_key_exists("conf.d/clock", $etc_files)) {
 		if($clock) {
 			$etc_files['conf.d/clock'] = array();
 		}
 	}
-	if(!array_key_exists("rc.conf", $etc_files) {
+	if(!array_key_exists("rc.conf", $etc_files)) {
 		if($editor || $disp_manager || $xsession) {
 			$etc_files['rc.conf'] = array();
 		}
@@ -76,8 +78,14 @@ if ($_POST['SaveConfigFiles']) {
 	if($editor) $etc_files['rc.conf']['EDITOR'] = $editor;
 	if($disp_manager) $etc_files['rc.conf']['DISPLAYMANAGER'] = $disp_manager;
 	if($xsession) $etc_files['rc.conf']['XSESSION'] = $xsession;
-	$ip->set("etc_files", etc_files);
-	file_put_contents($_POST['xmlfile'], $ip->serialize());
+	print_r($etc_files);
+	$ip->set("etc_files", $etc_files);
+#	print_r($ip->get("etc_files"));
+#	file_put_contents('test.xml', $ip->serialize());  #PHP 5 only
+	$fh = fopen('test.xml','w');
+	fwrite($fh, $ip->serialize());
+	fclose($fh);
+	
 	if(!$error_msg) {
 		$error_msg = "Values saved successfully";
 	}
diff --git a/webgli/webgliUtility.php b/webgli/webgliUtility.php
index ea16f11..03ed065 100644
--- a/webgli/webgliUtility.php
+++ b/webgli/webgliUtility.php
@@ -82,4 +82,73 @@ function generate_consoletranslation_list()
 }
 */
 
+function get_install_package_list()
+{
+	$install_package_list = array( 
+		'Desktop' => array("Popular Desktop Applications",
+			array("bittorrent"=> "tool for distributing files via a distributed network of nodes",
+			"evolution" => "A GNOME groupware application, a Microsoft Outlook workalike",
+			"gaim" => "GTK Instant Messenger client",
+			"gftp" => "Gnome based FTP Client",
+			"gimp" => "GNU Image Manipulation Program",
+			"inkscape" => "A SVG based generic vector-drawing program",
+			"koffice" => "An integrated office suite for KDE, the K Desktop Environment",
+			"mozilla" => "The Mozilla Web Browser",
+			"mozilla-firefox" => "The Mozilla Firefox Web Browser",
+			"mozilla-thunderbird" => "Thunderbird Mail Client",
+			"mplayer" => "Media Player for Linux",
+			"openoffice" => "OpenOffice.org, a full office productivity suite.",
+			"openoffice-bin" => "Same as OpenOffice but a binary package (no compiling!)",
+			"rhythmbox" => "Music management and playback software for GNOME",
+			"vlc" => "VLC media player - Video player and streamer",
+			"xchat" => "Graphical IRC Client",
+			"xine-ui" => "Xine movie player",
+			"xmms" => "X MultiMedia System" )),
+		'Servers' => array("Applications often found on servers.",
+			array("apache" => "Apache Web Server",
+			"cups" => "The Common Unix Printing System",
+			"exim" => "A highly configurable, drop-in replacement for sendmail",
+			"iptables" => "Linux kernel (2.4+) firewall, NAT and packet mangling tools",
+			"mod_php" => "Apache module for PHP",
+			"mysql" => "A fast, multi-threaded, multi-user SQL database server",
+			"postfix" => "A fast and secure drop-in replacement for sendmail",
+			"postgresql" => "sophisticated Object-Relational DBMS",
+			"proftpd" => "ProFTP Server",
+			"samba" => "SAMBA client/server programs for UNIX",
+			"sendmail" => "Widely-used Mail Transport Agent (MTA)",
+			"traceroute" => "Utility to trace the route of IP packets" )),
+		'X11' => array("Window managers and X selection.", 
+			array("xorg-x11" => "An X11 implementation maintained by the X.Org Foundation",
+			"gnome" => "The Gnome Desktop Environment",
+			"kde" => "The K Desktop Environment",
+			"blackbox" => "A small, fast, full-featured window manager for X",
+			"enlightenment" => "Enlightenment Window Manager",
+			"fluxbox" => "Fluxbox is an X11 window manager featuring tabs and an iconbar",
+			"xfce4" => "XFCE Desktop Environment"  )),
+		'Misc' => array("Miscellaneous Applications you may want.",
+			array("emacs" => "An incredibly powerful, extensible text editor",
+			"ethereal" => "A commercial-quality network protocol analyzer",
+			"gkrellm" => "Single process stack of various system monitors",
+			"gvim" => "GUI version of the Vim text editor",
+			"keychain" => "ssh-agent manager",
+			"logrotate" => "Rotates, compresses, and mails system logs",
+			"ntp" => "Network Time Protocol suite/programs",
+			"rdesktop" => "A Remote Desktop Protocol Client",
+			"slocate" => "Secure way to index and quickly search for files on your system",
+			"ufed" => "Gentoo Linux USE flags editor",
+			"vim" => "Vim, an improved vi-style text editor" )),
+		'Recommended' => array("Applications recommended by the GLI Team.",
+			array("anjuta" => "A versatile IDE for GNOME",
+			"chkrootkit" => "a tool to locally check for signs of a rootkit",
+			"crack-attack" => "Addictive OpenGL-based block game",
+			"gnupg" => "The GNU Privacy Guard, a GPL pgp replacement",
+			"net-snmp" => "Software for generating and retrieving SNMP data",
+			"netcat" => "the network swiss army knife",
+			"nmap" => "A utility for network exploration or security auditing",
+			"screen" => "full-screen window manager that multiplexes between several processes",
+			"xpdf" => "An X Viewer for PDF Files" ))
+	);
+	return $install_package_list;
+}
+
 ?>