tutos-commits Mailing List for TUTOS

Projects / CRM / PLM / Calendar / Tasks / SCRUM / Test / Inventory

Brought to you by: gokohnert

tutos-commits — SVN commits

You can subscribe to this list here.

2001	Jan	Feb	Mar	Apr	May	Jun	Jul (13)	Aug (214)	Sep (144)	Oct (22)	Nov (22)	Dec (93)
2002	Jan (25)	Feb (31)	Mar (92)	Apr (70)	May (103)	Jun (130)	Jul (265)	Aug (325)	Sep (233)	Oct (244)	Nov (261)	Dec (157)
2003	Jan (101)	Feb (135)	Mar (148)	Apr (164)	May (53)	Jun (116)	Jul (149)	Aug (126)	Sep (45)	Oct (109)	Nov (36)	Dec (61)
2004	Jan (131)	Feb (236)	Mar (278)	Apr (259)	May (92)	Jun (110)	Jul (150)	Aug (64)	Sep (141)	Oct (141)	Nov (146)	Dec (65)
2005	Jan (70)	Feb (77)	Mar (129)	Apr (153)	May (161)	Jun (63)	Jul (42)	Aug (16)	Sep (30)	Oct (3)	Nov (8)	Dec (40)
2006	Jan (114)	Feb (16)	Mar (12)	Apr (15)	May (4)	Jun (9)	Jul (69)	Aug (27)	Sep (12)	Oct (80)	Nov (62)	Dec (41)
2007	Jan (34)	Feb (2)	Mar (38)	Apr (82)	May (61)	Jun (37)	Jul (16)	Aug (64)	Sep (7)	Oct (52)	Nov (18)	Dec (28)
2008	Jan (168)	Feb (26)	Mar (27)	Apr (19)	May (10)	Jun (58)	Jul (58)	Aug (91)	Sep (14)	Oct (23)	Nov (56)	Dec (38)
2009	Jan (58)	Feb (90)	Mar (204)	Apr (90)	May (27)	Jun (177)	Jul (116)	Aug (53)	Sep (42)	Oct (120)	Nov (51)	Dec (58)
2010	Jan (117)	Feb (231)	Mar (163)	Apr (90)	May (40)	Jun (139)	Jul (49)	Aug (118)	Sep (25)	Oct (80)	Nov (102)	Dec (99)
2011	Jan (176)	Feb (42)	Mar (60)	Apr (52)	May (30)	Jun (29)	Jul (27)	Aug (16)	Sep (51)	Oct (70)	Nov (63)	Dec (58)
2012	Jan (28)	Feb (26)	Mar (7)	Apr (12)	May (41)	Jun (61)	Jul (59)	Aug (38)	Sep (30)	Oct (28)	Nov (14)	Dec (31)
2013	Jan (24)	Feb (54)	Mar (45)	Apr (22)	May (35)	Jun (8)	Jul (18)	Aug (38)	Sep (11)	Oct (8)	Nov (19)	Dec (20)
2014	Jan (20)	Feb (22)	Mar (4)	Apr (6)	May (13)	Jun	Jul	Aug (1)	Sep	Oct	Nov	Dec (6)
2015	Jan	Feb (1)	Mar (4)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (1)	Dec (1)
2016	Jan (4)	Feb	Mar	Apr (1)	May	Jun	Jul (2)	Aug (4)	Sep (1)	Oct (1)	Nov (1)	Dec
2017	Jan	Feb	Mar	Apr	May	Jun (3)	Jul (8)	Aug (13)	Sep (12)	Oct	Nov	Dec
2018	Jan	Feb	Mar (1)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2019	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (1)	Dec
2020	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (2)
2021	Jan	Feb (1)	Mar (1)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

S	M	T	W	T	F	S
1 (4)	2	3 (1)	4 (2)	5 (2)	6 (1)	7
8	9 (1)	10 (8)	11	12 (20)	13 (1)	14
15	16	17 (5)	18 (23)	19 (7)	20 (3)	21 (1)
22	23	24 (1)	25	26	27	28
29	30	31

Flat | Threaded

1 2 3 4 > >> (Page 1 of 4)

[Tutos-commits] tutos/php/bugtracking bug_new.php,1.23,1.24

From: Gero K. <gok...@us...> - 2006-10-24 15:11:26

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

Modified Files:
	bug_new.php 
Log Message:
select initial bug responsible from list (when using bug on project)


Index: bug_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_new.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- bug_new.php	21 Oct 2006 18:15:13 -0000	1.23
+++ bug_new.php	24 Oct 2006 15:11:21 -0000	1.24
@@ -107,10 +107,9 @@
        # initial
        if ( $this->obj->parent->id > 0 ) {
          if ( $this->obj->parent->getType() == "product" ) {
-
+           $this->obj->parent->readroles();
 			 /****
            echo $lang['BugAutoSolver'] ."&nbsp;";
-           $this->obj->parent->readroles();
            reset($this->obj->parent->role[PROD_ROLE_MANAGER]);
            reset($this->obj->parent->role[PROD_ROLE_MANAGER2]);
            if ( count($this->obj->parent->role[PROD_ROLE_MANAGER]) > 0 ) {
@@ -126,7 +125,16 @@
            }
            $this->addHidden("sid",$sid);
 			 ****/
-       select_from_array_or_input($this->obj,"s",$this->obj->solver,1,'at');
+           echo  '<select id="s" name="sid">';
+           foreach ($this->obj->parent->role as $i => $f) {
+             foreach ($f as $i2 => $f2) {
+               if (($f2->getType() == 'address') || ($f2->getType() == 'team') ) {
+                 echo  '<option value="'.$i2.'">'.$f2->getFullName().' ('.$lang['ProdRole'][$i] .")</option>\n";
+               }
+			 }
+		   }
+           echo  "</select>";
+#       select_from_array_or_input($this->obj,"s",$this->obj->solver,1,'at');
 
          } else if ( $this->obj->parent->getType() == "installation" ) {
            echo $lang['BugAutoSolver'] ."&nbsp;";

[Tutos-commits] tutos/php/bugtracking bug.pinc, 1.39, 1.40 bug_ins.php, 1.18, 1.19 bug_new.php, 1.22, 1.23 bug_show.php, 1.20, 1.21 mtable.pinc, 1.5, 1.6

From: Gero K. <gok...@us...> - 2006-10-21 18:15:22

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

Modified Files:
	bug.pinc bug_ins.php bug_new.php bug_show.php mtable.pinc 
Log Message:
added plandate (update.php required)

Index: bug_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_show.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- bug_show.php	1 Dec 2005 22:26:17 -0000	1.20
+++ bug_show.php	21 Oct 2006 18:15:13 -0000	1.21
@@ -44,10 +44,29 @@
      echo $this->CreatorInfoLine($this->obj,4);
 
      echo "<tr>\n";
+
      echo $this->showfield($lang['BugID']);
      echo $this->showdata(myentities($this->obj->name),3);
 
      echo "</tr><tr>\n";
+
+     if ( $this->obj->parent->id > 0 ) {
+       echo $this->showfield($lang[$this->obj->parent->getType()]);
+       echo $this->showdata($this->obj->parent->getLink(),3);
+     } else {
+       echo $this->showfield($lang['ProductP']);
+       echo $this->showdata($lang['HistoryDeleted'],3);
+     }
+
+     echo "</tr><tr>\n";
+
+     echo $this->showfield($lang['BugState']);
+     echo $this->showdata($this->obj->getState(),1);
+     echo $this->showfield($lang['BugClass']);
+     echo $this->showdata($this->obj->getClass(),1);
+
+     echo "</tr><tr>\n";
+
      if ( $this->obj->state == BUG_STATE_SOLVED ) {
        echo $this->showfield($lang['BugSolvedBy']);
      } else if ( $this->obj->state == BUG_STATE_CLOSED )  {
@@ -60,28 +79,16 @@
      } else {
        echo $this->showdata("not solved",1);
      }
-     echo $this->showfield($lang['atDateTime']);
-     if ( isset($this->obj->solvedate) ) {
-       echo $this->showdata($this->obj->solvedate->getDateTime(),1);
+     if ( ($this->obj->state == BUG_STATE_SOLVED) || ($this->obj->state == BUG_STATE_CLOSED) ) {
+       echo $this->showfield($lang['atDateTime']);
+       echo $this->showdata( $this->obj->solvedate->getDateTime().'<br \>('.$this->obj->plandate->getDate().')',1);
      } else {
-       echo $this->showdata("&nbsp;",1);
+       echo $this->showfield($lang['DateTimeTill']);
+       echo $this->showdata($this->obj->plandate->getDate(),1);
      }
-     echo "</tr><tr>\n";
 
-     if ( $this->obj->parent->id > 0 ) {
-       echo $this->showfield($lang[$this->obj->parent->getType()]);
-       echo $this->showdata($this->obj->parent->getLink(),3);
-     } else {
-       echo $this->showfield($lang['ProductP']);
-       echo $this->showdata($lang['HistoryDeleted'],3);
-     }
      echo "</tr><tr>\n";
-     echo $this->showfield($lang['BugState']);
-     echo $this->showdata($this->obj->getState(),1);
-     echo $this->showfield($lang['BugClass']);
-     echo $this->showdata($this->obj->getClass(),1);
 
-     echo "</tr><tr>\n";
      if ($this->obj->reporter != -1) {
        echo $this->showfield($lang['BugReportedFrom']);
        echo $this->showdata($this->obj->reporter != -1 ? $this->obj->reporter->getLink():"",1);

Index: bug_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_new.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- bug_new.php	22 Aug 2006 10:00:01 -0000	1.22
+++ bug_new.php	21 Oct 2006 18:15:13 -0000	1.23
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2005 by Gero Kohnert
+ *  Copyright 1999 - 2006 by Gero Kohnert
  *
  *  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   
@@ -48,26 +48,26 @@
 
      echo $this->DataTableStart();
      echo "<tr>\n";
-     echo " <th colspan=\"4\">".  sprintf($lang['Showing'],$lang[$this->obj->getType()])."</th>\n";
+     echo ' <th colspan="4">'.  sprintf($lang['Showing'],$lang[$this->obj->getType()])."</th>\n";
      echo "</tr>\n";
 
      if ($this->obj->id > 0 ) {
        echo "<tr>\n";
        if ($this->obj->creator->id > 0) {
-         echo " <td colspan=\"3\">". sprintf ($lang['BugCreation'],$this->obj->creator->getLink(),$this->obj->creation->getDateTime()) ."</td>\n";
+         echo ' <td colspan="3">'. sprintf ($lang['BugCreation'],$this->obj->creator->getLink(),$this->obj->creation->getDateTime()) ."</td>\n";
        } else {
-         echo " <td colspan=\"3\">". sprintf ($lang['BugCreation'],$lang['HistoryDeleted'],$this->obj->creation->getDateTime()) ."</td>\n";
+         echo ' <td colspan="3">'. sprintf ($lang['BugCreation'],$lang['HistoryDeleted'],$this->obj->creation->getDateTime()) ."</td>\n";
        }
-       echo " <td align=\"right\">". acl_link($this->obj) ."</td>\n";
+       echo ' <td align="right">'. acl_link($this->obj) ."</td>\n";
        echo "</tr>\n";
      }
 
      echo "<tr>\n";
      echo $this->showfieldc($lang['BugID'],1,"name");
-     echo " <td colspan=\"3\">";
+     echo ' <td colspan="3">';
      if ( $tutos[bugautoname] == "" ) {
        # name if totally free
-       echo " <input id=\"name\" value=\"". $this->obj->name ."\" name=\"name\">\n";
+       echo ' <input id="name" name="name" value="'. $this->obj->name ."\">\n";
      } else {
        # Using the autoname system for bugs
        if ( $this->obj->id > 0 ) {
@@ -84,9 +84,9 @@
      echo "<tr>\n";
      echo $this->showfieldc($lang['BugState'],0,"state");
      if ( $this->obj->id > 0 ) {
-       echo " <td>". $this->obj->askState() ."</td>\n";
+       echo ' <td>'. $this->obj->askState() ."</td>\n";
      } else {
-       echo " <td>". $lang['BugAutoState'] ." ". $this->obj->getState() ."</td>\n";
+       echo ' <td>'. $lang['BugAutoState'] .' '. $this->obj->getState() ."</td>\n";
      }
      echo $this->showfieldc($lang['BugClass'],0,"class");
      echo " <td>". $this->obj->askClass() ."</td>\n";
@@ -94,20 +94,22 @@
 
      echo "<tr>\n";
      echo $this->showfieldc($lang['BugShort'],1,"short1");
-     echo " <td colspan=\"3\" valign=\"top\"><input id=\"short1\" size=\"". min(40,$table['bug']['short'][size]) ."\" maxlength=\"".$table['bug']['short'][size]."\" name=\"short1\" value=\"". myentities($this->obj->short) ."\" /></td>";
+     echo ' <td colspan="3" valign="top"><input id="short1" size="'. min(40,$table['bug']['short'][size]) .'" maxlength="'.$table['bug']['short'][size].'" name="short1" value="'. myentities($this->obj->short) ."\" /></td>";
      echo "</tr>\n";
 
      echo "<tr>\n";
      echo $this->showfieldc($lang['BugAssignedTo'],0,"sid");
-     echo " <td colspan=\"3\" valign=\"top\">";
+     echo ' <td colspan="1" valign="top">';
      if ( $this->obj->id > 0 ) {
        select_from_array_or_input($this->obj,"s",$this->obj->solver,1,'at');
      } else {
        $sid =  $this->user->id;
        # initial
-       echo $lang['BugAutoSolver'] ."&nbsp;";
        if ( $this->obj->parent->id > 0 ) {
          if ( $this->obj->parent->getType() == "product" ) {
+
+			 /****
+           echo $lang['BugAutoSolver'] ."&nbsp;";
            $this->obj->parent->readroles();
            reset($this->obj->parent->role[PROD_ROLE_MANAGER]);
            reset($this->obj->parent->role[PROD_ROLE_MANAGER2]);
@@ -122,7 +124,12 @@
            } else {
              echo  $this->user->getLink();
            }
+           $this->addHidden("sid",$sid);
+			 ****/
+       select_from_array_or_input($this->obj,"s",$this->obj->solver,1,'at');
+
          } else if ( $this->obj->parent->getType() == "installation" ) {
+           echo $lang['BugAutoSolver'] ."&nbsp;";
            $this->obj->parent->product->readroles();
            reset($this->obj->parent->product->role[PROD_ROLE_MANAGER]);
            reset($this->obj->parent->product->role[PROD_ROLE_MANAGER2]);
@@ -137,22 +144,36 @@
            } else {
              echo $this->user->getLink();
            }
+           $this->addHidden("sid",$sid);
          } else if ( $this->obj->parent->getType() == "task" ) {
+           echo $lang['BugAutoSolver'] ."&nbsp;";
            foreach ($this->obj->parent->worker as $i => $f) {
              echo $this->obj->parent->worker[$i]->getLink();
              $sid =  $this->obj->parent->worker[$i]->id;
              break;
            }
+           $this->addHidden("sid",$sid);
          } else {
+           echo $lang['BugAutoSolver'] ."&nbsp;";
            echo $this->user->getLink();
+           $this->addHidden("sid",$sid);
          }
-         $this->addHidden("sid",$sid);
        } else {
+         echo $lang['BugAutoSolver'] ."&nbsp;";
          echo $lang['Product'] ." ". $lang['ProdRole'][PROD_ROLE_MANAGER];
          $this->addHidden("sid","auto");
        }
      }
      echo " </td>\n";
+     if ( ($this->obj->state == BUG_STATE_SOLVED) || ( $this->obj->state == BUG_STATE_CLOSED) ) {
+       echo ' <td colspan="2" valign="top">&nbsp;'.$this->obj->state;
+       echo " </td>\n";
+	 } else {
+       echo $this->showfieldc($lang['DateTimeTill'],0,"pd");
+       echo " <td>\n";
+       echo $this->obj->plandate->EnterDate("pd",1);
+       echo " </td>\n";
+	 }
      echo "</tr>\n";
 
      echo "<tr>\n";
@@ -263,6 +284,9 @@
      if ( isset($_GET['pid']) ) {
        $this->obj->parent = getObject($this->dbconn,$_GET['pid']);
      }
+     if ( isset($_GET['pd']) ) {
+       $this->obj->plandate->setDateTime($_GET['pd']);
+     }
      #
      # preset additional custom fields
      #

Index: bug_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_ins.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- bug_ins.php	11 Jul 2006 06:55:36 -0000	1.18
+++ bug_ins.php	21 Oct 2006 18:15:13 -0000	1.19
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2005 by Gero Kohnert
+ *  Copyright 1999 - 2006 by Gero Kohnert
  *
  *  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   
@@ -51,7 +51,7 @@
  }
 
  if ( (empty($_POST['description']) || !isset($_POST['description']) ) && ($b->id < 0 )) {
-   $msg .= sprintf($lang['Err0009'],$lang['BugAdditional']) ."<br />";
+   $msg .= sprintf($lang['Err0009'],$lang['BugLong']) ."<br />";
    $gotourl = addBadField($gotourl,'description',true);
  } else {
    $description = StripSlashes($_POST['description']);
@@ -129,6 +129,13 @@
    }
  }
 
+ $plandate = new DateTime(0);
+ $plandate->setDateTimeF("pd");
+ $gotourl= addUrlParameter($gotourl,"pd=". $plandate->getYYYYMMDD(),true);
+ if (  !$plandate->checkDMY(true) ) {
+   $msg .= sprintf($lang['Err0038'],$lang['DateTimeTill']) ."<br />";
+ }
+
  #
  # Parse additional custom fields
  #
@@ -198,9 +205,19 @@
    if ( $b->medium != $medium ) {
      $newlines = sprintf("<b>". $lang['BugMedium'] .":<i>%s</i> &#8594; <i>%s</i></b>\n%s" ,$b->getMedium(),$b->getMedium($medium) , $newlines);
    }
+   #
+   # Short Descr Chnaged 
+   #
    if ( $b->short != $short ) {
      $newlines = sprintf("<b>". $lang['BugShort'] .": <i>%s</i> &#8594; <i>%s</i></b>\n%s" ,$b->short,$short , $newlines);
    }
+   #
+   # Plandate Change
+   #
+   if ( $b->plandate->getYYYYMMDD() != $plandate->getYYYYMMDD() ) {
+     $newlines = sprintf("<b>". $lang['DateTimeTill'] .": <i>%s</i> &#8594; <i>%s</i></b>\n%s" ,$b->plandate->getDate(),$plandate->getDate() , $newlines);
+   }
+
    $b->newdesc = $newlines;
  } else {
    #
@@ -210,6 +227,8 @@
    $b->bughist[0]->description = myentities($description);
 
    if ( $b->parent->getType() == "product" ) {
+     $b->setSolver($solver);
+	 /*****
      $b->parent->readroles();
      if ( count($b->parent->role[PROD_ROLE_MANAGER]) > 0 ) {
 	   $solver = current($b->parent->role[PROD_ROLE_MANAGER]);
@@ -220,6 +239,7 @@
      } else {
        $b->setSolver($current_user);
      }
+	 ****/
    } else if ( $b->parent->getType() == "installation" ) {
      $b->parent->product->readroles();
      if ( count($b->parent->product->role[PROD_ROLE_MANAGER]) > 0 ) {
@@ -243,6 +263,7 @@
  $b->setMedium($medium);
  $b->setState($state);
  $b->setClass($class);
+ $b->setPlanDate($plandate);
  $dbconn->Begin("WORK");
  $msg .= $b->save();
  $dbconn->Commit("WORK");

Index: mtable.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/mtable.pinc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- mtable.pinc	17 Mar 2005 18:16:53 -0000	1.5
+++ mtable.pinc	21 Oct 2006 18:15:13 -0000	1.6
@@ -1,6 +1,6 @@
 <?php
 /*
- *  Copyright 2003 - 2005 by Gero Kohnert
+ *  Copyright 2003 - 2006 by Gero Kohnert
  *
  *  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   
@@ -24,6 +24,7 @@
 $table['bug']['state']       = array(type => "ID_TYPE",     constraints => "NN",  Desc => "state of bug");
 $table['bug']['solver']      = array(type => "ID_TYPE",     constraints => "",    Desc => "solver ID");
 $table['bug']['solvedate']   = array(type => "TS_TYPE",     constraints => "",    Desc => "solve date");
+$table['bug']['plandate']    = array(type => "TS_TYPE",     constraints => "",    Desc => "planned solve date");
 $table['bug']['reporter']    = array(type => "ID_TYPE",     constraints => "",    Desc => "reporter ID");
 $table['bug']['medium']      = array(type => "ID_TYPE",     constraints => "",    Desc => "how the bug was reported");
 $table['bug']['creator']     = array(type => "ID_TYPE",     constraints => "",    Desc => "creator ID");

Index: bug.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug.pinc,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- bug.pinc	11 Jul 2006 06:55:36 -0000	1.39
+++ bug.pinc	21 Oct 2006 18:15:13 -0000	1.40
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2005 by Gero Kohnert
+ *  Copyright 1999 - 2006 by Gero Kohnert
  *
  *  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   
@@ -272,8 +272,8 @@
     $this->reporter   = new tutos_address($this->dbconn);
     $this->parent     = -1;
     $this->plist      = array();
-    $this->short      = "";
-    $this->medium     = "";
+    $this->short      = '';
+    $this->medium     = '';
     $this->plandate   = new DateTime(0);  # planned solve date
     $this->solvedate  = new DateTime(0);  # real solvedate
 
@@ -301,6 +301,9 @@
       if ( $this->solvedate->notime != 1 ) {
         $r .=  "<solvedate>". $this->solvedate->exportXML_body() ."</solvedate>\n";
       }
+      if ( $this->plandate->notime != 1 ) {
+        $r .=  "<plandate>". $this->plandate->exportXML_body() ."</plandate>\n";
+      }
       if ( isset($this->bughist) && (count($this->bughist) > 0) ) {
         foreach($this->bughist as $i => $f) {
           $r .= "<history>";
@@ -346,7 +349,7 @@
     $this->state       = $r->get($pos, "state");
 
     $this->solvedate   = $r->getDateTime($pos, "solvedate");
-#    $this->plandate   = $r->getDateTime($pos, "solvedate");
+    $this->plandate    = $r->getDateTime($pos, "plandate");
 
     $this->creator =  getObject($this->dbconn,$r->get($pos, "creator"));
 
@@ -497,7 +500,10 @@
     if ( ! empty($m) ) {
       return $lang['BugMediums'][$m];
     }
-    return $lang['BugMediums'][$this->medium];
+    if ( ! empty($this->medium) ) {
+      return $lang['BugMediums'][$this->medium];
+    }
+    return "";
   }
   /** ---------------------------------------------------------------------------
    */
@@ -742,7 +748,7 @@
       $this->solvedate = new DateTime(0);
       $q->addFV("solvedate",$this->solvedate,"DATETIME");
     }
-#   $q->addFV("plandate",$this->plandate,"DATETIME");
+    $q->addFV("plandate",$this->plandate,"DATETIME");
     $this->save_custom_fields($q);
     $mail = new mail($current_user);
     $mail->setFrom($current_user);

[Tutos-commits] tutos/php/report-engine/rep_group_excel rep_group_excel.pinc, 1.3, 1.4

From: Gero K. <gok...@us...> - 2006-10-20 11:57:14

Update of /cvsroot/tutos/tutos/php/report-engine/rep_group_excel
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17858

Modified Files:
	rep_group_excel.pinc 
Log Message:
added title


Index: rep_group_excel.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/report-engine/rep_group_excel/rep_group_excel.pinc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- rep_group_excel.pinc	6 Oct 2006 11:34:11 -0000	1.3
+++ rep_group_excel.pinc	20 Oct 2006 11:57:10 -0000	1.4
@@ -8,17 +8,18 @@
  */
 
 define ('REP_GROUP_EXCEL_COMPANY',0);
-define ('REP_GROUP_EXCEL_FNAME',1);
-define ('REP_GROUP_EXCEL_LNAME',2);
-define ('REP_GROUP_EXCEL_STREET',3);
-define ('REP_GROUP_EXCEL_ZIP',4);
-define ('REP_GROUP_EXCEL_CITY',5);
-define ('REP_GROUP_EXCEL_COUNTRY',6);
-define ('REP_GROUP_EXCEL_EMAIL1',7);
-define ('REP_GROUP_EXCEL_EMAIL2',8);
-define ('REP_GROUP_EXCEL_PHONE1',9);
-define ('REP_GROUP_EXCEL_PHONE2',10);
-define ('REP_GROUP_EXCEL_FAX',11);
+define ('REP_GROUP_EXCEL_TITLE',1);
+define ('REP_GROUP_EXCEL_FNAME',2);
+define ('REP_GROUP_EXCEL_LNAME',3);
+define ('REP_GROUP_EXCEL_STREET',4);
+define ('REP_GROUP_EXCEL_ZIP',5);
+define ('REP_GROUP_EXCEL_CITY',6);
+define ('REP_GROUP_EXCEL_COUNTRY',7);
+define ('REP_GROUP_EXCEL_EMAIL1',8);
+define ('REP_GROUP_EXCEL_EMAIL2',9);
+define ('REP_GROUP_EXCEL_PHONE1',10);
+define ('REP_GROUP_EXCEL_PHONE2',11);
+define ('REP_GROUP_EXCEL_FAX',12);
 define ('REP_GROUP_EXCEL_ID',14);
 
 class rep_group_excel extends rep_base {
@@ -43,6 +44,9 @@
     $this->ws[$id]->set_column(REP_GROUP_EXCEL_COMPANY,REP_GROUP_EXCEL_COMPANY,25);
     $this->ws[$id]->write_string($row,REP_GROUP_EXCEL_COMPANY, $lang['Company'],$this->format2);
 
+    $this->ws[$id]->set_column(REP_GROUP_EXCEL_TITLE,REP_GROUP_EXCEL_TITLE,25);
+    $this->ws[$id]->write_string($row,REP_GROUP_EXCEL_TITLE, $lang['AdrTitle'],$this->format2);
+
     $this->ws[$id]->set_column(REP_GROUP_EXCEL_FNAME,REP_GROUP_EXCEL_FNAME,25);
     $this->ws[$id]->write_string($row,REP_GROUP_EXCEL_FNAME, $lang['AdrFirstName'],$this->format2);
 
@@ -124,6 +128,7 @@
       foreach ($o->location as $i2 => $o2) {
         $this->ws[$id]->write_string($row,REP_GROUP_EXCEL_ID,$o->id .'-'. $o2->id ,$this->format2);
         if ($o->gettype() == "address") {
+          $this->ws[$id]->write_string($row,REP_GROUP_EXCEL_TITLE,$o->title ,$this->format2);
           $this->ws[$id]->write_string($row,REP_GROUP_EXCEL_FNAME,$o->f_name .' '. $o->m_name ,$this->format2);
           $this->ws[$id]->write_string($row,REP_GROUP_EXCEL_LNAME,$o->l_name ,$this->format2);
 		  if (is_object($o2->company)) {
@@ -154,6 +159,7 @@
       if (count($o->location) == 0) {
         $this->ws[$id]->write_string($row,REP_GROUP_EXCEL_ID,$o->id .'-' ,$this->format2);
         if ($o->gettype() == "address") {
+          $this->ws[$id]->write_string($row,REP_GROUP_EXCEL_TITLE,$o->title ,$this->format2);
           $this->ws[$id]->write_string($row,REP_GROUP_EXCEL_FNAME,$o->f_name .' '. $o->m_name ,$this->format2);
           $this->ws[$id]->write_string($row,REP_GROUP_EXCEL_LNAME,$o->l_name ,$this->format2);
         } else

[Tutos-commits] tutos/php/auth auth_ldap.pinc,1.9.2.1,1.9.2.2

From: Emmanuel D. <ede...@us...> - 2006-10-20 09:14:57

Update of /cvsroot/tutos/tutos/php/auth
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7960/php/auth

Modified Files:
      Tag: BRANCH-2-0
	auth_ldap.pinc 
Log Message:
BUGFIX: error with ldap_auth when password has special character because of utf-8

Index: auth_ldap.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/auth/auth_ldap.pinc,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -d -r1.9.2.1 -r1.9.2.2
--- auth_ldap.pinc	14 Apr 2004 17:39:18 -0000	1.9.2.1
+++ auth_ldap.pinc	20 Oct 2006 09:14:52 -0000	1.9.2.2
@@ -29,13 +29,16 @@
    */
   function getpw() {
     if( isset($this->passwd) ) {
-      return $this->passwd;
-    }
-    elseif( isset($_POST['pw']) ) {
-      return $_POST['pw'];
+      if ($tutos[ldapauthserver]["coding"] != 'utf-8')
+        return utf8_decode($this->passwd);
+      else
+        return $this->passwd;
     }
-    elseif ( isset($_GET['pw']) ) {
-      return $_GET['pw'];
+    elseif( isset($_REQUEST['pw']) ) {
+      if ($tutos[ldapauthserver]["coding"] != 'utf-8')
+        return utf8_decode($_REQUEST['pw']);
+      else
+        return $_REQUEST['pw'];
     }
     return;
   }
@@ -217,6 +220,7 @@
 
       // We read the salt argument from the current encrypted password  
       if( $tutos[ldapauth_pw_enc] == 1 ) {
+//        error_log ("LDAP PASS:[$encryptedPassword] FORM PASS: $passwd");
         if (!strncasecmp($encryptedPassword, "{crypt}", strlen("{crypt}"))) {
 	  // Treat the standard DES crypt format
 	  $encryptedPassword = substr($encryptedPassword, strlen("{crypt}")) ;
@@ -242,6 +246,7 @@
           $passwd = crypt(trim($this->getpw()), $salt);
 	}
       }
+//      error_log ("LDAP PASS:[$encryptedPassword] FORM PASS: $passwd");
 
       if( strcmp($encryptedPassword, $passwd) != 0 ) {
         ReadLang($lang);

[Tutos-commits] tutos/php/ldap ldap.pinc,1.12.2.2,1.12.2.3

From: Emmanuel D. <ede...@us...> - 2006-10-20 09:14:56

Update of /cvsroot/tutos/tutos/php/ldap
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7960/php/ldap

Modified Files:
      Tag: BRANCH-2-0
	ldap.pinc 
Log Message:
BUGFIX: error with ldap_auth when password has special character because of utf-8

Index: ldap.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/ldap/ldap.pinc,v
retrieving revision 1.12.2.2
retrieving revision 1.12.2.3
diff -u -d -r1.12.2.2 -r1.12.2.3
--- ldap.pinc	19 Oct 2006 10:04:23 -0000	1.12.2.2
+++ ldap.pinc	20 Oct 2006 09:14:53 -0000	1.12.2.3
@@ -376,6 +376,7 @@
         break;
       case 'plain':
         return $val;
+        return utf8_encode($val);
         break;
     }
   }

[Tutos-commits] tutos/php/xml xml_parse.pinc,1.11.2.1,1.11.2.2

From: Emmanuel D. <ede...@us...> - 2006-10-19 10:04:27

Update of /cvsroot/tutos/tutos/php/xml
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13701/php/xml

Modified Files:
      Tag: BRANCH-2-0
	xml_parse.pinc 
Log Message:
CHANG: utf-8 encode all languages

Index: xml_parse.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/xml/xml_parse.pinc,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -u -d -r1.11.2.1 -r1.11.2.2
--- xml_parse.pinc	14 Apr 2004 17:39:23 -0000	1.11.2.1
+++ xml_parse.pinc	19 Oct 2006 10:04:23 -0000	1.11.2.2
@@ -89,7 +89,7 @@
     array_pop($this->stack);
 
     if ($this->cobj != null) {
-      $this->cobj->parseXML($this->ctag,utf8_decode($this->data),$this->attrs);
+      $this->cobj->parseXML($this->ctag,$this->data,$this->attrs);
     }
 
     if ( $name == "group" ) {

[Tutos-commits] tutos/php/url url.pinc,1.12.2.6,1.12.2.7

From: Emmanuel D. <ede...@us...> - 2006-10-19 10:04:27

Update of /cvsroot/tutos/tutos/php/url
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13701/php/url

Modified Files:
      Tag: BRANCH-2-0
	url.pinc 
Log Message:
CHANG: utf-8 encode all languages

Index: url.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/url/url.pinc,v
retrieving revision 1.12.2.6
retrieving revision 1.12.2.7
diff -u -d -r1.12.2.6 -r1.12.2.7
--- url.pinc	12 May 2005 16:34:11 -0000	1.12.2.6
+++ url.pinc	19 Oct 2006 10:04:23 -0000	1.12.2.7
@@ -80,8 +80,8 @@
 
   function exportXML_body() {
     $r = parent::exportXML_body();
-    $r .= "<name>". utf8_encode(htmlspecialchars($this->name))."</name>\n";
-    $r .= "<url>".  utf8_encode(htmlspecialchars($this->url)) ."</url>\n";
+    $r .= "<name>". htmlspecialchars($this->name)."</name>\n";
+    $r .= "<url>".  htmlspecialchars($this->url) ."</url>\n";
     return $r;
   }

[Tutos-commits] tutos/php/group group.pinc,1.40.2.2,1.40.2.3