From 66e24fb86ce82a30ffa1250eef1c09747255b8dc Mon Sep 17 00:00:00 2001 From: Deon George Date: Tue, 3 May 2011 23:14:16 +1000 Subject: [PATCH] SF Feature #2997986 - DTD stuff --- lib/ds.php | 3 +-- lib/page.php | 2 -- queries/SambaUsers.xml | 5 +++-- queries/UserList.xml | 5 +++-- queries/query.dtd | 35 +++++++++++++++++++++++++++++++++++ templates/creation/alias.xml | 1 - 6 files changed, 42 insertions(+), 9 deletions(-) create mode 100644 queries/query.dtd diff --git a/lib/ds.php b/lib/ds.php index 24f321c..8be379a 100644 --- a/lib/ds.php +++ b/lib/ds.php @@ -212,7 +212,7 @@ abstract class DS { case 'cookie': set_cookie($method.'-USER',blowfish_encrypt($user),NULL,'/'); set_cookie($method.'-PASS',blowfish_encrypt($pass),NULL,'/'); - return TRUE; + return true; case 'config': return true; @@ -588,7 +588,6 @@ class Datastore { 'untested'=>true, 'default'=>null); - # Prefix for custom pages $this->default->custom['pages_prefix'] = array( 'desc'=>'Prefix name for custom pages', diff --git a/lib/page.php b/lib/page.php index 803eabe..dc981e5 100644 --- a/lib/page.php +++ b/lib/page.php @@ -79,8 +79,6 @@ class page { ob_start(); # Initial Values - #$this->_pageheader[] .= '_pageheader[] .= '"http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd">'."\n"; $this->_pageheader[] = ''; $this->_pageheader[] .= ''."\n"; } diff --git a/queries/SambaUsers.xml b/queries/SambaUsers.xml index 7fcb1e4..70220f6 100644 --- a/queries/SambaUsers.xml +++ b/queries/SambaUsers.xml @@ -1,9 +1,10 @@ - + + Samba User List - + Samba Users diff --git a/queries/UserList.xml b/queries/UserList.xml index 4d54c1e..b670fc1 100644 --- a/queries/UserList.xml +++ b/queries/UserList.xml @@ -1,9 +1,10 @@ - + + User List - + User List diff --git a/queries/query.dtd b/queries/query.dtd new file mode 100644 index 0000000..99a8213 --- /dev/null +++ b/queries/query.dtd @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/templates/creation/alias.xml b/templates/creation/alias.xml index 1cc7555..3c803d1 100644 --- a/templates/creation/alias.xml +++ b/templates/creation/alias.xml @@ -1,6 +1,5 @@ -