SF Feature #2997986 - DTD stuff

This commit is contained in:
Deon George 2011-05-03 23:14:16 +10:00
parent a2828b2cf0
commit 66e24fb86c
6 changed files with 42 additions and 9 deletions

View File

@ -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',

View File

@ -79,8 +79,6 @@ class page {
ob_start();
# Initial Values
#$this->_pageheader[] .= '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.0//EN"';
#$this->_pageheader[] .= '"http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd">'."\n";
$this->_pageheader[] = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
$this->_pageheader[] .= '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="auto">'."\n";
}

View File

@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE template SYSTEM "query.dtd">
<!DOCTYPE query SYSTEM "query.dtd">
<query>
<title>Samba User List</title>
<bases>
<base></base>
<base></base>
</bases>
<filter><![CDATA[(&(|(objectClass=sambaAccount)(objectClass=sambaSamAccount))(objectClass=posixAccount)(!(uid=*$)))]]></filter>
<description>Samba Users</description>

View File

@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE template SYSTEM "query.dtd">
<!DOCTYPE query SYSTEM "query.dtd">
<query>
<title>User List</title>
<bases>
<base></base>
<base></base>
</bases>
<filter><![CDATA[(&(objectClass=posixAccount)(uid=*))]]></filter>
<description>User List</description>

35
queries/query.dtd Normal file
View File

@ -0,0 +1,35 @@
<!--
==========================================================================
This is the DTD for phpLDAPAdmin Queries.
Copyright (c) 2011
Temporary URI for the DTD: http://phpldapadmin.sf.net/release/templates/query.dtd
Validate your templates here: http://www.xmlvalidation.com
==========================================================================
-->
<!-- Query Definition -->
<!ELEMENT query (title,bases,filter,description,icon?,scope,visible?,attributes)>
<!-- Bases Definition -->
<!ELEMENT bases (base*)>
<!-- Attributes Definition -->
<!ELEMENT attributes (attribute*)>
<!ELEMENT attribute (display?,order?,ordersort?)?>
<!ATTLIST attribute id CDATA #REQUIRED>
<!-- Header Parameters -->
<!ELEMENT base (#PCDATA)>
<!ELEMENT title (#PCDATA)>
<!ELEMENT filter (#PCDATA)>
<!ELEMENT description (#PCDATA)>
<!ELEMENT icon (#PCDATA)>
<!ELEMENT scope (#PCDATA)>
<!ELEMENT visible (#PCDATA)>
<!-- Attribute Parameters -->
<!ELEMENT display (#PCDATA)>
<!ELEMENT order (#PCDATA)>
<!ELEMENT ordersort (#PCDATA)>

View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE template SYSTEM "template.dtd">
<!--This template doesnt work needs modification to the Engine.-->
<template>
<askcontainer>1</askcontainer>