From 8b0fa81ef71d263c267321d9f5e2cc374b6ffd77 Mon Sep 17 00:00:00 2001
From: x2004laborde <x2004laborde@839d8a87-29fc-0310-9880-83ba4fa771e5>
Date: Fri, 16 Mar 2007 13:36:01 +0000
Subject: [PATCH] some corrections

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1579 839d8a87-29fc-0310-9880-83ba4fa771e5
---
 modules/survey/survey.inc.php      |  6 ++--
 templates/survey/admin.tpl         |  2 +-
 templates/survey/confirm.tpl       |  2 +-
 templates/survey/edit_checkbox.tpl |  3 +-
 templates/survey/edit_new.tpl      |  3 +-
 templates/survey/edit_num.tpl      |  3 +-
 templates/survey/edit_personal.tpl |  3 +-
 templates/survey/edit_question.tpl |  2 +-
 templates/survey/edit_radio.tpl    |  3 +-
 templates/survey/edit_root.tpl     |  2 +-
 templates/survey/edit_survey.tpl   |  2 +-
 templates/survey/edit_text.tpl     |  3 +-
 templates/survey/edit_textarea.tpl |  3 +-
 templates/survey/error.tpl         |  2 +-
 templates/survey/index.tpl         |  2 +-
 templates/survey/show_checkbox.tpl |  3 +-
 templates/survey/show_num.tpl      |  3 +-
 templates/survey/show_personal.tpl |  3 +-
 templates/survey/show_radio.tpl    |  3 +-
 templates/survey/show_survey.tpl   |  2 +-
 templates/survey/show_text.tpl     |  3 +-
 templates/survey/show_textarea.tpl |  3 +-
 templates/survey/success.tpl       |  2 +-
 templates/survey/test.tpl          | 57 --------------------------------------
 24 files changed, 25 insertions(+), 95 deletions(-)
 delete mode 100644 templates/survey/test.tpl

diff --git a/modules/survey/survey.inc.php b/modules/survey/survey.inc.php
index 5386efd..142d134 100644
--- a/modules/survey/survey.inc.php
+++ b/modules/survey/survey.inc.php
@@ -165,7 +165,7 @@ abstract class SurveyQuestion
     private $question;
     private $comment;
 
-    protected function SurveyQuestion($i, $args)
+    protected function __construct($i, $args)
     {
         $this->id = $i;
         $this->update($args);
@@ -270,7 +270,7 @@ abstract class SurveyTreeable extends SurveyQuestion
     // {{{ common properties, constructor
     private $children;
 
-    protected function SurveyTreeable($i, $args)
+    protected function __construct($i, $args)
     {
         parent::__construct($i, $args);
         $this->children = array();
@@ -430,7 +430,7 @@ class SurveyRoot extends SurveyTreeable
     private $promos;
     private $valid;
 
-    public function SurveyRoot($args)
+    public function __construct($args)
     {
         parent::__construct(0, $args);
         $this->last_id   = 0;
diff --git a/templates/survey/admin.tpl b/templates/survey/admin.tpl
index 2d5cfbe..c0f19c5 100644
--- a/templates/survey/admin.tpl
+++ b/templates/survey/admin.tpl
@@ -98,4 +98,4 @@
   {/if}
 </table>
 
-{* vim:set et sw=2 sts=2 sws=2: *}
+{* vim:set et sw=2 sts=2 ts=8 enc=utf-8: *}
diff --git a/templates/survey/confirm.tpl b/templates/survey/confirm.tpl
index e90d8ec..d25fbd8 100644
--- a/templates/survey/confirm.tpl
+++ b/templates/survey/confirm.tpl
@@ -37,4 +37,4 @@
   <input type="submit" name="survey_cancel" value="Annuler"/>
 </form>
 
-{* vim:set et sw=2 sts=2 sws=2: *}
+{* vim:set et sw=2 sts=2 ts=8 enc=utf-8: *}
diff --git a/templates/survey/edit_checkbox.tpl b/templates/survey/edit_checkbox.tpl
index fc042ea..0aa1422 100644
--- a/templates/survey/edit_checkbox.tpl
+++ b/templates/survey/edit_checkbox.tpl
@@ -22,5 +22,4 @@
 
 {include file='survey/edit_radio.tpl'}
 
-{* vim:set et sw=2 sts=2 sws=2: *}
-
+{* vim:set et sw=2 sts=2 ts=8 enc=utf-8: *}
diff --git a/templates/survey/edit_new.tpl b/templates/survey/edit_new.tpl
index 887d8b0..f5bfece 100644
--- a/templates/survey/edit_new.tpl
+++ b/templates/survey/edit_new.tpl
@@ -35,5 +35,4 @@
       {include file="survey/edit_$survey_type.tpl"}
     {/if}
 
-{* vim:set et sw=2 sts=2 sws=2: *}
-
+{* vim:set et sw=2 sts=2 ts=8 enc=utf-8: *}
diff --git a/templates/survey/edit_num.tpl b/templates/survey/edit_num.tpl
index 7956f0f..a3fda5f 100644
--- a/templates/survey/edit_num.tpl
+++ b/templates/survey/edit_num.tpl
@@ -22,5 +22,4 @@
 
     {include file='survey/edit_question.tpl'}
 
-{* vim:set et sw=2 sts=2 sws=2: *}
-
+{* vim:set et sw=2 sts=2 ts=8 enc=utf-8: *}
diff --git a/templates/survey/edit_personal.tpl b/templates/survey/edit_personal.tpl
index ae8b869..1b84f38 100644
--- a/templates/survey/edit_personal.tpl
+++ b/templates/survey/edit_personal.tpl
@@ -33,5 +33,4 @@
       </td>
     </tr>
 
-{* vim:set et sw=2 sts=2 sws=2: *}
-
+{* vim:set et sw=2 sts=2 ts=8 enc=utf-8: *}
diff --git a/templates/survey/edit_question.tpl b/templates/survey/edit_question.tpl
index bff8c4f..4ff1aea 100644
--- a/templates/survey/edit_question.tpl
+++ b/templates/survey/edit_question.tpl
@@ -29,4 +29,4 @@
       <td><textarea name="survey_question[comment]" rows="5" cols="60">{$survey_current.comment}</textarea></td>
     </tr>
 
-{* vim:set et sw=2 sts=2 sws=2: *}
+{* vim:set et sw=2 sts=2 ts=8 enc=utf-8: *}
diff --git a/templates/survey/edit_radio.tpl b/templates/survey/edit_radio.tpl
index 4558c39..f2bf7f1 100644
--- a/templates/survey/edit_radio.tpl
+++ b/templates/survey/edit_radio.tpl
@@ -26,5 +26,4 @@
       <td><input type="text" name="survey_question[options]" size="50" maxlength="200" value="{$survey_current.options}"/></td>
     </tr>
 
-{* vim:set et sw=2 sts=2 sws=2: *}
-
+{* vim:set et sw=2 sts=2 ts=8 enc=utf-8: *}
diff --git a/templates/survey/edit_root.tpl b/templates/survey/edit_root.tpl
index daa524c..9c23d57 100644
--- a/templates/survey/edit_root.tpl
+++ b/templates/survey/edit_root.tpl
@@ -37,4 +37,4 @@
       <td><input type="text" name="survey_question[promos]" size="50" maxlength="200" value="{$survey_current.promos}"/></td>
     </tr>
 
-{* vim:set et sw=2 sts=2 sws=2: *}
+{* vim:set et sw=2 sts=2 ts=8 enc=utf-8: *}
diff --git a/templates/survey/edit_survey.tpl b/templates/survey/edit_survey.tpl
index b4dfb64..d22c1ef 100644
--- a/templates/survey/edit_survey.tpl
+++ b/templates/survey/edit_survey.tpl
@@ -32,4 +32,4 @@
   <input type="submit" name="survey_cancel" value="Annuler"/>
 </form>
 
-{* vim:set et sw=2 sts=2 sws=2: *}
+{* vim:set et sw=2 sts=2 ts=8 enc=utf-8: *}
diff --git a/templates/survey/edit_text.tpl b/templates/survey/edit_text.tpl
index 7956f0f..a3fda5f 100644
--- a/templates/survey/edit_text.tpl
+++ b/templates/survey/edit_text.tpl
@@ -22,5 +22,4 @@
 
     {include file='survey/edit_question.tpl'}
 
-{* vim:set et sw=2 sts=2 sws=2: *}
-
+{* vim:set et sw=2 sts=2 ts=8 enc=utf-8: *}
diff --git a/templates/survey/edit_textarea.tpl b/templates/survey/edit_textarea.tpl
index 7956f0f..a3fda5f 100644
--- a/templates/survey/edit_textarea.tpl
+++ b/templates/survey/edit_textarea.tpl
@@ -22,5 +22,4 @@
 
     {include file='survey/edit_question.tpl'}
 
-{* vim:set et sw=2 sts=2 sws=2: *}
-
+{* vim:set et sw=2 sts=2 ts=8 enc=utf-8: *}
diff --git a/templates/survey/error.tpl b/templates/survey/error.tpl
index 714e7ad..f37f89b 100644
--- a/templates/survey/error.tpl
+++ b/templates/survey/error.tpl
@@ -41,4 +41,4 @@ Une erreur inconnue est survenue dans l'&#233;dition de ce sondage. N'hésite pa
 <br/>
 <a href="{$survey_link}">Retour</a>
 
-{* vim:set et sw=2 sts=2 ts=8: *}
+{* vim:set et sw=2 sts=2 ts=8 enc=utf-8: *}
diff --git a/templates/survey/index.tpl b/templates/survey/index.tpl
index b838a67..2d4890f 100644
--- a/templates/survey/index.tpl
+++ b/templates/survey/index.tpl
@@ -74,4 +74,4 @@
 
 <a href="./survey/edit/new">Proposer un sondage</a>
 
-{* vim:set et sw=2 sts=2 sws=2: *}
+{* vim:set et sw=2 sts=2 ts=8 enc=utf-8: *}
diff --git a/templates/survey/show_checkbox.tpl b/templates/survey/show_checkbox.tpl
index 532787d..a92da7a 100644
--- a/templates/survey/show_checkbox.tpl
+++ b/templates/survey/show_checkbox.tpl
@@ -24,5 +24,4 @@
   <input type="checkbox" name="survey{$survey_id}_{$survey.id}_{$choices}" value="1" id="{$choice}" {if $survey_mode eq 'edit'}disabled="disabled"{/if}/><label for="{$choice}">{$choice}</label>
 {/foreach}
 
-{* vim:set et sw=2 sts=2 sws=2: *}
-
+{* vim:set et sw=2 sts=2 ts=8 enc=utf-8: *}
diff --git a/templates/survey/show_num.tpl b/templates/survey/show_num.tpl
index 755375d..ef77377 100644
--- a/templates/survey/show_num.tpl
+++ b/templates/survey/show_num.tpl
@@ -22,5 +22,4 @@
 
 {include file='survey/show_text.tpl'}
 
-{* vim:set et sw=2 sts=2 sws=2: *}
-
+{* vim:set et sw=2 sts=2 ts=8 enc=utf-8: *}
diff --git a/templates/survey/show_personal.tpl b/templates/survey/show_personal.tpl
index f298be9..fe7409f 100644
--- a/templates/survey/show_personal.tpl
+++ b/templates/survey/show_personal.tpl
@@ -29,5 +29,4 @@
 {/if}
   <strong>Attention, cocher cette(ces) case(s) d&#233;truit totalement ou en partie l'anonymat de ta r&#233;ponse.</strong>
 
-{* vim:set et sw=2 sts=2 sws=2: *}
-
+{* vim:set et sw=2 sts=2 ts=8 enc=utf-8: *}
diff --git a/templates/survey/show_radio.tpl b/templates/survey/show_radio.tpl
index f614f9a..178f5ae 100644
--- a/templates/survey/show_radio.tpl
+++ b/templates/survey/show_radio.tpl
@@ -24,5 +24,4 @@
   <input type="radio" name="survey{$survey_id}_{$survey.id}" value="{$choice}" id="{$choice}" {if $survey_mode eq 'edit'}disabled="disabled"{/if}/><label for="{$choice}">{$choice}</label>
 {/foreach}
 
-{* vim:set et sw=2 sts=2 sws=2: *}
-
+{* vim:set et sw=2 sts=2 ts=8 enc=utf-8: *}
diff --git a/templates/survey/show_survey.tpl b/templates/survey/show_survey.tpl
index e062a13..1e474af 100644
--- a/templates/survey/show_survey.tpl
+++ b/templates/survey/show_survey.tpl
@@ -73,4 +73,4 @@
 </div>
 {/if}
 
-{* vim:set et sw=2 sts=2 sws=2: *}
+{* vim:set et sw=2 sts=2 ts=8 enc=utf-8: *}
diff --git a/templates/survey/show_text.tpl b/templates/survey/show_text.tpl
index 5ef4ac9..de2b20b 100644
--- a/templates/survey/show_text.tpl
+++ b/templates/survey/show_text.tpl
@@ -22,5 +22,4 @@
 
   <input type="text" name="survey{$survey_id}_{$survey.id}" value="" size="50" maxlength="200" {if $survey_mode eq 'edit'}disabled="disabled"{/if}/>
 
-{* vim:set et sw=2 sts=2 sws=2: *}
-
+{* vim:set et sw=2 sts=2 ts=8 enc=utf-8: *}
diff --git a/templates/survey/show_textarea.tpl b/templates/survey/show_textarea.tpl
index 31a5225..ef924d3 100644
--- a/templates/survey/show_textarea.tpl
+++ b/templates/survey/show_textarea.tpl
@@ -22,5 +22,4 @@
 
   <textarea name="survey{$survey_id}_{$survey.id}" rows="5" cols="60" {if $survey_mode eq 'edit'}disabled="disabled"{/if}></textarea>
 
-{* vim:set et sw=2 sts=2 sws=2: *}
-
+{* vim:set et sw=2 sts=2 ts=8 enc=utf-8: *}
diff --git a/templates/survey/success.tpl b/templates/survey/success.tpl
index baede07..8f1fad4 100644
--- a/templates/survey/success.tpl
+++ b/templates/survey/success.tpl
@@ -29,4 +29,4 @@
 <br/>
 <a href="{$survey_link}">Retour</a>
 
-{* vim:set et sw=2 sts=2 ts=8: *}
+{* vim:set et sw=2 sts=2 ts=8 enc=utf-8: *}
diff --git a/templates/survey/test.tpl b/templates/survey/test.tpl
deleted file mode 100644
index 34d13f2..0000000
--- a/templates/survey/test.tpl
+++ /dev/null
@@ -1,57 +0,0 @@
-{**************************************************************************}
-{*                                                                        *}
-{*  Copyright (C) 2003-2007 Polytechnique.org                             *}
-{*  http://opensource.polytechnique.org/                                  *}
-{*                                                                        *}
-{*  This program is free software; you can redistribute it and/or modify  *}
-{*  it under the terms of the GNU General Public License as published by  *}
-{*  the Free Software Foundation; either version 2 of the License, or     *}
-{*  (at your option) any later version.                                   *}
-{*                                                                        *}
-{*  This program is distributed in the hope that it will be useful,       *}
-{*  but WITHOUT ANY WARRANTY; without even the implied warranty of        *}
-{*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *}
-{*  GNU General Public License for more details.                          *}
-{*                                                                        *}
-{*  You should have received a copy of the GNU General Public License     *}
-{*  along with this program; if not, write to the Free Software           *}
-{*  Foundation, Inc.,                                                     *}
-{*  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA               *}
-{*                                                                        *}
-{**************************************************************************}
-
-{if $survey.type == 'racine'}
-<h1>Sondage : {$survey.question}</h1>
-  {if $survey.comment != ''}
-    {$survey.comment}
-  {/if}
-  {if is_array($survey.children)}
-    {foreach from=$survey.children item=child}
-      {include file='survey/test.tpl' survey=$child recursive=true}
-    {/foreach}
-  {/if}
-
-{else}
-<div>
-  <h2>{$survey.question}</h2>
-  {if $survey.comment != ''}
-    {$survey.comment}<br/>
-  {/if}
-  {if $survey.type == 'text' || $survey.type == 'num' }
-  <input type="text" name="survey{$survey_id}_{$survey.id}" value="" {if $survey_mode eq 'edit'}disabled="disabled"{/if}/>
-  {elseif $survey.type == 'radio'}
-    {foreach from=$survey.choices item=choice}
-  <input type="radio" name="survey{$survey_id}_{$survey.id}" value="{$choice}" id="{$choice}" {if $survey_mode eq 'edit'}disabled="disabled"{/if}/><label for="{$choice}">{$choice}</label>
-    {/foreach}
-  {/if}
-  {if is_array($survey.children)}
-  <div style="padding-left:20px">
-    {foreach from=$survey.children item=child}
-      {include file='survey/test.tpl' survey=$child recursive=true}
-    {/foreach}
-  </div>
-  {/if}
-</div>
-{/if}
-
-{* vim:set et sw=2 sts=2 sws=2: *}
-- 
2.1.4