New Feature: PLA icons and CSS can now be themeble

htdocs/css/default/style.css

@@ -565,7 +565,7 @@ span.hint {
 
 /* Login Box */
 #login {
-	background: url('../images/uid.png') no-repeat 0 1px;
+	background: url('../../images/default/uid.png') no-repeat 0 1px;
 	background-color: #FAFAFF;
 	color: #000000;
 	padding-left: 17px;
@@ -582,7 +582,7 @@ span.hint {
 }
 
 #password {
-	background: url('../images/key.png') no-repeat 0 1px;
+	background: url('../../images/default/key.png') no-repeat 0 1px;
 	background-color: #FAFAFF;
 	color: #000000;
 	padding-left: 17px;

lib/Attribute.php

@@ -404,7 +404,7 @@ class Attribute {
 	}
 
 	public function getIcon() {
-		return $this->icon;
+		return $this->icon ? sprintf('%s/%s',IMGDIR,$this->icon) : '';
 	}
 
 	public function getHint() {

lib/Template.php

@@ -892,7 +892,7 @@ class Template extends xmlTemplate {
 	 * Get template icon
 	 */
 	public function getIcon() {
-		return isset($this->icon) ? $this->icon : '';
+		return isset($this->icon) ? sprintf('%s/%s',IMGDIR,$this->icon) : '';
 	}
 
 	/**

lib/TemplateRender.php

@@ -1821,9 +1821,7 @@ function fillRec(id,value) {
 			$this->draw('UrlValueIcon',$attribute,$val);
 
 		else {
-			$icon = $attribute->getIcon();
+			if ($icon = $attribute->getIcon())
-
-			if ($icon)
 				printf('<img src="%s" alt="Icon" align="top" />&nbsp;',$icon);
 		}
 	}

lib/common.php

@@ -160,6 +160,17 @@ error_reporting(E_ALL);
 # Start our session.
 app_session_start();
 
+# See if we have a session, we can then get our theme out
+$app['theme'] = 'default';
+if (isset($_SESSION[APPCONFIG]))
+    if (is_dir(realpath(sprintf('images/%s',$_SESSION[APPCONFIG]->getValue('appearance','theme'))))
+		&& is_file(realpath(sprintf('css/%s/%s',$_SESSION[APPCONFIG]->getValue('appearance','theme'),$_SESSION[APPCONFIG]->getValue('appearance','stylesheet')))))
+
+	    $app['theme'] = $_SESSION[APPCONFIG]->getValue('appearance','theme');
+
+define('CSSDIR',sprintf('css/%s',$app['theme']));
+define('IMGDIR',sprintf('images/%s',$app['theme']));
+
 # Initialise the hooks
 require_once LIBDIR.'hooks.php';
 

lib/config_default.php

@@ -191,6 +191,10 @@ class Config {
 			'desc'=>'Style sheet to use',
 			'default'=>'style.css');
 
+		$this->default->appearance['theme'] = array(
+			'desc'=>'Which theme to use',
+			'default'=>'default');
+
 		/** Tree display
 		 * An array of format strings used to display enties in the 
 		 * tree viewer (left-hand side). The first format string that 

lib/functions.php

@@ -22,8 +22,6 @@ define('QUERYDIR',sprintf('%s/',realpath(LIBDIR.'../queries/')));
 define('TMPLDIR',sprintf('%s/',realpath(LIBDIR.'../templates/')));
 define('DOCDIR',sprintf('%s/',realpath(LIBDIR.'../doc/')));
 define('HOOKSDIR',sprintf('%s/',realpath(LIBDIR.'../hooks/')));
-define('CSSDIR','css/');
-define('IMGDIR','images/');
 define('JSDIR','js/');
 
 /**
@@ -1616,9 +1614,9 @@ function get_icon($server_id,$dn,$object_classes=array()) {
 		$cval = explode('=',$tmp[0],2);
 		$cval = isset($cval[1]) ? $cval[1] : false;
 		if ($cval && false === strpos($cval,'..') &&
-			file_exists(realpath(sprintf('%s/countries/%s.png',IMGDIR,strtolower($cval)))))
+			file_exists(realpath(sprintf('%s/../countries/%s.png',IMGDIR,strtolower($cval)))))
 
-			return sprintf('countries/%s.png',strtolower($cval));
+			return sprintf('../countries/%s.png',strtolower($cval));
 
 		else
 			return 'country.png';

lib/page.php

@@ -31,15 +31,21 @@ class page {
 		if (defined('DEBUG_ENABLED') && DEBUG_ENABLED)
 			debug_log('Entered with [%s]',129,__FILE__,__LINE__,__METHOD__,$index);
 
+		$this->index = $index;
+
 		# To be defined in a configuration file.
 		$this->_app['title'] = app_name();
+		$this->_app['logo'] = IMGDIR.'/logo-small.png';
+
+		if (! is_null($index))
+			$this->_app['urlcss'] = sprintf('%s/%s',CSSDIR,$_SESSION[APPCONFIG]->getValue('appearance','stylesheet'));
+		else
+			$this->_app['urlcss'] = sprintf('%s/%s',CSSDIR,'style.css');
 
 		# Default Values for configurable items.
-		$this->_default['stylecss'] = CSSDIR.'style.css';
+		$this->_default['sysmsg']['error'] = IMGDIR.'/error-big.png';
-		$this->_default['logo'] = IMGDIR.'logo-small.png';
+		$this->_default['sysmsg']['warn'] = IMGDIR.'/warn-big.png';
-		$this->_default['sysmsg']['error'] = IMGDIR.'error-big.png';
+		$this->_default['sysmsg']['info'] = IMGDIR.'/info-big.png';
-		$this->_default['sysmsg']['warn'] = IMGDIR.'warn-big.png';
-		$this->_default['sysmsg']['info'] = IMGDIR.'info-big.png';
 
 		# Capture any output so far (in case we send some headers below) - there shouldnt be any output anyway.
 		$preOutput = '';
@@ -75,15 +81,6 @@ class page {
 		$this->_pageheader[] .= "\n";
 		$this->_pageheader[] .= '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="auto" lang="auto" dir="ltr">'."\n";
 		$this->_pageheader[] .= "\n";
-
-		$this->_app['logo'] = $this->_default['logo'];
-
-		if (! is_null($index))
-			$this->_app['urlcss'] = sprintf('%s%s',CSSDIR,$_SESSION[APPCONFIG]->getValue('appearance','stylesheet'));
-		else
-			$this->_app['urlcss'] = sprintf('%s%s',CSSDIR,'style.css');
-
-		$this->index = $index;
 	}
 
 	/* Add to the HTML Header */

queries/SambaUsers.xml

@@ -7,7 +7,7 @@
 </bases>
 <filter><![CDATA[(&(|(objectClass=sambaAccount)(objectClass=sambaSamAccount))(objectClass=posixAccount)(!(uid=*$)))]]></filter>
 <description>Samba Users</description>
-<icon>images/user.png</icon>
+<icon>user.png</icon>
 <scope>sub</scope>
 <visible>1</visible>
 

queries/UserList.xml

@@ -7,7 +7,7 @@
 </bases>
 <filter><![CDATA[(&(objectClass=posixAccount)(uid=*))]]></filter>
 <description>User List</description>
-<icon>images/user.png</icon>
+<icon>user.png</icon>
 <scope>sub</scope>
 <visible>1</visible>
 

templates/creation/alias.xml

@@ -5,7 +5,7 @@
 <template>
 <askcontainer>1</askcontainer>
 <description>New LDAP Alias</description>
-<icon>images/go.png</icon>
+<icon>go.png</icon>
 <invalid>0</invalid>
 <rdn>uid</rdn>
 <!--<regexp>^ou=People,o=.*,</regexp>-->

templates/creation/courierMailAccount.xml

@@ -4,7 +4,7 @@
 <template>
 <askcontainer>1</askcontainer>
 <description>New Courier Mail Account</description>
-<icon>images/mail_account.png</icon>
+<icon>mail_account.png</icon>
 <invalid>0</invalid>
 <rdn>cn</rdn>
 <!--<regexp>^ou=People,o=.*,</regexp>-->
@@ -39,7 +39,7 @@
 </attribute>
 <attribute id="uid">
 	<display>User ID</display>
-	<icon>images/uid.png</icon>
+	<icon>uid.png</icon>
 	<!--<onchange>=autoFill(homeDirectory;/home/users/%uid%)</onchange>-->
 	<onchange>=autoFill(homeDirectory;/home/users/%gidNumber|0-0/T%/%uid|3-%)</onchange>
 	<order>4</order>
@@ -47,7 +47,7 @@
 </attribute>
 <attribute id="uidNumber">
 	<display>UID Number</display>
-	<icon>images/terminal.png</icon>
+	<icon>terminal.png</icon>
 	<order>6</order>
 	<page>1</page>
 	<readonly>1</readonly>
@@ -69,7 +69,7 @@
 </attribute>
 <attribute id="mail">
 	<display>Email</display>
-	<icon>images/mail.png</icon>
+	<icon>mail.png</icon>
 	<order>9</order>
 	<page>1</page>
 </attribute>
@@ -80,7 +80,7 @@
 </attribute>
 <attribute id="userPassword">
 	<display>Password</display>
-	<icon>images/lock.png</icon>
+	<icon>lock.png</icon>
 	<order>11</order>
 	<page>1</page>
 	<post>=php.PasswordEncrypt(%enc%;%userPassword%)</post>

templates/creation/courierMailAlias.xml

@@ -4,7 +4,7 @@
 <template>
 <askcontainer>1</askcontainer>
 <description>New Courier Mail Alias</description>
-<icon>images/mail_alias.png</icon>
+<icon>mail_alias.png</icon>
 <invalid>0</invalid>
 <rdn>cn</rdn>
 <!--<regexp>^ou=People,o=.*,</regexp>-->

templates/creation/dNSDomain.xml

@@ -4,7 +4,7 @@
 <template>
 <askcontainer>1</askcontainer>
 <description>New DNS Entry</description>
-<icon>images/dc.png</icon>
+<icon>dc.png</icon>
 <invalid>0</invalid>
 <rdn>dc</rdn>
 <!--<regexp>^ou=People,o=.*,</regexp>-->