tutos-commits Mailing List for TUTOS

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

Modified Files:
	file_new.php 
Log Message:
bugfix


Index: file_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file_new.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- file_new.php	1 May 2005 13:37:56 -0000	1.19
+++ file_new.php	17 Apr 2006 18:16:21 -0000	1.20
@@ -146,7 +146,7 @@
        echo " <font size=\"-1\">". $lang['FileVersionTypeI'] ."</font><br />\n";
        echo "  <input type=\"radio\" name=\"vsys\" value=\"0\"". ( $this->obj->vsys == 0 ? ' checked="checked"':'') ." />&nbsp;none \n";
        echo "  <input type=\"radio\" name=\"vsys\" value=\"1\"". ( $this->obj->vsys == 1 ? ' checked="checked"':'') ." />&nbsp;TUTOS \n";
-       if ( file_exists($tutos[ci]) && is_executable($tutos[ci]) ) {
+       if ( file_exists($tutos[file_ci]) && is_executable($tutos[file_ci]) ) {
          echo "  <input type=\"radio\" name=\"vsys\" value=\"2\"". ( $this->obj->vsys == 2 ? ' checked="checked"':'') ." />&nbsp;RCS \n";
        }
        echo " </td>\n";

Update of /cvsroot/tutos/tutos/include/smarty
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29696/include/smarty

Log Message:
Directory /cvsroot/tutos/tutos/include/smarty added to the repository
--> Using per-directory sticky tag `BRANCH-2-0'

Update of /cvsroot/tutos/tutos/include/smarty/libs/internals
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29696/include/smarty/libs/internals

Log Message:
Directory /cvsroot/tutos/tutos/include/smarty/libs/internals added to the repository
--> Using per-directory sticky tag `BRANCH-2-0'

Update of /cvsroot/tutos/tutos/include/smarty/libs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29696/include/smarty/libs

Log Message:
Directory /cvsroot/tutos/tutos/include/smarty/libs added to the repository
--> Using per-directory sticky tag `BRANCH-2-0'

Update of /cvsroot/tutos/tutos/include/smarty/libs/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29696/include/smarty/libs/plugins

Log Message:
Directory /cvsroot/tutos/tutos/include/smarty/libs/plugins added to the repository
--> Using per-directory sticky tag `BRANCH-2-0'

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

Log Message:
Directory /cvsroot/tutos/tutos/include added to the repository
--> Using per-directory sticky tag `BRANCH-2-0'

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

Added Files:
      Tag: BRANCH-2-0
	mantis_new.html 
Log Message:


--- NEW FILE: mantis_new.html ---
<!--$Id: mantis_new.html,v 1.1.2.1 2006/04/10 16:55:09 edeweerdt Exp $ -->
<div class="help">
<h1><?php echo $lang['Mantis'] ?></h1>

<p>Module de liaison entre Tutos et Mantis afin de lier des bugs projet Tutos avec des fiches d'observations de Mantis.</p>
</div>

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

Modified Files:
      Tag: BRANCH-2-0
	layout.pinc 
Log Message:


Index: layout.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/layout/Attic/layout.pinc,v
retrieving revision 1.1.2.32
retrieving revision 1.1.2.33
diff -u -r1.1.2.32 -r1.1.2.33
--- layout.pinc	10 Feb 2006 09:37:55 -0000	1.1.2.32
+++ layout.pinc	10 Apr 2006 16:53:29 -0000	1.1.2.33
@@ -567,10 +567,10 @@
     else
       $this->assign('logolink', 'none');
 
-    if( ereg("^http", $tutos[logo]) )
-      $this->assign('logo', $tutos[logo]);
-    else
-      $this->assign('logo', $tutos['base']."/".$tutos[logo]);
+     if( ereg("^http", $tutos[logo]) )
+       $this->assign('logo', $tutos[logo]);
+     else
+       $this->assign('logo', $tutos['base']."/".$tutos[logo]);
 
     $this->template("layout_start");
 

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

Modified Files:
      Tag: BRANCH-2-0
	layout_start.tpl 
Log Message:
- add personnalised logo to style

Index: layout_start.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/layout_start.tpl,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- layout_start.tpl	14 Dec 2004 17:59:12 -0000	1.1.2.5
+++ layout_start.tpl	10 Apr 2006 16:32:58 -0000	1.1.2.6
@@ -2,7 +2,7 @@
 {* $Id$ *}
 
 <!-- layout_start -->
-<div class="header">
+<div class="header" style="background-image : url({$logo});">
 <table>
 <tr>
  <td class="date">{$date}  </td>

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

Modified Files:
      Tag: BRANCH-2-0
	style.css 
Log Message:
- add style for timetrack synthesis

Index: style.css
===================================================================
RCS file: /cvsroot/tutos/tutos/html/classic/Attic/style.css,v
retrieving revision 1.1.2.40
retrieving revision 1.1.2.41
diff -u -r1.1.2.40 -r1.1.2.41
--- style.css	9 Mar 2006 14:57:58 -0000	1.1.2.40
+++ style.css	10 Apr 2006 16:28:13 -0000	1.1.2.41
@@ -517,7 +517,7 @@
     /* let the default menu height */
     margin: 0px;
     padding: 0px;
-    background-image : url(../logo.png);
+/*    background-image : url(../logo.png);*/
     background-position : right;
     background-repeat : no-repeat;
     background-color: #6666cc;

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

Modified Files:
      Tag: BRANCH-2-0
	timetrack_synthesis.php 
Log Message:
- bugfix on preselected period

Index: timetrack_synthesis.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/Attic/timetrack_synthesis.php,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- timetrack_synthesis.php	28 Mar 2006 13:54:43 -0000	1.1.2.3
+++ timetrack_synthesis.php	7 Apr 2006 16:35:11 -0000	1.1.2.4
@@ -866,7 +866,7 @@
 
     /* Last 15 */
     if ($d['mday'] <= 15) {
-      $s15 = strtotime("-".($d['mday']-16)." days -1 month");
+      $s15 = strtotime("+".(16 - $d['mday'])." days -1 month");
       $e15 = strtotime("-".$d['mday']." days");
     } else {
       $s15 = strtotime("-".($d['mday']-1)." days");

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

Modified Files:
      Tag: BRANCH-2-0
	appointment.pinc base.pinc database.pinc webelements.p3 
Log Message:
- change for php5 compliant

Index: appointment.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/appointment.pinc,v
retrieving revision 1.161.2.3
retrieving revision 1.161.2.4
diff -u -r1.161.2.3 -r1.161.2.4
--- appointment.pinc	17 May 2005 16:33:45 -0000	1.161.2.3
+++ appointment.pinc	7 Apr 2006 16:33:48 -0000	1.161.2.4
@@ -1680,7 +1680,7 @@
     $n = $r->numrows();
     $a = 0;
     while ( $a < $n ) {
-      $o = &new appointment($obj->dbconn);
+      $o = new appointment($obj->dbconn);
       $o->read_result($r,$a);
       $a++;
       if ( $o->see_ok() ) { 
@@ -1728,7 +1728,7 @@
     $n = $r->numrows();
     $a = 0;
     while ( $a < $n ) {
-      $o = &new appointment($obj->dbconn);
+      $o = new appointment($obj->dbconn);
       $o->read_result($r,$a);
       $a++;
       if ( $o->see_ok() ) { 
@@ -1759,7 +1759,7 @@
     $n = $r->numrows();
     $a = 0;
     while ( $a < $n ) {
-      $o = &new appointment($obj->dbconn);
+      $o = new appointment($obj->dbconn);
       $o->read_result($r,$a);
       $a++;
       if ( $o->see_ok() ) { 

Index: base.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/base.pinc,v
retrieving revision 1.62.2.5
retrieving revision 1.62.2.6
diff -u -r1.62.2.5 -r1.62.2.6
--- base.pinc	8 Sep 2005 12:12:08 -0000	1.62.2.5
+++ base.pinc	7 Apr 2006 16:33:48 -0000	1.62.2.6
@@ -90,7 +90,13 @@
 
     if ( isset($g_hash[$id]) ) {
       # Hashed
-      $this = $g_hash[$id];
+    //  $this = $g_hash[$id];
+      
+      
+      foreach (get_object_vars($g_hash[$id]) as $key => $value)
+        $this->$key = $value;
+      
+      
       if ($this->id != $id) {
 # PHP 5
 #die ("CACHE failed for ".$id ."(". $g_hash[$id]->getFullName() .") got ". $this->id ." ". $this->gettype() ."<br>\n");

Index: database.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/database.pinc,v
retrieving revision 1.47.2.1
retrieving revision 1.47.2.2
diff -u -r1.47.2.1 -r1.47.2.2
--- database.pinc	14 Apr 2004 17:39:09 -0000	1.47.2.1
+++ database.pinc	7 Apr 2006 16:33:48 -0000	1.47.2.2
@@ -148,10 +148,10 @@
 
     if ( -1 == $id ) return;
 
-    if ( ( -2 == $id) && ($this->dbconn != -1) ) {
-      $this = $this->dbconn->db;
-      return 1;
-    }  
+//     if ( ( -2 == $id) && ($this->dbconn != -1) ) {
+//       $this = $this->dbconn->db;
+//       return 1;
+//     }  
 
     # First get all info from a connected database if available
 

Index: webelements.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/webelements.p3,v
retrieving revision 1.243.2.10
retrieving revision 1.243.2.11
diff -u -r1.243.2.10 -r1.243.2.11
--- webelements.p3	9 Mar 2006 14:59:05 -0000	1.243.2.10
+++ webelements.p3	7 Apr 2006 16:33:48 -0000	1.243.2.11
@@ -69,7 +69,8 @@
   $msg .= "DateTime:\t". Date("d.M.Y H:i:s T") ."\n";
   $msg .= "Errno:\t\t". $errno ."\n";
   $msg .= "\t\t". $errstr ."\n";
-  $msg .= "LastQuery:\t".  $dbconn->lastquery . "\n";
+  if (isset($dbconn))
+    $msg .= "LastQuery:\t".  $dbconn->lastquery . "\n";
   $msg .= "File:\t\t".  $errfile ." +". $errline ."\n";
   if ( isset($_SERVER["HTTP_USER_AGENT"]) ) {
     $msg .= "Browser:\t". $_SERVER["HTTP_USER_AGENT"] ."\n";

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

Modified Files:
      Tag: BRANCH-2-0
	project_readers.pinc 
Log Message:
- change for php5 compliant

Index: project_readers.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/projectio/Attic/project_readers.pinc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- project_readers.pinc	10 Feb 2006 09:37:55 -0000	1.1.2.1
+++ project_readers.pinc	7 Apr 2006 16:33:48 -0000	1.1.2.2
@@ -21,15 +21,15 @@
     $DomXml = domxml_open_file($file, DOMXML_LOAD_PARSING | DOMXML_LOAD_DONT_KEEP_BLANKS);
     if (!$DomXml) {
       error_log("Not a XML Planner file");
-      $this = null;
-      return;
+      settype(&$this, 'null');
+#      throw new Exception("Not a XML Planner file");
     }
 
     $this->DomProject = $DomXml->document_element();
     if (!$this->verify($this->DomProject)) {
       error_log("Not a Planner file project");
-      $this = null;
-      return;
+      settype(&$this, 'null');
+#      throw new Exception("Not a Planner file project");
     }
   }
 
@@ -235,16 +235,16 @@
     $DomXml = domxml_open_file($file, DOMXML_LOAD_PARSING | DOMXML_LOAD_DONT_KEEP_BLANKS);
     if (!$DomXml) {
       error_log("Not a XML MS-Project file");
-      $this = null;
-      return;
+      settype(&$this, 'null');
+#      throw new Exception("Not a XML MS-Project file");
     }
 
     print_r($DomXml->doctype);
     $this->DomProject = $DomXml->document_element();
     if (!$this->verify($this->DomProject)) {
       error_log("Not a MS-Project XML file project");
-      $this = null;
-      return;
+      settype(&$this, 'null');
+#      throw new Exception("Not a MS-Project XML file project");
     }
   }
 

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

Modified Files:
	app_overview.php ical_parse.php timetrack_overview.php 
Log Message:
fixes

Index: app_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_overview.php,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- app_overview.php	19 Jul 2004 19:08:42 -0000	1.59
+++ app_overview.php	5 Apr 2006 11:58:31 -0000	1.60
@@ -197,7 +197,7 @@
      if ( isset($_GET['myapps']) && ($_GET['myapps'] = 1) ) {
        $this->q = "SELECT * from ". $this->dbconn->prefix ."calendar c, ". $this->dbconn->prefix ."participants p";
        $pre = " WHERE c.id = p.app_id AND ";
-       team::obj_read($obj);
+       team::obj_read($this->user);
        $this->q .= $pre."p.adr_id in ( ". $this->user->id;
        foreach ( $this->user->teamlist as $i => $f) {
          $this->q .= ",". $i;
@@ -338,4 +338,4 @@
  $l = new app_overview($current_user);
  $l->display();
  $dbconn->Close();
-?>
\ No newline at end of file
+?>

Index: ical_parse.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/ical_parse.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ical_parse.php	3 Apr 2005 18:31:53 -0000	1.2
+++ ical_parse.php	5 Apr 2006 11:58:31 -0000	1.3
@@ -17,7 +17,7 @@
     Fatal_Error("missing file ".$fname);
   }
   $data = "";
-  $in_cal = $false;
+  $in_cal = false;
   while (!feof($fd)) {
     $line = fgets($fd);
     if (eregi("BEGIN:VCALENDAR",$line)) {
@@ -148,4 +148,4 @@
   }
   return $r;
 }
-?>
\ No newline at end of file
+?>

Index: timetrack_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack_overview.php,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- timetrack_overview.php	29 Jan 2006 14:00:53 -0000	1.95
+++ timetrack_overview.php	5 Apr 2006 11:58:31 -0000	1.96
@@ -602,7 +602,7 @@
          }
          $q .= ")";
        } else {
-         $q .= $pre . "adr_id =" . $link_id;
+         $q .= $pre . "adr_id =" . $_GET['link_id'];
        }
        $pre = " AND ";
        $this->link1 = addUrlParameter($this->link1,"worker=".$_GET['worker']);

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

Modified Files:
	bug_new.php 
Log Message:
fixes

Index: bug_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_new.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- bug_new.php	2 Jan 2006 09:45:25 -0000	1.20
+++ bug_new.php	5 Apr 2006 11:58:32 -0000	1.21
@@ -98,7 +98,7 @@
      echo "</tr>\n";
 
      echo "<tr>\n";
-     echo $this->showfieldc($lang['BugAssignedTo']);
+     echo $this->showfieldc($lang['BugAssignedTo'],0,"sid");
      echo " <td colspan=\"3\" valign=\"top\">";
      if ( $this->obj->id > 0 ) {
        select_from_array_or_input($this->obj,"s",$this->obj->solver,1,'at');
@@ -148,7 +148,8 @@
          }
          $this->addHidden("sid",$sid);
        } else {
-         echo $lang['Product'] ." ". $lang['ProdRole'][1];
+         echo $lang['Product'] ." ". $lang['ProdRole'][PROD_ROLE_MANAGER];
+         $this->addHidden("sid","auto");
        }
      }
      echo " </td>\n";