Subversion Repositories Applications.wikini

Rev

Rev 40 | Rev 42 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 40 Rev 41
Line 18... Line 18...
18 
	private $pageNom = null;
 18 
	private $pageNom = null;
19 
	private $section = null;
 19 
	private $section = null;
20 
	private $creerPage = false;
 20 
	private $creerPage = false;
21 
	private $templateDefaut = null;
 21 
	private $templateDefaut = null;
Line 22... Line 22...
22
22
23 
	private $retour = 'txt';
 23 
	private $retour = null;
24 
	private $formats_retour = array('text/plain','text/html');
 24 
	private $formats_retour = array('text/plain','text/html');
Line 25... Line 25...
25 
	private $format_texte;
 25 
	private $format_texte;
26
26
Line 35... Line 35...
35 
			$this->verifierParametres($parametres);
 35 
			$this->verifierParametres($parametres);
36 
			$this->analyserParametres($ressources, $parametres);
 36 
			$this->analyserParametres($ressources, $parametres);
Line 37... Line 37...
37
37
Line 38... Line -...
38 
			$page = $this->consulterPage($this->pageNom, $this->section);
 - 
 
39
- 
 
40 
			// on devrait normalement renvoyer une erreur 404 mais
- 
 
41 
			// l'api de consultation d'url du framework prend mal en compte
38 
			$page = $this->consulterPage($this->pageNom, $this->section);
42 
			// le 404 et ne permet pas de le traiter quand on le recoit
 39
43 
			if($page == null && $this->creerPage) {
 40 
			if($page == null && $this->creerPage) {
44 
				$this->creerPageAPartirTemplate($this->pageNom, $this->templateDefaut);
 41 
				$this->creerPageAPartirTemplate($this->pageNom, $this->templateDefaut);
Line 118... Line 115...
118 
		$this->wiki = Registre::get('wikiApi');
 115 
		$this->wiki = Registre::get('wikiApi');
119 
		$this->wiki->setPageCourante($this->pageNom);
 116 
		$this->wiki->setPageCourante($this->pageNom);
120 
		$page = $this->wiki->LoadPage($page);
 117 
		$page = $this->wiki->LoadPage($page);
Line 121... Line 118...
121
118
122 
		if ($page != null) {
 - 
 
123 
			// attention les wikis sont souvent en ISO !
 119 
		if ($page != null) {
124 
			$page["body"] = $this->convertirTexteWikiVersEncodageAppli($page['body']);
 120 
			$page["body"] = $this->convertirTexteWikiVersEncodageAppli($page['body']);
125 
			if($section != null) {
 121 
			if($section != null) {
126 
				$page["body"] = $this->decouperPageSection($page["body"], $section);
 122 
				$page["body"] = $this->decouperPageSection($page["body"], $section);
127 
			}
 123 
			}