X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fplwizard.php;h=78242f24adcdc60c71c05f5e2b645f113cf55bfd;hb=9c0a8f8cfb7868c07197af8ad1a29b316d81605d;hp=7b6721d7f52f23aa53276e68685c596fb7fbbb29;hpb=e1635d166e636b8a8c8bfac51d5b904b37509134;p=platal.git

diff --git a/classes/plwizard.php b/classes/plwizard.php
index 7b6721d..78242f2 100644
--- a/classes/plwizard.php
+++ b/classes/plwizard.php
@@ -37,7 +37,7 @@ interface PlWizardPage
 
     /** Prepare the page by assigning to it any useful value.
      */
-    public function prepare(PlatalPage &$page);
+    public function prepare(PlatalPage &$page, $id);
 
     /** Process information resulting of the application of the page.
      * This function must return a clue indicating the next page to show.
@@ -67,12 +67,14 @@ class PlWizard
     protected $name;
     protected $layout;
     protected $stateless;
+    protected $ajax;
 
     protected $pages;
     protected $titles;
     protected $lookup;
+    protected $inv_lookup;
 
-    public function __construct($name, $layout, $stateless = false)
+    public function __construct($name, $layout, $stateless = false, $ajax = true)
     {
         $this->name      = 'wiz_' . $name;
         $this->layout    = $layout;
@@ -80,20 +82,23 @@ class PlWizard
         $this->pages  = array();
         $this->lookup = array();
         $this->titles = array();
+        $this->ajax   = $ajax;
         if (!isset($_SESSION[$this->name])) {
             $_SESSION[$this->name] = array();
+            $_SESSION[$this->name . '_page']  = null;
+            $_SESSION[$this->name . '_stack'] = array();
         }
-        $_SESSION[$this->name . '_page']  = null;
-        $_SESSION[$this->name . '_stack'] = array();
     }
 
-    public function addPage($class, $title,$id = null)
+    public function addPage($class, $title, $id = null)
     {
-        if ($id != null) {
-            $this->lookup[$id] = count($this->pages);
+        if ($id == null) {
+            $id = count($this->pages);
         }
-        $this->pages[]  = $class;
-        $this->titles[] = $title;
+        $this->lookup[$id]  = count($this->pages);
+        $this->inv_lookup[] = $id;
+        $this->pages[]      = $class;
+        $this->titles[]     = $title;
     }
 
     public function set($varname, $value)
@@ -133,13 +138,21 @@ class PlWizard
         return new $page($this);
     }
 
-    public function apply(PlatalPage &$smarty, $baseurl, $pgid = null)
+    public function apply(PlatalPage &$smarty, $baseurl, $pgid = null, $mode = 'normal')
     {
-        $curpage =& $_SESSION[$this->name . '_page'];
+        if ($this->stateless && (isset($this->lookup[$pgid]) || isset($this->pages[$pgid]))) { 
+            $curpage = is_numeric($pgid) ? $pgid : $this->lookup[$pgid]; 
+        } else if ($this->stateless && is_null($pgid)) {
+            $curpage = 0;
+        } else {
+            $curpage = $_SESSION[$this->name . '_page'];
+        }
+        $oldpage = $curpage;
 
         // Process the previous page
-        if (!is_null($curpage)) {
-            $page = $this->getPage($curpage);
+        if (Post::has('valid_page')) {
+            $page = $this->getPage(Post::i('valid_page'));
+            $curpage = Post::i('valid_page');
             $next = $page->process();
             $last = $curpage;
             switch ($next) {
@@ -165,30 +178,40 @@ class PlWizard
                 break;
               case PlWizard::CURRENT_PAGE: break; // don't change the page
               default:
-                $curpage = is_numeric($next) ? $next : $this->lookup[$curpage];
+                $curpage = is_numeric($next) ? $next : $this->lookup[$next];
                 break;
             }
             if (!$this->stateless) {
                 array_push($_SESSION[$this->name . '_stack'], $last);
             }
         }
-        if ($this->stateless && (in_array($pgid, $this->lookup) || isset($this->pages[$pgid]))) {
-            $curpage = $pgid;
-        }
         if (is_null($curpage)) {
             $curpage = 0;
         }
 
         // Prepare the page
-        $page = $this->getPage($curpage);
-        $smarty->changeTpl($this->layout);
+        $_SESSION[$this->name . '_page'] = $curpage;
+        if ($curpage != $oldpage) {
+            pl_redirect($baseurl . '/' . $this->inv_lookup[$curpage]);
+        } else if (!isset($page)) {
+            $page = $this->getPage($curpage);
+        }
+        if ($mode == 'ajax') {
+            header('Content-Type: text/html; charset=utf-8');
+            $smarty->changeTpl($page->template(), NO_SKIN);
+        } else {
+            $smarty->changeTpl($this->layout);
+        }
         $smarty->assign('pages', $this->titles);
         $smarty->assign('current', $curpage);
+        $smarty->assign('lookup', $this->inv_lookup);
         $smarty->assign('stateless', $this->stateless);
         $smarty->assign('wiz_baseurl', $baseurl);
+        $smarty->assign('wiz_ajax', $this->ajax);
         $smarty->assign('tab_width', (int)(99 / count($this->pages)));
         $smarty->assign('wiz_page', $page->template());
-        $page->prepare($smarty);
+        $smarty->assign('xorg_no_errors', true);
+        $page->prepare($smarty, isset($this->inv_lookup[$curpage]) ? $this->inv_lookup[$curpage] : $curpage);
     }
 }