tutos-commits Mailing List for TUTOS

Update of /cvsroot/tutos/tutos/templates/classic
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28382/templates/classic

Modified Files:
      Tag: BRANCH-2-0
	mytutos.tpl 
Log Message:
* Add bugs user role informations in mytutos page

Index: mytutos.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/mytutos.tpl,v
retrieving revision 1.1.2.20
retrieving revision 1.1.2.21
diff -u -r1.1.2.20 -r1.1.2.21
--- mytutos.tpl	8 Jul 2005 16:10:46 -0000	1.1.2.20
+++ mytutos.tpl	29 Nov 2005 17:04:22 -0000	1.1.2.21
@@ -67,7 +67,7 @@
    <table class="overview" style="width: 100%; margin-left: 0px;">
    <thead>
      <tr>
-       <th colspan="4">
+       <th colspan="5">
          <img src="{$base}/html/classic/bugs.png"><b>{$Bugs}</b>
        </th>
      </tr>
@@ -76,6 +76,7 @@
        <th>{$BugReference}</th>
        <th>{$BugState}</th>
        <th>{$BugClass}</th>
+       <th>{$BugRole}</th>
      </tr>
    </thead>
    <tbody>
@@ -85,12 +86,17 @@
         <a href="{$bugs[b].link}" title="{$bugs[b].title}">{$bugs[b].label}</a>
        </td>
        <td style="white-space: nowrap;">{$bugs[b].plink}</td>
-       <td>
+       <td style="white-space: nowrap;">
  <span class="bugstate{$bugs[b].state.value}">{$bugs[b].state.label}</span>
        </td>
        <td>
  <span class="bugclass{$bugs[b].class.value}">{$bugs[b].class.label}</span>
        </td>
+       <td>{strip}
+       {if $bugs[b].is_solver}<img src="{$base}/html/classic/solver.png" alt="{$BugIsSolver}" title="{$BugIsSolver}" />{/if}
+       &nbsp;
+       {if $bugs[b].is_creator}<img src="{$base}/html/classic/creator.png" alt="{$BugIsCreator}" title="{$BugIsCreator}" />{/if}
+       {/strip}</td>
      </tr>
      {sectionelse}
      <tr> <td colspan="4">&nbsp;</td> </tr>

Update of /cvsroot/tutos/tutos/php/bugtracking
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28382/php/bugtracking

Modified Files:
      Tag: BRANCH-2-0
	bug.pinc en.p3 fr.p3 
Log Message:
* Add bugs user role informations in mytutos page

Index: bug.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug.pinc,v
retrieving revision 1.13.2.30
retrieving revision 1.13.2.31
diff -u -r1.13.2.30 -r1.13.2.31
--- bug.pinc	19 Sep 2005 16:15:38 -0000	1.13.2.30
+++ bug.pinc	29 Nov 2005 17:04:22 -0000	1.13.2.31
@@ -1192,7 +1192,9 @@
       return;
     }
 
-    $result = array();
+    $res_solver  = array();
+    $res_creator = array();
+    $res_other   = array();
 
     // while ( ($a < $n) and ($a < 2* $tutos[maxshort]) ) {
     while( ($a < $n) ) {
@@ -1201,9 +1203,13 @@
 
       $state = $res->get($a, "state");
       $class = $res->get($a, "class");
+      $solver     = $res->get($a, "solver");
+      $is_solver  = ($user->id == $solver) ? 1 : 0;
+      $creator    = $res->get($a, "creator");
+      $is_creator = ($user->id == $creator) ? 1 : 0;
 
       if ( $f->see_ok() ) {
-	$result[] = array('label' => $f->short,
+        $tmp      = array('label' => $f->short,
 			  'link'  => $f->getUrl(),
 			  'title' => sprintf($lang['BugShow'],
 					     $f->getFullName()),
@@ -1213,13 +1219,26 @@
 				'label' => $lang['BugStates'][$state]),
 			  'class' =>
 			  array('value' => $class,
-				'label' => $lang['BugClasses'][$class]));
+				'label' => $lang['BugClasses'][$class]),
+                          'solver'     => $solver,
+                          'creator'    => $creator,
+                          'is_solver'  => $is_solver,
+                          'is_creator' => $is_creator
+                         );
+        if ($is_solver) {
+          $res_solver[] = $tmp;
+        } else if ($is_creator) {
+          $res_creator[] = $tmp;
+        } else {
+          $res_other[] = $tmp;
+        }
       }
       $a++;
       unset($f);
     }
     $res->free();
 
+    $result = array_merge($res_solver, $res_creator, $res_other);
     return $result;
   }
 

Index: en.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/en.p3,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- en.p3	20 May 2005 15:17:45 -0000	1.2.2.1
+++ en.p3	29 Nov 2005 17:04:22 -0000	1.2.2.2
@@ -19,6 +19,9 @@
 $lang['BugsDetail']      = "Bugtracking Detail";
 $lang['BugState']        = "State";
 $lang['BugClass']        = "Class";
+$lang['BugRole']         = "Role";
+$lang['BugIsCreator']    = "Creator";
+$lang['BugIsSolver']     = "Solver";
 $lang['BugShort']        = "Short Description";
 $lang['BugLong']         = "long Bug Description";
 $lang['BugCreator']      = "created by";

Index: fr.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/fr.p3,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- fr.p3	20 May 2005 15:17:45 -0000	1.1.2.2
+++ fr.p3	29 Nov 2005 17:04:22 -0000	1.1.2.3
@@ -20,6 +20,9 @@
 $lang['BugsDetail']      = "Détail d'un incident";
 $lang['BugState']        = "État";
 $lang['BugClass']        = "Type";
+$lang['BugRole']         = "Rôle";
+$lang['BugIsCreator']    = "Créateur";
+$lang['BugIsSolver']     = "Résolveur";
 $lang['BugShort']        = "Description";
 $lang['BugLong']         = "Détail";
 $lang['BugCreator']      = "Créé par";

Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28382/php

Modified Files:
      Tag: BRANCH-2-0
	mytutos.php 
Log Message:
* Add bugs user role informations in mytutos page

Index: mytutos.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mytutos.php,v
retrieving revision 1.84.2.25
retrieving revision 1.84.2.26
diff -u -r1.84.2.25 -r1.84.2.26
--- mytutos.php	6 Jul 2005 16:09:00 -0000	1.84.2.25
+++ mytutos.php	29 Nov 2005 17:04:22 -0000	1.84.2.26
@@ -78,9 +78,12 @@
      $this->assign('BugReference', $lang['BugReference']);
      $this->assign('BugClass',     $lang['BugClass']);
      $this->assign('BugState',     $lang['BugState']);
+     $this->assign('BugRole',      $lang['BugRole']);
+     $this->assign('BugIsSolver',  $lang['BugIsSolver']);
+     $this->assign('BugIsCreator', $lang['BugIsCreator']);
 
      $blist = bug::mytutos($this->adr);
-     $this->assign('bugs', bug::mytutos($this->adr));
+     $this->assign('bugs', $blist);
 
      /*
      foreach($tutos[activemodules] as $i => $f) {

Update of /cvsroot/tutos/tutos/html/classic
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28382/html/classic

Added Files:
      Tag: BRANCH-2-0
	creator.png solver.png 
Log Message:
* Add bugs user role informations in mytutos page

--- NEW FILE: creator.png ---
‰PNG


ºÈTW
:˜Ð!°[A/"‚(„:„a—Ê!JB#43³¥­iKÝÛt¯òÝÞ_WÏíçóåË÷ûèØbZ=ÛSYu)Ùj¯^^^–ÇG;»úµäsõˆ¥ý}×
ò90*ä©Obz´GÜo­œödàÚ|Ÿ°~i*Å[SW{Å`ÞF`´
WNCŠ-Kr8äe#
h
 *ô€.®ƒ»¯åëškêö5œ¬guyÝ­
¨­¾h4J¨*Ä4ðMþä»o†˜ª
YÙ6éhÓٖ-3HI)±•¸r«ÌF€ò\S’
³	4
ôzp–æÖ¯qÑ
ùùe宒íF±ÖœZDQVXYQIÔ¯b4Ð
e¥9œ
ŠCŠ²4¿kGžÇY”›™nÒe،Øíª<y¸]阍0œŽ=èxô|`àÙC@eóW
‰v»»Òëm¬-..,±¦&[´˜Æì¬<?2òùK_ߋ7‘ȏÁ¿0À§ãû¦œ¨s.
--- NEW FILE: solver.png ---
‰PNG


‹~Ñ_ ½ÙCP!…„EôR`¨¤fþˆjÑ/Ë6SÇæ6WºíÞ»¹ëݽ=˜²:p^ßóá¾çˆðŸh3A–iD½\‘в—OãóF$^ãÕ$§iō†â-gÍ
‡wyl…±û‘xZbc¡³uE•ÚnKsIËkV†R­„˜È

Update of /cvsroot/tutos/tutos/php/localization
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8750/php/localization

Modified Files:
      Tag: BRANCH-2-0
	fr.p3 
Log Message:
* correction orthographique

Index: fr.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/fr.p3,v
retrieving revision 1.40.2.30
retrieving revision 1.40.2.31
diff -u -r1.40.2.30 -r1.40.2.31
--- fr.p3	4 Nov 2005 13:39:09 -0000	1.40.2.30
+++ fr.p3	24 Nov 2005 15:01:41 -0000	1.40.2.31
@@ -409,7 +409,7 @@
 $lang['TaskState']       = "État";
 $lang['TaskDesc']        = "À faire";
 $lang['TaskWorker']      = "À faire par";
-$lang['TaskVolumeFull']  = "Travail prévue";
+$lang['TaskVolumeFull']  = "Travail prévu";
 $lang['TaskVolumeDone']  = "Travail effectué";
 $lang['TaskVolumeTodo']  = "Travail restant";
 $lang['TaskVolumeTodoC'] = "Calculer automatiquement la charge de travail restant";

Update of /cvsroot/tutos/tutos/php/layout
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1995

Modified Files:
	new_layout.pinc 
Log Message:
fix


Index: new_layout.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/layout/new_layout.pinc,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- new_layout.pinc	28 Jun 2005 06:55:32 -0000	1.59
+++ new_layout.pinc	15 Nov 2005 18:45:35 -0000	1.60
@@ -592,16 +592,16 @@
           if ( isset($m[confirm]) && ($m[confirm] == true) ) {
             $b = ereg_replace('%X%','if (! confirm(\''. $m[info].' ?\')) { return false };',$b);
           } else {
-            $b = ereg_replace('%X%','',$before);
-	  }
+            $b = ereg_replace('%X%','',$b);
+	      }
         } else {
           #$b = ereg_replace('%ONCLICK%','%X%',$before);
           $b = ereg_replace('%ONCLICK%','',$before);
           if ( isset($m[confirm]) && ($m[confirm] == true) ) {
             $b = ereg_replace('%X%','if (! confirm(\' ?\')) { return false };"',$b);
           } else {
-            $b = ereg_replace('%X%','',$before);
-	  }
+            $b = ereg_replace('%X%','',$b);
+	      }
         }
         if ( isset($m[confirm]) && ($m[confirm] == true) ) {
           $r .= $b. confirmlink($m[url],$t,$m[info],'',$attr) .$after .$sep;

Update of /cvsroot/tutos/tutos/php/localization
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27204/php/localization

Modified Files:
      Tag: BRANCH-2-0
	ca.p3 cs.p3 de.p3 el.p3 en.p3 es-mx.p3 es-ni.p3 es-ve.p3 es.p3 
	fr.p3 hu.p3 it.p3 ja.p3 ko.p3 nl.p3 pl.p3 pt.p3 ru.p3 sv.p3 
	tw.p3 zh.p3 
Log Message:
* adding a test on parent project in order to prevent that a project reference himself

Index: ca.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/ca.p3,v
retrieving revision 1.39.2.1
retrieving revision 1.39.2.2
diff -u -r1.39.2.1 -r1.39.2.2
--- ca.p3	14 Apr 2004 17:39:20 -0000	1.39.2.1
+++ ca.p3	4 Nov 2005 13:39:09 -0000	1.39.2.2
@@ -761,6 +761,8 @@
 $lang['Err0052']         = "You must provide a classification";
 $lang['Err0053']         = "You cannot delete your own user entry";
 $lang['Err0054']         = "Sorry, due to permissions, you are not allowed to create a %s";
+$lang['Err0055']         = "Passwords will not be encrypted in the Database. Do not use your standard password !";
+$lang['Err0056']         = "An object cannot even refer him";
 
 ### Local Variables: ***
 ### End: ***

Index: cs.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/cs.p3,v
retrieving revision 1.39.2.1
retrieving revision 1.39.2.2
diff -u -r1.39.2.1 -r1.39.2.2
--- cs.p3	14 Apr 2004 17:39:20 -0000	1.39.2.1
+++ cs.p3	4 Nov 2005 13:39:09 -0000	1.39.2.2
@@ -764,6 +764,8 @@
 $lang['Err0052']         = "Musí¹ dodat klasifikaci";
 $lang['Err0053']         = "You cannot delete your own user entry";
 $lang['Err0054']         = "Sorry, due to permissions, you are not allowed to create a %s";
+$lang['Err0055']         = "Passwords will not be encrypted in the Database. Do not use your standard password !";
+$lang['Err0056']         = "An object cannot even refer him";
 
 ### Local Variables: ***
 #

Index: de.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/de.p3,v
retrieving revision 1.44.2.1
retrieving revision 1.44.2.2
diff -u -r1.44.2.1 -r1.44.2.2
--- de.p3	14 Apr 2004 17:39:20 -0000	1.44.2.1
+++ de.p3	4 Nov 2005 13:39:09 -0000	1.44.2.2
@@ -763,6 +763,8 @@
 $lang['Err0052']         = "Eine Klassifikation muss angegeben werden !";
 $lang['Err0053']         = "Der eigene Benutzereintrag kann nicht geloescht werden";
 $lang['Err0054']         = "Sie dürfen aufgrund der gesetzten Berechtigungen leider keine/n %s erzeugen";
+$lang['Err0055']         = "Passwords will not be encrypted in the Database. Do not use your standard password !";
+$lang['Err0056']         = "An object cannot even refer him";
 
 ### Local Variables: ***
 ### mode:iso-accents ***

Index: el.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/el.p3,v
retrieving revision 1.40.2.1
retrieving revision 1.40.2.2
diff -u -r1.40.2.1 -r1.40.2.2
--- el.p3	14 Apr 2004 17:39:20 -0000	1.40.2.1
+++ el.p3	4 Nov 2005 13:39:09 -0000	1.40.2.2
@@ -762,6 +762,8 @@
 $lang['Err0052']         = "You must provide a classification";
 $lang['Err0053']         = "You cannot delete your own user entry";
 $lang['Err0054']         = "Sorry, due to permissions, you are not allowed to create a %s";
+$lang['Err0055']         = "Passwords will not be encrypted in the Database. Do not use your standard password !";
+$lang['Err0056']         = "An object cannot even refer him";
 
 ### Local Variables: ***
 ### End: ***

Index: en.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/en.p3,v
retrieving revision 1.47.2.14
retrieving revision 1.47.2.15
diff -u -r1.47.2.14 -r1.47.2.15
--- en.p3	6 Jul 2005 16:09:00 -0000	1.47.2.14
+++ en.p3	4 Nov 2005 13:39:09 -0000	1.47.2.15
@@ -797,6 +797,7 @@
 $lang['Err0053']         = "You cannot delete your own user entry";
 $lang['Err0054']         = "Sorry, due to permissions, you are not allowed to create a %s";
 $lang['Err0055']         = "Passwords will not be encrypted in the Database. Do not use your standard password !";
+$lang['Err0056']         = "An object cannot even refer him";
 
 ### Local Variables: ***
 #

Index: es-mx.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/es-mx.p3,v
retrieving revision 1.38.2.1
retrieving revision 1.38.2.2
diff -u -r1.38.2.1 -r1.38.2.2
--- es-mx.p3	14 Apr 2004 17:39:21 -0000	1.38.2.1
+++ es-mx.p3	4 Nov 2005 13:39:09 -0000	1.38.2.2
@@ -760,6 +760,8 @@
 $lang['Err0052']         = "You must provide a classification";
 $lang['Err0053']         = "You cannot delete your own user entry";
 $lang['Err0054']         = "Sorry, due to permissions, you are not allowed to create a %s";
+$lang['Err0055']         = "Passwords will not be encrypted in the Database. Do not use your standard password !";
+$lang['Err0056']         = "An object cannot even refer him";
 
 ### Local Variables: ***
 ### End: ***

Index: es-ni.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/es-ni.p3,v
retrieving revision 1.38.2.1
retrieving revision 1.38.2.2
diff -u -r1.38.2.1 -r1.38.2.2
--- es-ni.p3	14 Apr 2004 17:39:21 -0000	1.38.2.1
+++ es-ni.p3	4 Nov 2005 13:39:09 -0000	1.38.2.2
@@ -761,6 +761,8 @@
 $lang['Err0052']         = "You must provide a classification";
 $lang['Err0053']         = "You cannot delete your own user entry";
 $lang['Err0054']         = "Sorry, due to permissions, you are not allowed to create a %s";
+$lang['Err0055']         = "Passwords will not be encrypted in the Database. Do not use your standard password !";
+$lang['Err0056']         = "An object cannot even refer him";
 
 ### Local Variables: ***
 ### End: ***

Index: es-ve.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/es-ve.p3,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -u -r1.13.2.1 -r1.13.2.2
--- es-ve.p3	14 Apr 2004 17:39:21 -0000	1.13.2.1
+++ es-ve.p3	4 Nov 2005 13:39:09 -0000	1.13.2.2
@@ -761,6 +761,8 @@
 $lang['Err0052']         = "Debe proveer una clasificación";
 $lang['Err0053']         = "You cannot delete your own user entry";
 $lang['Err0054']         = "Discupe, la permisología no le permite crear un(a) %s";
+$lang['Err0055']         = "Passwords will not be encrypted in the Database. Do not use your standard password !";
+$lang['Err0056']         = "An object cannot even refer him";
 
 ### Local Variables: ***
 ### End: ***

Index: es.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/es.p3,v
retrieving revision 1.39.2.1
retrieving revision 1.39.2.2
diff -u -r1.39.2.1 -r1.39.2.2
--- es.p3	14 Apr 2004 17:39:21 -0000	1.39.2.1
+++ es.p3	4 Nov 2005 13:39:09 -0000	1.39.2.2
@@ -760,6 +760,8 @@
 $lang['Err0052']         = "You must provide a classification";
 $lang['Err0053']         = "You cannot delete your own user entry";
 $lang['Err0054']         = "Sorry, due to permissions, you are not allowed to create a %s";
+$lang['Err0055']         = "Passwords will not be encrypted in the Database. Do not use your standard password !";
+$lang['Err0056']         = "An object cannot even refer him";
 
 ### Local Variables: ***
 ### End: ***

Index: fr.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/fr.p3,v
retrieving revision 1.40.2.29
retrieving revision 1.40.2.30
diff -u -r1.40.2.29 -r1.40.2.30
--- fr.p3	8 Sep 2005 12:12:09 -0000	1.40.2.29
+++ fr.p3	4 Nov 2005 13:39:09 -0000	1.40.2.30
@@ -744,7 +744,7 @@
 $lang['Err0012']         = "Societe <I>%s</I> inconnue !";
 $lang['Err0014']         = "Choisissez dans le champs <I>%s</I> SVP";
 $lang['Err0017']         = "Entrez un nombre dans le champs <I>%s</I> SVP !";
-$lang['Err0018']         = "Nom <I>%s</I> valide  pour %d ce type d'entrée";
+$lang['Err0018']         = "La données \"<I>%s</I>\" correspond à %d possibilitées";
 $lang['Err0020']         = "Vous n'êtes pas autorisés a détruire ce fichier !";
 $lang['Err0021']         = "Vous ne pouvez pas détruire l'équipe 0";
 $lang['Err0022']         = "Vous n'êtes pas autorisé a voir ceci %s";
@@ -781,6 +781,7 @@
 $lang['Err0053']         = "You cannot delete your own user entry";
 $lang['Err0054']         = "Désolé,mais vous n'avez pas la permission de créer cet élément : %s";
 $lang['Err0055']         = "Les mots de passe ne seront pas cryptés dans la basse de données, merci de ne pas utiliser l'un de vos mots de passes habituels&nbsp;!";
+$lang['Err0056']         = "Un objet ne peut se référencer lui même";
 
 ### Local Variables: ***
 ### End: ***

Index: hu.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/hu.p3,v
retrieving revision 1.36.2.4
retrieving revision 1.36.2.5
diff -u -r1.36.2.4 -r1.36.2.5
--- hu.p3	18 Jun 2005 09:45:11 -0000	1.36.2.4
+++ hu.p3	4 Nov 2005 13:39:09 -0000	1.36.2.5
@@ -787,6 +787,7 @@
 $lang['Err0053']         = "Nem törölheti a saját felhasználó-bejegyzését";
 $lang['Err0054']         = "Nem hozhat létre a megállapított jogosultságok miatt egy %s-t!";
 $lang['Err0055']         = "Az adatbázisban a jelszavak kódolatlanok. Ne használja a megszokott jelszavát!";
+$lang['Err0056']         = "An object cannot even refer him";
 
 ### Local Variables: ***
 ### mode:iso-accents ***

Index: it.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/it.p3,v
retrieving revision 1.39.2.2
retrieving revision 1.39.2.3
diff -u -r1.39.2.2 -r1.39.2.3
--- it.p3	9 Jun 2005 12:58:49 -0000	1.39.2.2
+++ it.p3	4 Nov 2005 13:39:09 -0000	1.39.2.3
@@ -772,6 +772,7 @@
 $lang['Err0053']         = "Non puoi cancellare il tuo stesso utente";
 $lang['Err0054']         = "Spiacente, a causa dei permessi, non puoi creare un %s";
 $lang['Err0055']         = "Le password non saranno crittate nel database. Non usare le tue password standard!";
+$lang['Err0056']         = "An object cannot even refer him";
 
 ### Local Variables: ***
 ### End: ***

Index: ja.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/ja.p3,v
retrieving revision 1.39.2.1
retrieving revision 1.39.2.2
diff -u -r1.39.2.1 -r1.39.2.2
--- ja.p3	14 Apr 2004 17:39:21 -0000	1.39.2.1
+++ ja.p3	4 Nov 2005 13:39:09 -0000	1.39.2.2
@@ -757,6 +757,8 @@
 $lang['Err0052']         = "ʬÎà¤ò»ØÄꤷ¤Ê¤±¤ì¤Ð¤¤¤±¤Ê¤¤";
 $lang['Err0053']         = "¼«Ê¬¤Î¥æ¡¼¥¶¥¨¥ó¥È¥ê¤Ï¾Ã¤»¤Þ¤»¤ó";
 $lang['Err0054']         = "¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó¤Ë¤è¤ê¡¢%s ¤òºî¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó";
+$lang['Err0055']         = "Passwords will not be encrypted in the Database. Do not use your standard password !";
+$lang['Err0056']         = "An object cannot even refer him";
 
 ### Local Variables: ***
 #

Index: ko.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/ko.p3,v
retrieving revision 1.38.2.1
retrieving revision 1.38.2.2
diff -u -r1.38.2.1 -r1.38.2.2
--- ko.p3	14 Apr 2004 17:39:21 -0000	1.38.2.1
+++ ko.p3	4 Nov 2005 13:39:09 -0000	1.38.2.2
@@ -760,6 +760,8 @@
 $lang['Err0052']         = "You must provide a classification";
 $lang['Err0053']         = "You cannot delete your own user entry";
 $lang['Err0054']         = "Sorry, due to permissions, you are not allowed to create a %s";
+$lang['Err0055']         = "Passwords will not be encrypted in the Database. Do not use your standard password !";
+$lang['Err0056']         = "An object cannot even refer him";
 
 ### Local Variables: ***
 #

Index: nl.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/nl.p3,v
retrieving revision 1.44.2.1
retrieving revision 1.44.2.2
diff -u -r1.44.2.1 -r1.44.2.2
--- nl.p3	14 Apr 2004 17:39:21 -0000	1.44.2.1
+++ nl.p3	4 Nov 2005 13:39:09 -0000	1.44.2.2
@@ -767,6 +767,8 @@
 $lang['Err0052']         = "U moet een classificatie selecteren!";
 $lang['Err0053']         = "U kunt niet uw eigen gebruikersaccount verwijderen";
 $lang['Err0054']         = "Sorry, u heeft niet de toegangsrechten voor het aanmaken van een %s";
+$lang['Err0055']         = "Passwords will not be encrypted in the Database. Do not use your standard password !";
+$lang['Err0056']         = "An object cannot even refer him";
 
 ### Local Variables: ***
 ### End: ***

Index: pl.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/pl.p3,v
retrieving revision 1.49.2.1
retrieving revision 1.49.2.2
diff -u -r1.49.2.1 -r1.49.2.2
--- pl.p3	14 Apr 2004 17:39:21 -0000	1.49.2.1
+++ pl.p3	4 Nov 2005 13:39:09 -0000	1.49.2.2
@@ -765,6 +765,8 @@
 $lang['Err0052']         = "Musisz podaæ klasyfikacjê";
 $lang['Err0053']         = "You cannot delete your own user entry";
 $lang['Err0054']         = "Oops, wed³ug serwera nie masz prawa do utworzenia %s";
+$lang['Err0055']         = "Passwords will not be encrypted in the Database. Do not use your standard password !";
+$lang['Err0056']         = "An object cannot even refer him";
 
 ### Local Variables: ***
 ### End: ***

Index: pt.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/pt.p3,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -u -r1.13.2.1 -r1.13.2.2
--- pt.p3	14 Apr 2004 17:39:21 -0000	1.13.2.1
+++ pt.p3	4 Nov 2005 13:39:09 -0000	1.13.2.2
@@ -766,6 +766,8 @@
 $lang['Err0052']         = "Deve fornecer uma Classificação";
 $lang['Err0053']         = "You cannot delete your own user entry";
 $lang['Err0054']         = "Desculpe, com o seu nível de permissões, não lhe é permitido criar %s";
+$lang['Err0055']         = "Passwords will not be encrypted in the Database. Do not use your standard password !";
+$lang['Err0056']         = "An object cannot even refer him";
 
 ### Local Variables: ***
 ### mode:iso-accents ***

Index: ru.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/ru.p3,v
retrieving revision 1.43.2.1
retrieving revision 1.43.2.2
diff -u -r1.43.2.1 -r1.43.2.2
--- ru.p3	14 Apr 2004 17:39:21 -0000	1.43.2.1
+++ ru.p3	4 Nov 2005 13:39:09 -0000	1.43.2.2
@@ -760,6 +760,8 @@
 $lang['Err0052']         = "÷Ù ÄÏÌÖÎÙ ÐÒÅÄÏÓÔÁ×ÉÔØ ËÌÁÓÓÉÆÉËÁÃÉÀ";
 $lang['Err0053']         = "You cannot delete your own user entry";
 $lang['Err0054']         = "Sorry, due to permissions, you are not allowed to create a %s";
+$lang['Err0055']         = "Passwords will not be encrypted in the Database. Do not use your standard password !";
+$lang['Err0056']         = "An object cannot even refer him";
 
 ### Local Variables: ***
 ### End: ***

Index: sv.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/sv.p3,v
retrieving revision 1.43.2.1
retrieving revision 1.43.2.2
diff -u -r1.43.2.1 -r1.43.2.2
--- sv.p3	14 Apr 2004 17:39:21 -0000	1.43.2.1
+++ sv.p3	4 Nov 2005 13:39:09 -0000	1.43.2.2
@@ -756,5 +756,7 @@
 $lang['Err0052']         = "Du måste ange en klassifiering!";
 $lang['Err0053']         = "Du kan inte radera ditt eget konto";
 $lang['Err0054']         = "Ledsen, på grund av rättigheter kan du inte skapa en/ett %s";
+$lang['Err0055']         = "Passwords will not be encrypted in the Database. Do not use your standard password !";
+$lang['Err0056']         = "An object cannot even refer him";
 
 ?>

Index: tw.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/tw.p3,v
retrieving revision 1.40.2.1
retrieving revision 1.40.2.2
diff -u -r1.40.2.1 -r1.40.2.2
--- tw.p3	14 Apr 2004 17:39:21 -0000	1.40.2.1
+++ tw.p3	4 Nov 2005 13:39:09 -0000	1.40.2.2
@@ -761,6 +761,8 @@
 $lang['Err0052']         = "¥²¶·­n¿é¤J¤ÀÃþ";
 $lang['Err0053']         = "You cannot delete your own user entry";
 $lang['Err0054']         = "Sorry, due to permissions, you are not allowed to create a %s";
+$lang['Err0055']         = "Passwords will not be encrypted in the Database. Do not use your standard password !";
+$lang['Err0056']         = "An object cannot even refer him";
 
 ### Local Variables: ***
 ### End: ***

Index: zh.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/zh.p3,v
retrieving revision 1.40.2.1
retrieving revision 1.40.2.2
diff -u -r1.40.2.1 -r1.40.2.2
--- zh.p3	14 Apr 2004 17:39:21 -0000	1.40.2.1
+++ zh.p3	4 Nov 2005 13:39:09 -0000	1.40.2.2
@@ -763,6 +763,8 @@
 $lang['Err0052']         = "You must provide a classification";
 $lang['Err0053']         = "You cannot delete your own user entry";
 $lang['Err0054']         = "Sorry, due to permissions, you are not allowed to create a %s";
+$lang['Err0055']         = "Passwords will not be encrypted in the Database. Do not use your standard password !";
+$lang['Err0056']         = "An object cannot even refer him";
 
 ### Local Variables: ***
 ### End: ***

Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27204/php

Modified Files:
      Tag: BRANCH-2-0
	product.pinc product_ins.php 
Log Message:
* adding a test on parent project in order to prevent that a project reference himself

Index: product.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product.pinc,v
retrieving revision 1.133.2.14
retrieving revision 1.133.2.15
diff -u -r1.133.2.14 -r1.133.2.15
--- product.pinc	8 Sep 2005 12:12:08 -0000	1.133.2.14
+++ product.pinc	4 Nov 2005 13:39:07 -0000	1.133.2.15
@@ -690,7 +690,11 @@
     error_log('product.pinc: parent id '.$this->parent->id);
 
     if( $this->parent != -1 && is_object($this->parent) ) {
-      $q->addFV("p_id",$this->parent->id,"INT");
+      if ($this->parent->id != $this->id) {
+        $q->addFV("p_id",$this->parent->id,"INT");
+      } else {
+        $msg .= $lang['Err0056']."<br />";
+      }
     }
 
     if ( $this->id < 0 ) {

Index: product_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_ins.php,v
retrieving revision 1.53.2.3
retrieving revision 1.53.2.4
diff -u -r1.53.2.3 -r1.53.2.4
--- product_ins.php	18 Jul 2005 14:55:43 -0000	1.53.2.3
+++ product_ins.php	4 Nov 2005 13:39:09 -0000	1.53.2.4
@@ -88,13 +88,20 @@
  if ( isset($_POST['parent']) ) {
    $m = check_field(StripSlashes($_POST['parent']),
 		    "parents","parents",$tutos[rolecheck][$_POST['role2']]);
-
    if ( $m->id > 0 ) {
-     $p->parent = getObject($dbconn, $m->id);
+     if ( $m->id == $p->id ) {
+       $msg .= $lang['Err0056']."<br />";
+     } else {
+       $p->parent = getObject($dbconn, $m->id);
+     }
    }
  }
  if ( isset($_POST['parent_id']) ) {
-   $p->parent = getObject($dbconn,$_POST['parent_id']);
+   if ( $_POST['parent_id'] == $p->id ) {
+     $msg .= $lang['Err0056']."<br />";
+   } else {
+     $p->parent = getObject($dbconn,$_POST['parent_id']);
+   }
  }
 
  $gotourl= addUrlParameter($gotourl,"parent=". $_POST['parent'],true);