tutos-commits Mailing List for TUTOS

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

Modified Files:
	watchlist.pinc 
Log Message:
fix

Index: watchlist.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/watchlist/watchlist.pinc,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- watchlist.pinc	2 Jan 2006 08:36:26 -0000	1.57
+++ watchlist.pinc	16 May 2006 09:08:59 -0000	1.58
@@ -207,6 +207,7 @@
     if (! is_object($obj) ) return;
     if ( ! $obj->mod_ok() ) return;
     if ( ! $user->feature_ok(usewatchlist,PERM_NEW) ) return;
+    if ( $obj->id == -1 ) return;
 
 
     $x[] = array( url => "watchlist/watchlist_overview.php?id=". $obj->id,

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

Modified Files:
      Tag: BRANCH-2-0
	project_readers.pinc 
Log Message:
- convert to PHP5

Index: project_readers.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/projectio/Attic/project_readers.pinc,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- project_readers.pinc	7 Apr 2006 16:33:48 -0000	1.1.2.2
+++ project_readers.pinc	4 May 2006 14:19:41 -0000	1.1.2.3
@@ -18,14 +18,16 @@
    * @param file planner file to read
    */
   function plannerReader($file){
-    $DomXml = domxml_open_file($file, DOMXML_LOAD_PARSING | DOMXML_LOAD_DONT_KEEP_BLANKS);
-    if (!$DomXml) {
+//     domxml_open_file($file, DOMXML_LOAD_PARSING | DOMXML_LOAD_DONT_KEEP_BLANKS);
+    $DomXml = new DOMDocument('1.0', 'iso-8859-1');
+    $ret = $DomXml->load($file);
+    if (!$ret) {
       error_log("Not a XML Planner file");
       settype(&$this, 'null');
 #      throw new Exception("Not a XML Planner file");
     }
 
-    $this->DomProject = $DomXml->document_element();
+    $this->DomProject = $DomXml->getElementsByTagName('project')->item(0);
     if (!$this->verify($this->DomProject)) {
       error_log("Not a Planner file project");
       settype(&$this, 'null');
@@ -38,10 +40,12 @@
    */
   function verify($DomRoot) {
     $ret = true;
-    if ($ret && $DomRoot->tagname != "project")
+//     if ($ret && $DomRoot->tagname != "project")
+//       $ret = false;
+    if (!isset ($DomRoot))
       $ret = false;
 
-    if ($ret && !$DomRoot->has_attribute("mrproject-version"))
+    if ($ret && !$DomRoot->hasAttribute("mrproject-version"))
       $ret = false;
 
     return $ret;
@@ -53,19 +57,19 @@
    */
   function read() {
     // resources reading
-    $DomResources = $this->DomProject->get_elements_by_tagname("resources");
+    $DomResources = $this->DomProject->getElementsByTagName('resources');
     $Resources = array();
     if (isset($DomResources) && count($DomResources))
       $Resources = $this->readResources($DomResources[0]);
 
     // allocations reading (resources must be reading before)
-    $DomAllocations = $this->DomProject->get_elements_by_tagname("allocations");
+    $DomAllocations = $this->DomProject->getElementsByTagName("allocations");
     $Allocations = array();
     if (isset($DomAllocations) && count($DomAllocations))
       $Allocations  = $this->readAllocations($DomAllocations[0], $Resources);
 
     // tasks reading (resources and allocations must be reading at first)
-    $DomTasks = $this->DomProject->get_elements_by_tagname("tasks");
+    $DomTasks = $this->DomProject->getElementsByTagName("tasks");
     if (isset($DomTasks) && count($DomTasks))
       $this->Result = $this->readSubTasks($DomTasks[0], $Allocations);
     else
@@ -81,10 +85,10 @@
    */
   function readResource($DomResource) {
     $Resource = array();
-    if ($DomResource->node_name() == "resource") {
-      $Resource["id"]    = $DomResource->get_attribute("id");
-      $Resource["name"]  = utf8_decode($DomResource->get_attribute("name"));
-      $Resource["email"] = utf8_decode($DomResource->get_attribute("email"));
+    if ($DomResource->tagName == "resource") {
+      $Resource["id"]    = $DomResource->getAttribute("id");
+      $Resource["name"]  = utf8_decode($DomResource->getAttribute("name"));
+      $Resource["email"] = utf8_decode($DomResource->getAttribute("email"));
     }
     return $Resource;
   }
@@ -96,7 +100,7 @@
   function readResources($DomElt) {
     $ret = array();
 
-    $nodes = $DomElt->get_elements_by_tagname("resource");
+    $nodes = $DomElt->getElementsByTagName("resource");
     foreach ($nodes as $node) {
       $res = $this->readResource($node);
       $ret[$res["id"]] = $res;
@@ -113,9 +117,9 @@
    */
   function readAllocation($DomAllocation, $Resources) {
     $Allocation = array();
-    if ($DomAllocation->node_name() == "allocation") {
-      $Allocation["task-id"]   = $DomAllocation->get_attribute("task-id");
-      $Allocation["resource"]  = $Resources[$DomAllocation->get_attribute("resource-id")];
+    if ($DomAllocation->tagName == "allocation") {
+      $Allocation["task-id"]   = $DomAllocation->getAttribute("task-id");
+      $Allocation["resource"]  = $Resources[$DomAllocation->getAttribute("resource-id")];
     }
     return $Allocation;
   }
@@ -128,7 +132,7 @@
   function readAllocations($DomElt, $Resources) {
     $ret = array();
 
-    $nodes = $DomElt->get_elements_by_tagname("allocation");
+    $nodes = $DomElt->getElementsByTagName("allocation");
     foreach ($nodes as $node) {
       $Alloc = $this->readAllocation($node, $Resources);
       $tid = $Alloc["task-id"];
@@ -168,14 +172,14 @@
    */
   function readTask($DomTask, $Allocations) {
     $Task = array();
-    if ($DomTask->node_name() == "task") {
-      $Task["id"]        = $DomTask->get_attribute("id");
-      $Task["name"]      = utf8_decode($DomTask->get_attribute("name"));
-      $Task["start"]     = $this->plannerDate($DomTask->get_attribute("work-start"));
-      $Task["end"]       = $this->plannerDate($DomTask->get_attribute("end"));
-      $Task["milestone"] = ($DomTask->get_attribute("type") == "milestone") ? true : false;
-      $Task["work"]      = $this->plannerWork($DomTask->get_attribute("work"));
-      $Task["note"]      = utf8_decode($DomTask->get_attribute("note"));
+    if ($DomTask->tagName == "task") {
+      $Task["id"]        = $DomTask->getAttribute("id");
+      $Task["name"]      = utf8_decode($DomTask->getAttribute("name"));
+      $Task["start"]     = $this->plannerDate($DomTask->getAttribute("work-start"));
+      $Task["end"]       = $this->plannerDate($DomTask->getAttribute("end"));
+      $Task["milestone"] = ($DomTask->getAttribute("type") == "milestone") ? true : false;
+      $Task["work"]      = $this->plannerWork($DomTask->getAttribute("work"));
+      $Task["note"]      = utf8_decode($DomTask->getAttribute("note"));
       if ( isset($Allocations[$Task["id"]]) )
         $Task["resources"] = $Allocations[$Task["id"]];
       else
@@ -193,10 +197,10 @@
     $ret = $this->readTask($DomElt, $Allocations);
     $ret["subtasks"] = array();
 
-    $nodes = $DomElt->child_nodes();
+    $nodes = $DomElt->childNodes;
     foreach ($nodes as $node) {
-      if ($node->node_type() == XML_ELEMENT_NODE &&
-          $node->node_name() == "task") {
+      if ($node->nodeType() == XML_ELEMENT_NODE &&
+          $node->nodeName() == "task") {
         $ret["subtasks"][] = $this->readSubTasks($node, $Allocations);
       }
     }
@@ -232,15 +236,17 @@
    * @param file planner file to read
    */
   function msprojectReader($file){
-    $DomXml = domxml_open_file($file, DOMXML_LOAD_PARSING | DOMXML_LOAD_DONT_KEEP_BLANKS);
-    if (!$DomXml) {
+//    $DomXml = domxml_open_file($file, DOMXML_LOAD_PARSING | DOMXML_LOAD_DONT_KEEP_BLANKS);
+    $DomXml = new DOMDocument('1.0', 'iso-8859-1');
+    $ret = $DomXml->load($file);
+    if (!$ret) {
       error_log("Not a XML MS-Project file");
       settype(&$this, 'null');
 #      throw new Exception("Not a XML MS-Project file");
     }
 
-    print_r($DomXml->doctype);
-    $this->DomProject = $DomXml->document_element();
+#    print_r($DomXml->doctype);
+    $this->DomProject = $DomXml->getElementsByTagName('Project')->item(0);
     if (!$this->verify($this->DomProject)) {
       error_log("Not a MS-Project XML file project");
       settype(&$this, 'null');
@@ -253,7 +259,9 @@
    */
   function verify($DomRoot) {
     $ret = true;
-    if ($ret && $DomRoot->tagname != "Project")
+//     if ($ret && $DomRoot->tagname != "Project")
+//       $ret = false;
+    if (!isset ($DomRoot))
       $ret = false;
 
     return $ret;
@@ -265,21 +273,21 @@
    */
   function read() {
     // resources reading
-    $DomResources = $this->DomProject->get_elements_by_tagname("Resources");
+    $DomResources = $this->DomProject->getElementsByTagName("Resources");
     $Resources = array();
     if (isset($DomResources) && count($DomResources))
-      $Resources = $this->readResources($DomResources[0]);
+      $Resources = $this->readResources($DomResources->item(0));
 
     // allocations reading (resources must be reading before)
-    $DomAllocations = $this->DomProject->get_elements_by_tagname("Assignments");
+    $DomAllocations = $this->DomProject->getElementsByTagName("Assignments");
     $Allocations = array();
     if (isset($DomAllocations) && count($DomAllocations))
-      $Allocations  = $this->readAllocations($DomAllocations[0], $Resources);
+      $Allocations  = $this->readAllocations($DomAllocations->item(0), $Resources);
 
     // tasks reading (resources and allocations must be reading at first)
-    $DomTasks = $this->DomProject->get_elements_by_tagname("Tasks");
+    $DomTasks = $this->DomProject->getElementsByTagName("Tasks");
     if (isset($DomTasks) && count($DomTasks))
-      $this->Result = $this->readTasks($DomTasks[0], $Allocations);
+      $this->Result = $this->readTasks($DomTasks->item(0), $Allocations);
     else
       return false;
     return true;
@@ -293,13 +301,13 @@
    */
   function getTagData($DomElt, $TagName) {
     $val;
-    $nodes = $DomElt->child_nodes();
+    $nodes = $DomElt->childNodes;
     foreach ($nodes as $node) {
-      if ($node->node_type() != XML_ELEMENT_NODE)
+      if ($node->nodeType != XML_ELEMENT_NODE)
         continue;
-      if ($node->node_name() != $TagName)
+      if ($node->nodeName != $TagName)
         continue;
-      $val .= $node->get_content();
+      $val .= $node->textContent;
     }
     return $val;
   }
@@ -311,7 +319,7 @@
    */
   function readResource($DomResource) {
     $Resource = array();
-    if ($DomResource->node_name() == "Resource") {
+    if ($DomResource->nodeName == "Resource") {
       $Resource["id"]    = $this->getTagData($DomResource, "UID");
       $Resource["name"]  = utf8_decode($this->getTagData($DomResource, "Name"));
       $Resource["email"] = utf8_decode($this->getTagData($DomResource, "EmailAddress"));
@@ -326,7 +334,7 @@
   function readResources($DomElt) {
     $ret = array();
 
-    $nodes = $DomElt->get_elements_by_tagname("Resource");
+    $nodes = $DomElt->getElementsByTagName("Resource");
     foreach ($nodes as $node) {
       $res = $this->readResource($node);
       $ret[$res["id"]] = $res;
@@ -343,7 +351,7 @@
    */
   function readAllocation($DomAllocation, $Resources) {
     $Allocation = array();
-    if ($DomAllocation->node_name() == "Assignment") {
+    if ($DomAllocation->nodeName == "Assignment") {
       $taskid = $this->getTagData($DomAllocation, "TaskUID");
       $Allocation["task-id"]   = $taskid;
       $Allocation["resource"]  = $Resources[$this->getTagData($DomAllocation, "ResourceUID")];
@@ -359,7 +367,7 @@
   function readAllocations($DomElt, $Resources) {
     $ret = array();
 
-    $nodes = $DomElt->get_elements_by_tagname("Assignment");
+    $nodes = $DomElt->getElementsByTagName("Assignment");
     foreach ($nodes as $node) {
       $Alloc = $this->readAllocation($node, $Resources);
       $tid = $Alloc["task-id"];
@@ -415,7 +423,7 @@
    */
   function readTask($DomTask, $Allocations) {
     $Task = array();
-    if ($DomTask->node_name() == "Task") {
+    if ($DomTask->nodeName == "Task") {
       $Task["OutlineLevel"]  = $this->getTagData($DomTask, "OutlineLevel");
       $Task["OutlineNumber"] = $this->getTagData($DomTask, "OutlineNumber");
       $Task["OutlineParent"] = $this->getOutlineParent($Task["OutlineNumber"]);
@@ -445,10 +453,10 @@
     $byLevel = array();
 
     // read all task and search for parent
-    $nodes = $DomElt->child_nodes();
+    $nodes = $DomElt->childNodes;
     foreach ($nodes as $node) {
-      if ($node->node_type() == XML_ELEMENT_NODE &&
-          $node->node_name() == "Task") {
+      if ($node->nodeType == XML_ELEMENT_NODE &&
+          $node->nodeName == "Task") {
         $task = $this->readTask($node, $Allocations);
         $level  = $task["OutlineLevel"];
         if ( !isset($byLevel[$level]) )

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

Modified Files:
      Tag: BRANCH-2-0
	projectio.pinc 
Log Message:
- convert to PHP5

Index: projectio.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/projectio/Attic/projectio.pinc,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- projectio.pinc	22 Feb 2006 15:52:42 -0000	1.1.2.2
+++ projectio.pinc	4 May 2006 13:31:44 -0000	1.1.2.3
@@ -48,20 +48,20 @@
     global $lang;
 
     return "";
-    if ( $obj == -1 ) return ""; 
-    if (! is_object($obj) ) return "";
-    if ( $obj->id == -1 ) return "";
-    if (! $user->feature_ok(useprojectio,PERM_NEW) ) return "";
-    if (! $obj->use_ok() ) return "";
-
-    $x = array('url'   => "projectio/projectio_new.php?pro_id=". $obj->id,
-               'text'  => ($text == "" ? $lang['ProjectIOCreate'] : $text),
-               'image' => 'projectio',
-               'info'  => $lang['ProjectIOCreate'],
-               'confirm' => false,
-               'category' => array("projectio","new","module")
-              );
-    return $x;
+//    if ( $obj == -1 ) return ""; 
+//    if (! is_object($obj) ) return "";
+//    if ( $obj->id == -1 ) return "";
+//    if (! $user->feature_ok(useprojectio,PERM_NEW) ) return "";
+//    if (! $obj->use_ok() ) return "";
+//
+//    $x = array('url'   => "projectio/projectio_new.php?pro_id=". $obj->id,
+//               'text'  => ($text == "" ? $lang['ProjectIOCreate'] : $text),
+//               'image' => 'projectio',
+//               'info'  => $lang['ProjectIOCreate'],
+//               'confirm' => false,
+//               'category' => array("projectio","new","module")
+//              );
+//    return $x;
   }
 
   /**

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

Modified Files:
      Tag: BRANCH-2-0
	timetrack_overview.php 
Log Message:
- change right for modifie link

Index: timetrack_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack_overview.php,v
retrieving revision 1.81.2.12
retrieving revision 1.81.2.13
diff -u -r1.81.2.12 -r1.81.2.13
--- timetrack_overview.php	23 May 2005 16:00:01 -0000	1.81.2.12
+++ timetrack_overview.php	3 May 2006 12:35:34 -0000	1.81.2.13
@@ -29,7 +29,7 @@
     * display the info
     */
    Function info() {
-     global $lang,$tutos;
+     global $lang,$tutos,$current_user;
 
      $n = $this->result->numrows();
      
@@ -168,8 +168,9 @@
        $tt->read_result($this->result,$a);
 
        $cur_tt = array();
-
-       if ( $tt->mod_ok() ) {
+    
+       if ( $current_user->feature_ok($tt->gettypeid(),PERM_MOD, True) && acl_mod_ok($tt)) {
+//       if ( $tt->mod_ok() ) {
 	 $cur_tt['id'] = array('name'  => sprintf("%03d",($a + 1)),
 			       'link'  => $tt->getModURL(),
 			       'title' => $lang['TimetrackModify'],