Added support for individual CSS files for each user

This will hopefully encourage users and designers to customize bwreg2
and submit their work back to me so we can get a good looking bwreg2.

public_html/subs/env.php

@@ -78,6 +78,7 @@ function next_action($action, &$object)
 		"version" => $_SERVER['PHP_SELF'] . '?action=ContentGetVersion&version=%s', 
 		"diff" => $_SERVER['PHP_SELF'] . '?action=ContentDiff&version=%s', 
 		"action" => $_SERVER['PHP_SELF'] . '?action=%s', 
+		"file" => '', // FIXME: doesn't really work because / gets encoded.
 		"user" => $_SERVER['PHP_SELF'] . '?page=Userinfo&action=UserGetInfo&user=%s');
 	$wiki->setFormatConf('Xhtml',array('translate'=>HTML_SPECIALCHARS, 'charset'=>'UTF-8')); 
 	$wiki->setRenderConf('xhtml', 'interwiki','sites', $sites);

public_html/subs/html.php

@@ -51,7 +51,7 @@ class page  extends box
 	var $top1;
 	var $htmltitle = "No title";
 	var $top2;
-	var $css = "default.css";
+	var $css = false;
 	var $top3;
 	var $top4;
 	var $header = "No header";
@@ -104,12 +104,15 @@ function actioncb($action)
 	}
 	function set_css($css) 
 	{
-		$this->css = $css;
+		if(!$this->css)
+			$this->css = $css;
 	}
 
 	function get_css()
 	{
-		return "<link href=\"css/" . $this->css . "\" type=\"text/css\" rel=\"stylesheet\" />\n";
+		if (!$this->css)
+			$this->css = "css/default.css";
+		return "<link href=\"" . $this->css . "\" type=\"text/css\" rel=\"stylesheet\" />\n";
 	}
 
 	function get_header()

public_html/subs/user.php

@@ -366,7 +366,7 @@ function login($user, $password)
 		global $db;
 		$myuser = $db->escape($user);
 		$mypass = $db->escapepass($password);
-		$query = "SELECT uid,uname,firstname,lastname,mail,birthyear,adress,phone,extra,private FROM users WHERE uname = '";
+		$query = "SELECT uid,uname,firstname,lastname,mail,birthyear,adress,phone,extra,private,css FROM users WHERE uname = '";
 		$query .= $myuser;
 		$query .= "' AND pass = ";
 		$query .= $mypass;
@@ -415,7 +415,10 @@ function sqlcb($row)
 		$this->userinfo->extra = $row['extra'];
 		$this->userinfo->options = $row['private'];
 		$this->userinfo->uname = $row['uname'];	
-
+		global $page;
+		if ($row['css'] != null && $row['css'] != "")
+			$page->set_css($row['css']);
+		$this->userinfo->css = $row['css'];
 		for($tmp = 0; $tmp < $this->nItems; $tmp++)
 		{
 			if(function_exists($this->items[$tmp]->sqlcb))
@@ -1519,53 +1522,47 @@ function set_private_form()
 	}
 	function set_form()
 	{
-		$form = new form();
+		$form = new table(2,"userform");
+		$t = new form();
 		$u = $this->userinfo;
-		$form->add(str("<table style=\"UserForm\"><tr>"));
-		$form->add(str("<td><label for=\"firstname\" title=\"Fornavn\">Fornavn</label></td><td>"));
+		$form->add(str("Fornavn"));
 		$form->add(ftext("firstname",$u->firstname));
-		$form->add(str("</td></tr><tr><td>\n"));
-		$form->add(str("Etternavn</td><td>"));
+		$form->add(str("Etternavn"));
 		$form->add(ftext("lastname",$u->lastname));
-		$form->add(str("</td></tr><tr><td>\n"));
-		$form->add(str("Telefonnummer</td><td>"));
+		$form->add(str("Telefonnummer"));
 		$form->add(ftext("phone",$u->phone));
-		$form->add(str("</td></tr><tr><td>\n"));
-		$form->add(str("E-post</td><td>"));
+		$form->add(str("E-post"));
 		$form->add(ftext("mail",$u->mail));
-		$form->add(str("</td></tr><tr><td>\n"));
-		$form->add(str("Adresse</td><td>"));
+		$form->add(str("Adresse"));
 		$form->add(ftext("address",$u->adress));
-		$form->add(str("</td></tr><tr><td>\n"));
 		if (!$this->update)
 		{
-			$form->add(str("Brukernavn</td><td>"));
+			$form->add(str("Brukernavn"));
 			$form->add(ftext("user"));
-			$form->add(str("</td></tr><tr><td>\n"));
 			$form->add($this->set_pass(true));
 		} else
-			$form->add(fhidden($u->uname,"user"));
-		$form->add(str("Tilleggsinformasjon</td><td>"));
+			$t->add(fhidden($u->uname,"user"));
+		$form->add(str("Tilleggsinformasjon"));
 		$form->add(ftext("extra",$u->extra));
-		$form->add(str("</td></tr><tr><td>\n"));
-		$form->add(str("Fødselsår</td><td>"));
+		$form->add(str("Fødselsår"));
 		if (!isset($u->born))
 			$b = "19";
 		else 
 			$b = $u->born->get();
 		$form->add(ftext("born",$b,5));
-		$form->add(str("</td></tr><tr><td>\n"));
 		$form->add(str("Skjul *"));
-		$form->add(str("</td><td>"));
 		$form->add($this->set_private_form());
-		$form->add(str("</td></tr><tr><td colspan=\"2\">\n"));
 		if ($this->update)
-			$form->add(fhidden("CommitUserInfo"));
+		{
+			$form->add(str("CSS fil**"));
+			$form->add(ftext("css",$u->css));
+			$t->add(fhidden("CommitUserInfo"));
+		}
 		else
-			$form->add(fhidden("NewUserStore"));
-		$form->add(fsubmit("Lagre"));
-		$form->add(str("</td></tr></table>"));
-		return $form;
+			$t->add(fhidden("NewUserStore"));
+		$form->add(fsubmit("Lagre"),2);
+		$t->add($form);
+		return $t;
 	}
 
 	function get_pass()
@@ -1630,6 +1627,7 @@ function get_form()
 			$private .= $pr;
 		}
 		$born = $_REQUEST['born'];	
+		$css = $_REQUEST['css'];
 		global $db;
 		if (!$this->update)
 		{
@@ -1715,6 +1713,7 @@ function get_form()
 			$this->error = "Du har allerede en bruker ($res) i systemet. ";
 			return false;
 		}
+		$this->css = $css;
 		$this->firstname = $firstname;
 		$this->lastname = $lastname;
 		$this->phone = $phone;
@@ -1752,7 +1751,8 @@ function get_form()
 			$query .= $db->escape($private) . "', birthyear = '";
 			$query .= $db->escape($nborn) . "', phone = '";
 			$query .= $db->escape($phone) . "', extra = '";
-			$query .= $db->escape($extra) . "' WHERE uname = '";
+			$query .= $db->escape($extra) . "', css = '";
+			$query .= $db->escape($css) . "' WHERE uname = '";
 			$query .= $db->escape($user) . "';";
 			if (!$db->insert($query))
 			{

sql/mysql.sql

@@ -141,6 +141,7 @@ CREATE TABLE `users` (
   `extra` varchar(50) default NULL,
   `pass` varchar(20) default NULL,
   `private` varchar(20) default NULL,
+  `css` varchar(50) default NULL,
   PRIMARY KEY  (`uid`)
 ) TYPE=MyISAM;