tutos-commits Mailing List for TUTOS

Revision: 847
          http://tutos.svn.sourceforge.net/tutos/?rev=847&view=rev
Author:   gokohnert
Date:     2012-11-29 09:21:29 +0000 (Thu, 29 Nov 2012)
Log Message:
-----------
fixes for mobile layout

Modified Paths:
--------------
    trunk/php/handler.pinc
    trunk/php/ldap/ldap_show.php
    trunk/php/timetrack/timetrack_select.php
    trunk/php/webelements.p3

Modified: trunk/php/handler.pinc
===================================================================
--- trunk/php/handler.pinc	2012-11-29 09:06:49 UTC (rev 846)
+++ trunk/php/handler.pinc	2012-11-29 09:21:29 UTC (rev 847)
@@ -13,8 +13,7 @@
 /**
  * run handler for given input and type
  */
-Function handle($type,&$obj,$arg)
-{
+Function handle($type,&$obj,$arg) {
     global $tutos;
 
     $r = '';
@@ -27,7 +26,7 @@
         if (file_exists($tutos['base'] .'/php/'. $f)) {
             include_once  $tutos['base'] .'/php/'. $f;
             if (class_exists($i)) {
-                $x = new $i($obj->dbconn);
+                $x = new $i();
                 if ( ! is_subclass_of($x,'tutos_handler') ) {
                     Fatal_Error('Wrong handler class: '. $i);
                 }

Modified: trunk/php/ldap/ldap_show.php
===================================================================
--- trunk/php/ldap/ldap_show.php	2012-11-29 09:06:49 UTC (rev 846)
+++ trunk/php/ldap/ldap_show.php	2012-11-29 09:21:29 UTC (rev 847)
@@ -87,22 +87,35 @@
                     for ($k = 0;$k < $d['count'];$k++) {
                         if ( preg_match("#certificate#i",$y) ) {
                             // TODO make some cool OPSENSSL Stuff here
-                            $r .= '<pre>skipped ('. strlen($d[$k]) .' Bytes)</pre><br />'."\n";
+                            //$r .= '<pre>skipped ('. strlen($d[$k]) .' Bytes)</pre><br />'."\n";
                             //$r .= "<pre>". $d[$k] ."</pre><br />";
                             $x2 = openssl_x509_read(der2pem($d[$k]));
                             $x3 = openssl_x509_parse($x2);
+                            $r .= '<ul>'."\n";
                             foreach ($x3 as $xi => $x4) {
-                                $r .=  $xi .' = ';
+                                $r .=  ' <li>'.$xi .' = ';
                                 if (is_array($x4)) {
+                                    $r .= ' <ul>';
                                     foreach ($x4 as $xii => $x5) {
-                                        $r .= "<br />&nbsp;&nbsp;".$x5;
+                                        $r .=  '  <li>'.$xii .' = ';
+                                        if (is_array($x5)) {
+                                            $r .= '  <ul>';
+                                            foreach ($x5 as $xiii => $x6) {
+                                                $r .= '   <li>'.$x6.'</li>'."\n";
+                                            }
+                                            $r .= ' </ul>';
+                                        } else
+                                            $r .= $x5;
+                                        $r .=  "</li>\n";
                                     }
+                                    $r .= ' </ul>'."\n";
                                 } else
                                     $r .=  $x4 ;
-                                $r .=  "<br />\n";
+                                $r .=  " </li>\n";
                             }
-                            while ($xxx = openssl_error_string())
-                                $r .=  $xxx . " 4<br />\n";
+                            $r .= ' </ul>';
+                            //   while ($xxx = openssl_error_string())
+                            //    $r .=  $xxx . " 4<br />\n";
                         } else if ( $y == "jpegPhoto" ) {
                             $r .= '<br /><pre>skipped ('. strlen($d[$k]) .' Bytes)</pre><br />'."\n";
                         } else if (preg_match("#facsimile#i",$y)){

Modified: trunk/php/timetrack/timetrack_select.php
===================================================================
--- trunk/php/timetrack/timetrack_select.php	2012-11-29 09:06:49 UTC (rev 846)
+++ trunk/php/timetrack/timetrack_select.php	2012-11-29 09:21:29 UTC (rev 847)
@@ -84,7 +84,7 @@
 
         $r .= $this->ContentRowStart('ext');
         $r .= $this->showfieldc($lang['TimetrackRef'],0,'ref');
-        $r .= $this->showdata(select_from_array_or_input($this->obj,"ref",null,1,array(useprojects,usebugtracking,usetaskmanagement)),2);
+        $r .= $this->showdata(select_from_array_or_input($this,"ref",null,1,array(useprojects,usebugtracking,usetaskmanagement)),2);
         $r .= $this->ContentRowEnd();
 
         // add custom selectors

Modified: trunk/php/webelements.p3
===================================================================
--- trunk/php/webelements.p3	2012-11-29 09:06:49 UTC (rev 846)
+++ trunk/php/webelements.p3	2012-11-29 09:21:29 UTC (rev 847)
@@ -57,6 +57,7 @@
             $ly = $current_user->ly;
         } else
             $ly = 'classic_layout';
+
         // use mobile layout if OK here
         if (isset($tutos['mobileok']) && $tutos['mobileok'] == 1 && $tutos['mobilely'] == 1) {
             // check Browser ID
@@ -73,8 +74,16 @@
                 $ly = 'mobile_layout';
             }
         }
+    }
 
+    // Fallback if not ready for mobile
+    if ( preg_match('#^mobile#',$ly) && (!isset($tutos['mobileok']) || $tutos['mobileok'] != 1) ) {
+        if ( isset($current_user->ly) && !empty($current_user->ly) ) {
+            $ly = $current_user->ly;
+        } else
+            $ly = 'classic_layout';
     }
+
     if ( file_exists(getcwd()."/".$tutos['base'].'/php/layout/'. $ly .'.pinc') ) {
         require_once 'layout/'. $ly .'.pinc';
     } else if ( file_exists(getcwd()."/".$tutos['base'].'/php/layout/'. $ly .'_layout.pinc') ) {
@@ -821,8 +830,8 @@
 /**
  * format a value for use with csv files  from
  * "http://de2.php.net/manual/en/function.fputcsv.php#87120"
-* output is always converted to target_enc encoding
-*/
+ * output is always converted to target_enc encoding
+ */
 function txt2csv ($val,$delimiter = '',$enclosure = '') {
     global $tutos;
 
@@ -922,7 +931,7 @@
     $text = preg_replace('#&lt;/([BIU])&gt;#im' ,'</$1>',$text);
     //    $text = preg_replace('#&quot;#m' ,'"',$text);
     if ($ureplace)
-    $text = urlReplace($text,0);
+        $text = urlReplace($text,0);
     if ($ireplace)
         $text = ImgReplace($text,$obj);
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 846
          http://tutos.svn.sourceforge.net/tutos/?rev=846&view=rev
Author:   gokohnert
Date:     2012-11-29 09:06:49 +0000 (Thu, 29 Nov 2012)
Log Message:
-----------
fix mobile

Modified Paths:
--------------
    trunk/php/expense/expense_select.php
    trunk/php/file/file_select.php
    trunk/php/invoice/invoice_select.php
    trunk/php/rate/rate_select.php
    trunk/php/reminder/reminder_select.php
    trunk/php/scrum/log_select.php
    trunk/php/scrum/log_show.php
    trunk/php/scrum/sprint_select.php
    trunk/php/url/url_select.php

Modified: trunk/php/expense/expense_select.php
===================================================================
--- trunk/php/expense/expense_select.php	2012-11-27 09:58:27 UTC (rev 845)
+++ trunk/php/expense/expense_select.php	2012-11-29 09:06:49 UTC (rev 846)
@@ -74,12 +74,12 @@
 
         $r .= $this->ContentRowStart('ext');
         $r .= $this->showfieldc($lang['ExpenseSupplier'],0,'sup');
-        $r .= $this->showdata(select_from_array_or_input($this->obj,"sup",null,1,'cd'),2);
+        $r .= $this->showdata(select_from_array_or_input($this,"sup",null,1,'cd'),2);
         $r .= $this->ContentRowEnd();
 
         $r .= $this->ContentRowStart('ext');
         $r .= $this->showfieldc($lang['ExpenseAddress'],0,'adr');
-        $r .= $this->showdata(select_from_array_or_input($this->obj,"adr",null,1,'at'),2);
+        $r .= $this->showdata(select_from_array_or_input($this,"adr",null,1,'at'),2);
         $r .= $this->ContentRowEnd();
 
         $r .= $this->ContentRowStart('ext');
@@ -89,7 +89,7 @@
 
         $r .= $this->ContentRowStart('ext');
         $r .= $this->showfieldc($lang['ExpenseCreator'],0,'cr');
-        $r .= $this->showdata(select_from_array_or_input($this->obj,"cr",null,1,'a'),2);
+        $r .= $this->showdata(select_from_array_or_input($this,"cr",null,1,'a'),2);
         $r .= $this->ContentRowEnd();
 
         $r .= $this->ContentRowStart('ext');

Modified: trunk/php/file/file_select.php
===================================================================
--- trunk/php/file/file_select.php	2012-11-27 09:58:27 UTC (rev 845)
+++ trunk/php/file/file_select.php	2012-11-29 09:06:49 UTC (rev 846)
@@ -40,13 +40,16 @@
         $this->addHidden('ext',$this->ext);
         $r.= $this->headline($lang['SearchForFile']);
 
-        $r .= "<tr>\n";
+        $r .= $this->ContentRowStart();
         $r .= $this->showfieldc($lang['AdrName'],0,'name');
         $r .= " <td><input id=\"name\" type=\"text\" value=\"\" name=\"name\" /></td>\n";
         $r .= ' <td><input type="submit" value="'. $lang['Search'] .'" title="'. $lang['SearchForFile'] ."\" /></td>\n";
+        $r .= $this->ContentRowEnd();
 
-        $r .= "</tr><tr>\n";
+        $r .= $this->ContentRowStart();
         $r .= ' <td colspan="3" align="right"><span id="toggler">'. $lang['extended'] ."</span></td>\n";
+        $r .= $this->ContentRowEnd();
+
         $tutos['pagescript'] .= "
 $( \"#toggler\" ).click(function() {
             $(\".ext\").toggle();
@@ -65,40 +68,31 @@
 \n";
         }
 
-        $r .= "</tr><tr class=\"ext\">\n";
+
+        $r .= $this->ContentRowStart('ext');
         $r .= $this->showfieldc(sprintf($lang['FileReference'],''),0,"link_");
-        $r .= '<td colspan="2">';
-        $r .= select_from_array_or_input($this->obj,"link_",null,1,get_parent_classes('file'));
-        $r .= "</td>\n";
+        $r .= $this->showdata(select_from_array_or_input($this,"link_",null,1,get_parent_classes('file')),2);
+        $r .= $this->ContentRowEnd();
 
-        $r .= "</tr><tr class=\"ext\">\n";
+        $r .= $this->ContentRowStart('ext');
         $r .= $this->showfieldc(sprintf($lang['FileAuthor'],''),0,"author");
-        $r .= '<td colspan="2">';
-        $r .= select_from_array_or_input($this->obj,"author",null,1,'a');
-        $r .= "</td>\n";
+        $r .= $this->showdata(select_from_array_or_input($this,"author",null,1,'a'),2);
+        $r .= $this->ContentRowEnd();
 
-        $r .= "</tr><tr class=\"ext\">\n";
-        $r .= " <td rowspan=\"2\" class=\"desc\">". $lang['TaskBetween'] ."</td>\n";
-        $r .= " <td colspan=\"2\">";
-        $r .= $this->fd->EnterDate("f",1);
-        $r .= "</td>\n";
+        $r .= $this->ContentRowStart('ext');
+        $r .= $this->showfieldc($lang['TaskBetween']);
+        $r .= $this->showdata($this->fd->EnterDate("f",1).' - '.$this->td->EnterDate("t",1),2);
+        $r .= $this->ContentRowEnd();
 
-        $r .= "</tr><tr class=\"ext\">\n";
-        $r .= " <td colspan=\"2\">";
-        $r .= $this->td->EnterDate("t",1);
-        $r .= "</td>\n";
-
         // add custom selectors
         $x = get_custom_selectors('file');
         foreach ($x as $s) {
-            $r .= "</tr><tr class=\"ext\">\n";
+            $r .= $this->ContentRowStart('ext');
             $r .= $this->showfieldc($s[0]);
-            $r .= " <td colspan=\"2\">\n";
-            $r .= $s[1];
-            $r .= " </td>\n";
+            $r .= $this->showdata($s[1],2);
+            $r .= $this->ContentRowEnd();
         }
 
-        $r .= "</tr>\n";
         $r .= $this->SelectTableEnd();
         $r .= hiddenFormElements();
         $r .= $this->getHidden();

Modified: trunk/php/invoice/invoice_select.php
===================================================================
--- trunk/php/invoice/invoice_select.php	2012-11-27 09:58:27 UTC (rev 845)
+++ trunk/php/invoice/invoice_select.php	2012-11-29 09:06:49 UTC (rev 846)
@@ -85,7 +85,7 @@
 
         $r .= $this->ContentRowStart('ext');
         $r .= $this->showfieldc(sprintf($lang['InvoiceCustomer'],''),0,'customer');
-        $r .= $this->showdata(select_from_array_or_input($this->obj,"customer",null,1,'atcdD'),2);
+        $r .= $this->showdata(select_from_array_or_input($this,"customer",null,1,'atcdD'),2);
         $r .= $this->ContentRowEnd();
 
         // add custom selectors

Modified: trunk/php/rate/rate_select.php
===================================================================
--- trunk/php/rate/rate_select.php	2012-11-27 09:58:27 UTC (rev 845)
+++ trunk/php/rate/rate_select.php	2012-11-29 09:06:49 UTC (rev 846)
@@ -14,6 +14,8 @@
 
 // Check if user is allowed to use it
 check_user();
+
+$tutos['mobileok'] = 1;
 loadmodules('rate','select');
 loadmodule('rate');
 loadlayout();
@@ -37,14 +39,16 @@
         $r .= $this->SelectTableStart();
         $r.= $this->headline($lang['SearchForRate']);
 
-        $r .= "<tr>\n";
+        $r .= $this->ContentRowStart();
         $r .= $this->showfieldc($lang['RateName']);
-        $r .= " <td align=\"center\">&nbsp;<input type=\"text\" value=\"\" name=\"name\"></td>\n";
-        $r .= ' <td><input type="submit" value="'. $lang['Search'] .'" title="'.$lang['Search']."\" /></td>\n";
-        $r .= "</tr>\n";
+        $r .= $this->showdata('<input id="name" type="text" value="" name="name" />');
+        $r .= $this->showdata('<input type="submit" value="'. $lang['Search'] .'" />');
+        $r .= $this->ContentRowEnd();
 
-        $r .= "<tr>\n";
-        $r .= ' <td colspan="3" align="right"><span style="text-align:right;" id="toggler">'. $lang['extended'] ."</span></td>\n";
+        $r .= $this->ContentRowStart();
+        $r .= ' <td colspan="3" align="right"><span id="toggler">'. $lang['extended'] ."</span></td>\n";
+        $r .= $this->ContentRowEnd();
+
         $tutos['pagescript'] .= "
 $( \"#toggler\" ).click(function() {
             $(\".ext\").toggle();
@@ -61,18 +65,31 @@
             $(\".ext\").hide();
 \n";
         }
-        $r .= "</tr>\n";
 
-        $r .= "<tr class=\"ext\">\n";
+        $r .= $this->ContentRowStart('ext');
         $r .= $this->showfieldc($lang['RateReference']);
-        $r .= ' <td colspan="2">&nbsp;<b>'. $this->RateAskRefType($this->rsrt,0) ."</b>&nbsp;</td>\n";
-        $r .= "</tr>\n";
+        $r .= $this->showdata($this->RateAskRefType($this->rsrt,0),2);
+        $r .= $this->ContentRowEnd();
 
+        // add custom selectors
+        $x = get_custom_selectors('reminder');
+        foreach ($x as $s) {
+            $r .= $this->ContentRowStart('ext');
+            $r .= $this->showfieldc($s[0]);
+            $r .= $this->showdata($s[1],2);
+            $r .= $this->ContentRowEnd();
+        }
+
         $r .= $this->SelectTableEnd();
         $r .= hiddenFormElements();
         $r .= $this->getHidden();
         $r .= "</form>\n";
 
+        // shortcuts with urls
+        if (class_exists('url')) {
+            $r .= url::getFastSelect($this);
+        }
+
         $r .= $this->setfocus("ratesearch.name");
         return $r;
     }

Modified: trunk/php/reminder/reminder_select.php
===================================================================
--- trunk/php/reminder/reminder_select.php	2012-11-27 09:58:27 UTC (rev 845)
+++ trunk/php/reminder/reminder_select.php	2012-11-29 09:06:49 UTC (rev 846)
@@ -68,12 +68,12 @@
 
         $r .= $this->ContentRowStart('ext');
         $r .= $this->showfieldc(sprintf($lang['ReminderReference'],''),0,'ref');
-        $r .= $this->showdata(select_from_array_or_input($this->obj,'ref',null,1,'all'),2);
+        $r .= $this->showdata(select_from_array_or_input($this,'ref',null,1,'all'),2);
         $r .= $this->ContentRowEnd();
 
         $r .= $this->ContentRowStart('ext');
         $r .= $this->showfieldc(sprintf($lang['ReminderTo'],''),0,'to');
-        $r .= $this->showdata(select_from_array_or_input($this->obj,'to',null,1,'at'),2);
+        $r .= $this->showdata(select_from_array_or_input($this,'to',null,1,'at'),2);
         $r .= $this->ContentRowEnd();
 
         $r .= $this->ContentRowStart('ext');

Modified: trunk/php/scrum/log_select.php
===================================================================
--- trunk/php/scrum/log_select.php	2012-11-27 09:58:27 UTC (rev 845)
+++ trunk/php/scrum/log_select.php	2012-11-29 09:06:49 UTC (rev 846)
@@ -70,19 +70,19 @@
 
         $r .= $this->ContentRowStart('ext');
         $r .= $this->showfieldc($lang['ScrumLogSprint'],0,"s_id");
-        $x = select_from_array_or_input($this->obj,"s_",null,1,array(USESCRUMSPRINT));
+        $x = select_from_array_or_input($this,"s_",null,1,array(USESCRUMSPRINT));
         $x .= '<input type="checkbox" name="nos" id="nos" value="1"><strike>'.$lang['Sprint'].'</strike></input>';
         $r .= $this->showdata($x,2);
         $r .= $this->ContentRowEnd();
 
         $r .= $this->ContentRowStart('ext');
         $r .= $this->showfieldc($lang['ScrumLogPref'],0,"p_id");
-        $r .= $this->showdata(select_from_array_or_input($this->obj,"p_",null,1,array(useprojects)),2);
+        $r .= $this->showdata(select_from_array_or_input($this,"p_",null,1,array(useprojects)),2);
         $r .= $this->ContentRowEnd();
 
         $r .= $this->ContentRowStart('ext');
         $r .= $this->showfieldc($lang['ScrumLogWorker'],0,"w_id");
-        $r .= $this->showdata(select_from_array_or_input($this->obj,"w_",null,1,array(useaddressbook)),2);
+        $r .= $this->showdata(select_from_array_or_input($this,"w_",null,1,array(useaddressbook)),2);
         $r .= $this->ContentRowEnd();
 
         $r .= $this->ContentRowStart('ext');

Modified: trunk/php/scrum/log_show.php
===================================================================
--- trunk/php/scrum/log_show.php	2012-11-27 09:58:27 UTC (rev 845)
+++ trunk/php/scrum/log_show.php	2012-11-29 09:06:49 UTC (rev 846)
@@ -17,6 +17,8 @@
 
 /* Check if user is allowed to use it */
 check_user();
+
+$tutos['mobileok'] = 1;
 loadmodules('scrumlog','show');
 loadmodule('scrumlog');
 loadlayout();

Modified: trunk/php/scrum/sprint_select.php
===================================================================
--- trunk/php/scrum/sprint_select.php	2012-11-27 09:58:27 UTC (rev 845)
+++ trunk/php/scrum/sprint_select.php	2012-11-29 09:06:49 UTC (rev 846)
@@ -70,7 +70,7 @@
 
         $r .= $this->ContentRowStart('ext');
         $r .= $this->showfieldc($lang['SprintRef'],0,"p_id");
-        $r .= $this->showdata(select_from_array_or_input($this->obj,"p_",null,1,array(useprojects)),2);
+        $r .= $this->showdata(select_from_array_or_input($this,"p_",null,1,array(useprojects)),2);
         $r .= $this->ContentRowEnd();
 
         $r .= $this->ContentRowStart('ext');

Modified: trunk/php/url/url_select.php
===================================================================
--- trunk/php/url/url_select.php	2012-11-27 09:58:27 UTC (rev 845)
+++ trunk/php/url/url_select.php	2012-11-29 09:06:49 UTC (rev 846)
@@ -71,7 +71,7 @@
 
         $r .= $this->ContentRowStart('ext');
         $r .= $this->showfieldc($lang['Reference'],0,"link");
-        $r .= $this->showdata(select_from_array_or_input($this->obj,"link_",null,1,'all'),2);
+        $r .= $this->showdata(select_from_array_or_input($this,"link_",null,1,'all'),2);
         $r .= $this->ContentRowEnd();
 
         // add custom selectors

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 845
          http://tutos.svn.sourceforge.net/tutos/?rev=845&view=rev
Author:   gokohnert
Date:     2012-11-27 09:58:27 +0000 (Tue, 27 Nov 2012)
Log Message:
-----------
fix

Modified Paths:
--------------
    trunk/php/url/url_select.php

Modified: trunk/php/url/url_select.php
===================================================================
--- trunk/php/url/url_select.php	2012-11-26 15:00:28 UTC (rev 844)
+++ trunk/php/url/url_select.php	2012-11-27 09:58:27 UTC (rev 845)
@@ -39,6 +39,7 @@
         $r = '';
         $r .= "<form id=\"urlsearch\" name=\"urlsearch\" method=\"get\" action=\"url_overview.php\">\n";
         $r .= $this->SelectTableStart();
+        $this->addHidden('ext',$this->ext);
         $r .= $this->headline($lang['SearchForURL']);
 
         $r .= $this->ContentRowStart();
@@ -111,6 +112,11 @@
             $msg .= sprintf($lang['Err0022'],"'". $this->name ."'");
             $this->stop = true;
         }
+        if ( ! isset($_GET['ext']) ) {
+            $this->ext = 0;
+        } else {
+            $this->ext = $_GET['ext'];
+        }
     }
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 844
          http://tutos.svn.sourceforge.net/tutos/?rev=844&view=rev
Author:   gokohnert
Date:     2012-11-26 15:00:28 +0000 (Mon, 26 Nov 2012)
Log Message:
-----------
fix

Modified Paths:
--------------
    trunk/php/layout/layout_base.pinc

Modified: trunk/php/layout/layout_base.pinc
===================================================================
--- trunk/php/layout/layout_base.pinc	2012-11-23 08:16:32 UTC (rev 843)
+++ trunk/php/layout/layout_base.pinc	2012-11-26 15:00:28 UTC (rev 844)
@@ -239,7 +239,10 @@
 
         // load on demand
         foreach(array_unique($tutos['js_to_load']) as $path) {
-            $r .= '  <script type="text/javascript" language="JavaScript" src="'.$tutos['base'].$path.'"></script>'."\n";
+            if(preg_match('#^http#i',$path))
+                $r .= '  <script type="text/javascript" language="JavaScript" src="'.$path.'"></script>'."\n";
+            else
+                $r .= '  <script type="text/javascript" language="JavaScript" src="'.$tutos['base'].$path.'"></script>'."\n";
         }
 
         // Check the language for datepicker
@@ -800,7 +803,7 @@
         $r = '';
 
         if ( isset($tarr['hide']) && ($tarr['hide'] == true) ) return $r;
-#        if ( isset($tarr['hideempty']) && ($tarr['hideempty'] == true) && ($obj->$tarr['field'] == '') ) return $r;
+        #        if ( isset($tarr['hideempty']) && ($tarr['hideempty'] == true) && ($obj->$tarr['field'] == '') ) return $r;
 
 
         $r .= edit_custom_field_single($this,$tarr['field'],$tarr,0,$obj,$colsd+$colsf);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 843
          http://tutos.svn.sourceforge.net/tutos/?rev=843&view=rev
Author:   gokohnert
Date:     2012-11-23 08:16:32 +0000 (Fri, 23 Nov 2012)
Log Message:
-----------
new editable testspec simulation

Modified Paths:
--------------
    trunk/html/js/tutos.js
    trunk/php/testmanager/default.css
    trunk/php/testmanager/testcase_ins.php
    trunk/php/testmanager/testmanager.pinc
    trunk/php/testmanager/testsuite_show.php

Modified: trunk/html/js/tutos.js
===================================================================
--- trunk/html/js/tutos.js	2012-11-23 07:09:55 UTC (rev 842)
+++ trunk/html/js/tutos.js	2012-11-23 08:16:32 UTC (rev 843)
@@ -21,7 +21,54 @@
 });
 
  /**
-  * afunction to switch table tbody elements
+  * handle editable areas
+  * code will add form elements when click into an area 
+ */
+$(document).ready(function(){
+$('.editable').click(function(event) {
+  var t = $(this).html();
+  var id = this.id;
+  //$("#RESULT").append("<br>click:"+id+" "+ $(this).height()+" "+$(this).innerHeight()+" "+$(this).outerHeight());
+  //$("#RESULT").append("<br>click:"+id+" "+ $(this).width()+" "+$(this).innerWidth()+" "+$(this).outerWidth());
+  if ($("#I"+id).length > 0){
+    //$("#RESULT").append("<br>exists: I"+id);
+    // was already once modified
+    $("#I"+id).show();
+  } else {
+    //$("#RESULT").append("<br>create: I"+id);
+    if ($(this).hasClass("editableta")) {
+      $(this).after("<textarea id=\"I"+id+"\" name=\"I"+id+"\" >"+t+"</textarea>");
+    } else {
+		$(this).after("<input id=\"I"+id+"\" name=\"I"+id+"\" value=\""+t.replace(/\"/g,"&quot;")+"\" />");
+    }
+    $("#I"+id).val(t);
+    $("#I"+id).width($(this).width()).height($(this).height());
+    $("#I"+this.id).blur(function(event) {
+      var i1 = $(this).val();   // new value
+      //alert(i2 + " -> "+ i1);
+      if (t != i1) {
+        //$("#RESULT").append("<br>modified  "+$(this).height());
+        //$("#RESULT").append("<br>modified  "+$(this).width());
+        $("#"+id).css("background","red");
+        $("#"+id).html(i1);
+		// $("#"+id).height($(this).height()).width($(this).width());
+        $(this).css("background","red");
+        $(this).hide();
+      } else {
+        $("#"+id).css("background","");
+        $(this).remove();
+      }
+      $("#"+id).html(i1);
+      $("#"+id).show();
+    });
+  }
+  $("#I"+id).focus();
+  $(this).hide();
+});
+});
+
+ /**
+  * a function to switch table tbody elements
   */
  function tbodyswitcher(cname) {
 	 $(cname).not("td").addClass("tgrpbody").hide();

Modified: trunk/php/testmanager/default.css
===================================================================
--- trunk/php/testmanager/default.css	2012-11-23 07:09:55 UTC (rev 842)
+++ trunk/php/testmanager/default.css	2012-11-23 08:16:32 UTC (rev 843)
@@ -15,6 +15,20 @@
  *
  */
 
+.ts_head_line {
+    min-width: 25em;
+    min-height: 1em;
+}
+
+.ts_head_desc {
+    min-width: 25em;
+    min-height: 2em;
+}
+
+.tc_steps, .tc_exp {
+    min-height: 2em;
+}
+
 .TCid {
     min-width: 15em;
     max-width: 15em;

Modified: trunk/php/testmanager/testcase_ins.php
===================================================================
--- trunk/php/testmanager/testcase_ins.php	2012-11-23 07:09:55 UTC (rev 842)
+++ trunk/php/testmanager/testcase_ins.php	2012-11-23 08:16:32 UTC (rev 843)
@@ -53,7 +53,7 @@
     }
 
 
-    if ( isset($_POST['expected_'.$i]) && !empty($_POST['expected_'.$i]) ) {
+    if ( isset($_POST['expected_'.$i]) ) {
         $obj[$i]->setExpected($_POST['expected_'.$i]);
         $gotourl= addUrlParameter($gotourl,'expected_'.$i.'='. UrlEncode($obj[$i]->expected),true);
         $use = true;

Modified: trunk/php/testmanager/testmanager.pinc
===================================================================
--- trunk/php/testmanager/testmanager.pinc	2012-11-23 07:09:55 UTC (rev 842)
+++ trunk/php/testmanager/testmanager.pinc	2012-11-23 08:16:32 UTC (rev 843)
@@ -796,15 +796,14 @@
         $r .= ' <td rowspan="2" class="inputrow tcresult_'.$this->result.'" width="30" valign="top" align="right"><a id="id'.$this->id.'">'.($cnt != null ? $prefix.$cnt:'') .'</a>&nbsp;';
         if ($this->mod_ok() && ($this->activ != 1) && !isset($this->test) ) {
             $r .= '<br /><br /><br />';
-            $r .= "Pos:<input size=\"3\" id=\"P".$this->id."t\" value=\"".$this->pos."\" style=\"display:none;\" "enableTextEdit('P".$this->id."')\" "disableTextEdit('P".$this->id."');\" />";
-            $r .= "<span id=\"P".$this->id."p\" "enableTextEdit('P".$this->id."');\">".$this->pos."</span>&nbsp;";
+            $r .= 'Pos:<span class="editable" id="P'.$this->id.'t">'.$this->pos.'</span>';
         }
         $r .= " </td>\n";
         $r .= ' <td rowspan="2" class="inputrow" width="110" valign="top">&nbsp;';
 
+        // Name of Testcase
         if ($this->mod_ok() && ($this->activ != 1) && !isset($this->test) ) {
-            $r .= '<input size="8" id="N'.$this->id.'t" value="'.myentities($this->name)."\" style=\"display:none;\" "enableTextEdit('N".$this->id."')\" "disableTextEdit('N".$this->id."');\" />";
-            $r .= '<span id="N'.$this->id."p\" "enableTextEdit('N".$this->id."');\">".myentities($this->getFullName())."</span>";
+            $r .= '<span class="editable" id="N'.$this->id.'t">'.$this->name.'</span>';
         } else {
             $r .= myentities($this->getFullName());
         }
@@ -821,20 +820,15 @@
         $r .= ' <td rowspan="2" class="TCsteps inputrowborder" style="max-width:'.TCCOLS.'em;" valign="top">';
         $txt = $this->getSteps();
         if ($this->mod_ok() && ($this->activ != 1) && !isset($this->test) ) {
-            $r .= '<textarea cols="'. TCCOLS .'" rows="'.count(explode("\n",$txt)).'" id="S'.$this->id."t\" style=\"display:none;\" "enableTextEdit('S".$this->id."');\" "disableTextEdit('S".$this->id."');\">";
-            $r .= myentities($this->steps);
-            $r .= '</textarea>';
-            $r .= '<pre id="S'.$this->id."p\" style=\"width:".TCCOLS."em;\" "enableTextEdit('S".$this->id."');\">";
-            $r .= $txt;
-            $r .= '</pre>';
+            $r .= '<pre style="width:'. TCCOLS .'" class="tc_steps editable editableta" id="S'.$this->id.'t" >';
         } else {
             $r .= '<pre id="S'.$this->id.'p" style="max-width:'.TCCOLS.'em;">';
             if (class_exists('Bug')) {
                 $txt = preg_replace('#('.Bug::get_bug_regex().')#m'  ,'<a href="'.normalize_url($url).'$1">$1</a>',$txt);
             }
-            $r .= $txt;
-            $r .= '</pre>';
         }
+        $r .= $txt;
+        $r .= '</pre>';
         $r .= '&nbsp;';
         $r .= '</td>'."\n";
 
@@ -842,20 +836,15 @@
         $r .= ' <td class="TCexpected inputrowborder2" style="max-width:'.TCCOLS.'em;" valign="top">';
         $txt = $this->getExpected();
         if ($this->mod_ok() && ($this->activ != 1) && !isset($this->test) ) {
-            $r .= '<textarea cols="'.TCCOLS.'" rows="'.count(explode("\n",$txt)).'" id="E'.$this->id."t\" style=\"display:none;\" "enableTextEdit('E".$this->id."');\" "disableTextEdit('E".$this->id."');\">";
-            $r .= myentities($this->expected);
-            $r .= '</textarea>';
-            $r .= '<pre id="E'.$this->id."p\" style=\"width:".TCCOLS."em;\" "enableTextEdit('E".$this->id."');\">";
-            $r .= $txt;
-            $r .= '</pre>';
+            $r .= '<pre style="width:'. TCCOLS .'" class="tc_exp editable editableta" id="E'.$this->id.'t" >';
         } else {
             $r .= '<pre id="E'.$this->id.'p" style="max-width:'.TCCOLS.'em;">';
             if (class_exists('Bug')) {
                 $txt = preg_replace('#('.Bug::get_bug_regex().')#m'  ,'<a href="'.normalize_url($url).'$1">$1</a>',$txt);
             }
-            $r .= $txt;
-            $r .= '</pre>';
         }
+        $r .= $txt;
+        $r .= '</pre>';
         $r .= '&nbsp;';
         $r .= '</td>'."\n";
 
@@ -2687,8 +2676,7 @@
         $url = addUrlParameter($url,'prefix='.$prefix);
 
         if ($obj->mod_ok() && ($obj->activ != 1) && !isset($obj->test)  && ($obj->state != TS_RELEASED) ) {
-            $r .= '<input id="N'.$obj->id."t\" style=\"display:none;\" "enableTextEdit('N".$obj->id."');\" "disableTextEdit('N".$obj->id."');\" value=\"" . myentities($obj->name). '" />';
-            $r .= '<div id="N'.$obj->id."p\" "enableTextEdit('N".$obj->id."');\">".$obj->name."</div>";
+            $r .= '<span class="ts_head_line editable" id="N'.$obj->id.'t">'.myentities($obj->name).'</span>';
         } else {
             $r .= makelink($url,myentities($obj->name));
         }
@@ -2703,10 +2691,7 @@
         $r .= '<tr>';
         $r .= '<td colspan="'.($cols-1).'" style="width:'.TSCOLS.'em">';
         if ($obj->mod_ok() && ($obj->activ != 1) && !isset($obj->test) && ($obj->state != TS_RELEASED)  ) {
-            $r .= '<textarea cols="'.TSCOLS.'" rows="'.count(explode("\n",$txt)).'" id="D'.$obj->id."t\" style=\"display:none;\" "enableTextEdit('D".$obj->id."');\" "disableTextEdit('D".$obj->id."');\">";
-            $r .= myentities($obj->desc);
-            $r .= '</textarea>';
-            $r .= '<pre id="D'.$obj->id."p\" "enableTextEdit('D".$obj->id."');\">";
+            $r .= '<pre style="width:'.TSCOLS.'em;" class="ts_head_desc editable editableta" id="D'.$obj->id.'t">';
         } else {
             $r .= '<pre style="width:'.TSCOLS.'em;">';
         }

Modified: trunk/php/testmanager/testsuite_show.php
===================================================================
--- trunk/php/testmanager/testsuite_show.php	2012-11-23 07:09:55 UTC (rev 842)
+++ trunk/php/testmanager/testsuite_show.php	2012-11-23 08:16:32 UTC (rev 843)
@@ -36,27 +36,15 @@
  */
 class Testsuite_show extends layout {
     /**
-     * show the output as we will see it in a testrun
+     * update testspec
+     *
      */
-    Function sim_info() {
-        global $lang;
+    function sim_update () {
+        global $msg,$info;
 
-        $r = '';
-        $r .= '<script language="JavaScript" type="text/javascript" src="testmanager.js"></script>'."\n";
-        $link = 'testmanager/testsuite_show.php?mode=simulate&id='.$this->obj->id;
-        $nav = $this->getSubSession();
-        $nav['link'] = $link;
-        $nav['list'] = array();
-
-        $ss = $this->putSubSession($nav);
-
-        // temporary testrun object
-        $x = new testrun($this->obj->dbconn);
-        $x->test = true;
-        $x->activ = false;
-
         // Handle Updates
-        $mod = array();
+        $mod  = array();
+        $mod2 = array(); // what to clear afterwards
         foreach ($_POST as $p => $q) {
             if (preg_match("/^NZP([0-9]*)t(.*)$/",$p,$regs)) {
                 if ($q == '') continue;
@@ -74,8 +62,10 @@
                 $ox->setDesc($desc);
                 $ox->setReference($o->id);
 
+                $mod2['P'.$o->id] = $o;
                 $mod['P'.$o->id] = $ox;
                 unset($ox);
+                unset($o);
             } else if (preg_match("/^NP([0-9]*)t(.*)$/",$p,$regs)) {
                 // add a new TS before given object
                 $id = $regs[1];
@@ -92,6 +82,8 @@
                 $ox->setReference($o->ref_id);
                 // find and fix positions
                 $ox->setPosition($o->pos -1);
+                $o->read_reference();
+                $mod2['P'.$o->ref_id] = $o->ref;
                 $mod['P'.$o->id] = $ox;
                 unset($ox);
             } else if (preg_match("/^NXP([0-9]*)t(.*)$/",$p,$regs)) {
@@ -117,6 +109,7 @@
                     unset($oxx);
                 }
                 $ox->setPosition($max+1);
+                $mod2['P'.$id] = $o;
                 $mod[uniqid()] = $ox;
             } else if (preg_match("/^NCP([0-9]*)t(.*)$/",$p,$regs)) {
                 if ($q == '') continue;
@@ -149,8 +142,9 @@
                     }
                     unset($ox);
                 }
-
-            } else if (preg_match("/^D([0-9]*)t$/",$p,$regs)) {
+                $mod2['P'.$o->ref_id] = $o->ref;
+            } else if (preg_match("/^ID([0-9]*)t$/",$p,$regs)) {
+                // exisiting testsuite description
                 $id = $regs[1];
                 $o  = getObject($this->dbconn,$id);
                 if (!is_object($o)) continue;
@@ -158,12 +152,13 @@
                     $r .= sprintf($lang['Err0024'],$o->getLink());
                     continue;
                 }
-                $res = $o->setDesc($q);
+                $res = $o->setDesc($q); // if changed
                 if($res) {
                     $mod[$o->id] = $o;
                 }
                 unset($o);
-            } else if (preg_match("/^S([0-9]*)t$/",$p,$regs)) {
+            } else if (preg_match("/^IS([0-9]*)t$/",$p,$regs)) {
+                // existing testcase steps
                 $id = $regs[1];
                 $o  = getObject($this->dbconn,$id);
                 if (!is_object($o)) continue;
@@ -171,12 +166,13 @@
                     $r .= sprintf($lang['Err0024'],$o->getLink());
                     continue;
                 }
-                $res = $o->setSteps($q);
+                $res = $o->setSteps($q); // if changed
                 if($res) {
                     $mod[$o->id] = $o;
                 }
                 unset($o);
-            } else if (preg_match("/^E([0-9]*)t$/",$p,$regs)) {
+            } else if (preg_match("/^IE([0-9]*)t$/",$p,$regs)) {
+                // existing testcase expectation
                 $id = $regs[1];
                 $o  = getObject($this->dbconn,$id);
                 if (!is_object($o)) continue;
@@ -184,12 +180,13 @@
                     $r .= sprintf($lang['Err0024'],$o->getLink());
                     continue;
                 }
-                $res = $o->setExpected($q);
+                $res = $o->setExpected($q); // if changed
                 if($res) {
                     $mod[$o->id] = $o;
                 }
                 unset($o);
-            } else if (preg_match("/^N([0-9]*)t$/",$p,$regs)) {
+            } else if (preg_match("/^IN([0-9]*)t$/",$p,$regs)) {
+                // existing testcase name
                 $id = $regs[1];
                 $o  = getObject($this->dbconn,$id);
                 if (!is_object($o)) continue;
@@ -202,7 +199,8 @@
                     $mod[$o->id] = $o;
                 }
                 unset($o);
-            } else if (preg_match("/^P([0-9]*)t$/",$p,$regs)) {
+            } else if (preg_match("/^IP([0-9]*)t$/",$p,$regs)) {
+                // existing testcase position
                 $id = $regs[1];
                 $o  = getObject($this->dbconn,$id);
                 if (!is_object($o)) continue;
@@ -210,7 +208,7 @@
                     $r .= sprintf($lang['Err0024'],$o->getLink());
                     continue;
                 }
-                $res = $o->setPosition($q);
+                $res = $o->setPosition($q); // if changed
                 if($res) {
                     $mod[$o->id] = $o;
                 }
@@ -218,12 +216,41 @@
             }
             unset($_POST[$p]);
         }
+        // run over all modifications
         foreach ($mod as $o) {
             $msg = $o->save();
             unset($o->list[usetestcase]);
             unset($o->list[usetestsuite]);
-            $r .= 'Update: '.$o->getLink().' '.$msg.'<br />';
+            $info = addLine($info,'Update: '.$o->getLink().' '.$msg);
         }
+        foreach ($mod2 as $o) {
+            unset($o->list[usetestcase]);
+            unset($o->list[usetestsuite]);
+            // $info = addLine($info,'Clear: '.$o->getLink().' '.$msg);
+        }
+        return;
+    }
+
+    /**
+     * show the output as we will see it in a testrun
+     */
+    Function sim_info() {
+        global $lang;
+
+        $r = '';
+        $r .= '<script language="JavaScript" type="text/javascript" src="testmanager.js"></script>'."\n";
+        $link = 'testmanager/testsuite_show.php?mode=simulate&id='.$this->obj->id;
+        $nav = $this->getSubSession();
+        $nav['link'] = $link;
+        $nav['list'] = array();
+
+        $ss = $this->putSubSession($nav);
+
+        // temporary testrun object
+        $x = new testrun($this->obj->dbconn);
+        $x->test = true;
+        $x->activ = false;
+
         $r .= '<form action="testsuite_show.php?mode=simulate&amp;id='.$this->obj->id.'" method="post">';
         $this->nav['link'] = '';
         $r .= $this->DataTableStart();
@@ -380,6 +407,9 @@
         if (isset($_GET['mode'])) {
             $this->mode = $_GET['mode'];
         }
+        if ($this->mode == 'simulate') {
+            $this->sim_update();
+        }
         if ( isset($_GET['id']) ) {
             $this->obj = $this->obj->read($_GET['id'],$this->obj);
         } else {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 842
          http://tutos.svn.sourceforge.net/tutos/?rev=842&view=rev
Author:   gokohnert
Date:     2012-11-23 07:09:55 +0000 (Fri, 23 Nov 2012)
Log Message:
-----------
fix loosing groups when ldap update

Modified Paths:
--------------
    trunk/php/group/group.pinc
    trunk/php/group/mconfig.pinc
    trunk/php/ldap/ldap.pinc
    trunk/php/ldap/ldap_show.php
    trunk/php/ldap/mconfig.pinc
    trunk/php/module_base.pinc
    trunk/php/report-engine/mconfig.pinc
    trunk/php/report-engine/reporter.pinc

Modified: trunk/php/group/group.pinc
===================================================================
--- trunk/php/group/group.pinc	2012-11-16 10:23:59 UTC (rev 841)
+++ trunk/php/group/group.pinc	2012-11-23 07:09:55 UTC (rev 842)
@@ -58,7 +58,7 @@
      * Return a url that displays this group
      */
     function read_member() {
-        global $current_user;
+
         if ( count($this->member) > 0 ) {
             return;
         }
@@ -345,7 +345,7 @@
      * Read a list of groups related to the object
      */
     static function obj_read(tutos_base $obj) {
-        global $current_user,$table;
+        global $table,$tutos;
 
         if ( isset($obj->list[usegroups]) ) {
             return;
@@ -382,6 +382,7 @@
             $a++;
         }
         $r->free();
+
         return;
     }
 
@@ -389,7 +390,7 @@
      * obj is deleted
      */
     static function obj_delete (tutos_user $user,tutos_base $obj) {
-        global $table;
+        global $table,$tutos;
 
         $msg = '';
         // Delete the old memberships
@@ -403,25 +404,28 @@
      * obj is saved
      */
     static function obj_save (tutos_user $user,tutos_base $obj) {
-        global $table;
+        global $table,$tutos;
 
+        $msg = '';
 
-        $msg = '';
+        if ( !isset( $obj->groupmemberlist ) ) {
+            return $msg;
+        }
+
         if ( ! $obj->obj_feature_ok($user,usegroups,PERM_NEW) ) return $msg;
 
         // Delete the old memberships
         group::obj_delete($user,$obj);
         // Save the new memberships
-        if ( isset( $obj->groupmemberlist ) ) {
-            foreach($obj->groupmemberlist as $i => $f) {
-                $q = 'INSERT INTO '. $obj->dbconn->prefix .$table['group2'][name] .' (group_id,obj_id,m_comment,creation)';
-                $q .= ' VALUES ('.$i.','.$obj->id;
-                $q .= ','.$obj->dbconn->String($f[1]);
-                $q .= ','.$obj->dbconn->DateTime($f[2]).')';
-                $r = $obj->dbconn->Exec($q);
-                $r->free();
-            }
+        foreach($obj->groupmemberlist as $i => $f) {
+            $q = 'INSERT INTO '. $obj->dbconn->prefix .$table['group2'][name] .' (group_id,obj_id,m_comment,creation)';
+            $q .= ' VALUES ('.$i.','.$obj->id;
+            $q .= ','.$obj->dbconn->String($f[1]);
+            $q .= ','.$obj->dbconn->DateTime($f[2]).')';
+            $r = $obj->dbconn->Exec($q);
+            $r->free();
         }
+
         return $msg;
     }
 
@@ -640,5 +644,5 @@
         $r .= "</ul>\n";
         return $r;
     }
-  }
-?>
+}
+?>
\ No newline at end of file

Modified: trunk/php/group/mconfig.pinc
===================================================================
--- trunk/php/group/mconfig.pinc	2012-11-16 10:23:59 UTC (rev 841)
+++ trunk/php/group/mconfig.pinc	2012-11-23 07:09:55 UTC (rev 842)
@@ -1,17 +1,21 @@
 <?php
 /*
- * Copyright 2002 - 2011 by Gero Kohnert
+ * Copyright 2002 - 2012 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
+ *  Free Software Foundation; version 2 of the License.
+ *
  * Module specific configuration
  *
  *  SVN Info  $Id$
  *  $Author$
  */
 
-#
-# Every module must have an individual ID ( < 100 ).
-# this is module 99
-#
+//
+// Every module must have an individual ID ( < 100 ).
+// this is module 99
+//
 define('usegroups',-99);
 $tutos[modules]['group'] = array(
     name => "group",
@@ -20,16 +24,16 @@
     'overview' => "group/group_select.php",
     'perm' => usegroups
     );
-#
-# globally enable this module
-#
+//
+// globally enable this module
+//
 if(!isset($tutos[usegroups])) {
     $tutos[usegroups] = 1;
 }
-#
-# List of objects/modules where we do something with this module
-# and need to include this module
-#
+//
+// List of objects/modules where we do something with this module
+// and need to include this module
+//
 $tutos[modulesinc]['group'][] = 'company';
 $tutos[modulesinc]['group'][] = 'department';
 $tutos[modulesinc]['group'][] = 'address';

Modified: trunk/php/ldap/ldap.pinc
===================================================================
--- trunk/php/ldap/ldap.pinc	2012-11-16 10:23:59 UTC (rev 841)
+++ trunk/php/ldap/ldap.pinc	2012-11-23 07:09:55 UTC (rev 842)
@@ -82,22 +82,22 @@
      *
      */
     function connect() {
-global $tutos;
+        global $tutos;
         $this->ds = false;
         $retry = 0;
         while (!$this->ds && ($retry < 3)) {
             $retry++;
             #$this->ds = ldap_connect($this->host,$this->port);
             $this->ds = ldap_connect('ldap://'.$this->host.':'.$this->port);
-error_log('ldap_connect:'.$this->host.' '.$this->port.' '.$retry.' '.$this->ds."\n",3,$tutos[errlog]);
-#     echo $this->host.":".$this->port."<br />";
+            //error_log('ldap_connect:'.$this->host.' '.$this->port.' '.$retry.' '.$this->ds."\n",3,$tutos[errlog]);
+            //echo $this->host.":".$this->port."<br />";
         }
         if ( $this->ds == false ) {
-error_log('ldap_connect: FALSE '.$this->ds."\n",3,$tutos[errlog]);
+            error_log('ldap_connect: FALSE '.$this->ds."\n",3,$tutos[errlog]);
             return false;
         }
         if (! ldap_bind($this->ds) ) {     // this is an "anonymous" bind, typically
-error_log('ldap_bind: FALSE '.$this->ds.' '.$this->error()."\n",3,$tutos[errlog]);
+            error_log('ldap_bind: FALSE '.$this->ds.' '.$this->error()."\n",3,$tutos[errlog]);
             return false;
         }
         return true;
@@ -118,28 +118,28 @@
     function subimport($sub,$def,$c,&$import) {
         global $lang,$tutos,$msg;
 
-        if (isset($tutos['ldap:'. $this->host .":". $this->port]['uniquekey']) ) {
-            $ukey = $tutos['ldap:'. $this->host .":". $this->port]['uniquekey'];
+        if (isset($tutos['ldap:'. $this->host .':'. $this->port]['uniquekey']) ) {
+            $ukey = $tutos['ldap:'. $this->host .':'. $this->port]['uniquekey'];
         } else {
-            $ukey = "dn";
+            $ukey = 'dn';
         }
 
-        $d = $tutos['ldap:'. $this->host .":". $this->port]['+'];
+        $d = $tutos['ldap:'. $this->host .':'. $this->port]['+'];
 
         $sub = strtolower($sub);
-        $subkey = $def[0] ."=".$import[$c][$def[0]][0];
+        $subkey = $def[0] .'='.$import[$c][$def[0]][0];
 
         $justthese = array($ukey,"cn","l","sn","o","ou","mail","department","*");
         $sr = @ldap_search($this->ds,$this->basedn,"(&(".$subkey.")(objectClass=". $def[1] ."))",$justthese,0,40,10,LDAP_DEREF_ALWAYS);
         if (!$sr) {
-            $msg .= 'Search : "'.$subkey .'" '.$this->error().' <br />';
+            $msg = addLine($msg,'Search : "'.$subkey .'" '.$this->error());
             return(-1);
         }
         $cnt = ldap_count_entries($this->ds,$sr);
         #$msg .= $subkey ."=". $cnt ."<br />";
         $a = ldap_first_entry($this->ds,$sr);
         while ($a != false) {
-            $y = ldap_first_attribute($this->ds,$a,$info);
+            $y = ldap_first_attribute($this->ds,$a);
             while ($y) {
                 $d = ldap_get_values_len($this->ds,$a,$y);
                 if ( isset($d['count']) ) {
@@ -149,7 +149,7 @@
                 } else {
                     $import[$c][$sub.strtolower($y)][0] = $d;
                 }
-                $y = ldap_next_attribute($this->ds,$a,$info);
+                $y = ldap_next_attribute($this->ds,$a);
             }
             $a = @ldap_next_entry($this->ds,$a);
         }
@@ -161,10 +161,10 @@
     function import($key) {
         global $lang,$tutos,$msg,$info,$table;
 
-        if (isset($tutos['ldap:'. $this->host .":". $this->port]['uniquekey']) ) {
-            $ukey = $tutos['ldap:'. $this->host .":". $this->port]['uniquekey'];
+        if (isset($tutos['ldap:'. $this->host .':'. $this->port]['uniquekey']) ) {
+            $ukey = $tutos['ldap:'. $this->host .':'. $this->port]['uniquekey'];
         } else {
-            $ukey = "dn";
+            $ukey = 'dn';
         }
         $savefile = false;
         $saveurl = false;
@@ -185,19 +185,19 @@
         }
 
         $justthese = array($ukey,"cn","l","sn","o","ou","mail","department","*");
-        if ( $ukey == "dn" ) {
+        if ( $ukey == 'dn' ) {
             $sr = ldap_read($this->ds,$key,"(objectClass=*)",$justthese,0,40,10,LDAP_DEREF_ALWAYS);
         } else {
             $sr = ldap_search($this->ds,$this->basedn,"(&(".$key.")(objectClass=*))",$justthese,0,40,10,LDAP_DEREF_ALWAYS);
         }
         #$msg .= $this->basedn." (&(".$key.")(objectClass=*))";
         if (!$sr) {
-            $msg .= 'Search : "'.$key .'" '.$this->error().'<br />';
+            $msg = addLine($msg,'Search : "'.$key .'" '.$this->error());
             return(-1);
         }
         $cnt = ldap_count_entries($this->ds,$sr);
         if ($cnt < 1) {
-            $msg .= $key. " not found<br />";
+            $msg = addLine($msg,$key. ' not found');
             return(-1);
         }
         // read data
@@ -205,7 +205,7 @@
         $c = 0;
         while ($x != false ) {
             $import[$c] = array();
-            $y = ldap_first_attribute($this->ds,$x,$info);
+            $y = ldap_first_attribute($this->ds,$x);
             while ($y) {
                 $d = ldap_get_values_len($this->ds,$x,$y);
                 if ( isset($d['count']) ) {
@@ -215,7 +215,7 @@
                 } else {
                     $import[$c][strtolower($y)][0] = $d;
                 }
-                $y = ldap_next_attribute($this->ds,$x,$info);
+                $y = ldap_next_attribute($this->ds,$x);
             }
 
             //  if there is a "+" entry we need to make a subcall
@@ -231,9 +231,9 @@
             $c++;
         }
 
-#    foreach ($import[0] as $x1 => $x2) {
-#      echo $x1 ." ". count($x2).' '.(is_array($x2) ? $x2[0]:'')."<br />\n";
-        #    }
+        // foreach ($import[0] as $x1 => $x2) {
+        //    echo $x1 ." ". count($x2).' '.(is_array($x2) ? $x2[0]:'')."<br />\n";
+        //  }
         if (isset($tutos['ldap:'. $this->host .":". $this->port]['fullname']) ) {
             $v = strtolower($tutos['ldap:'. $this->host .":". $this->port]['fullname']);
             if (isset($import[0][$v][0]) ) {
@@ -351,7 +351,7 @@
             if (!isset($loc[$c])) {
                 $loc[$c] = new location($this->dbconn);
                 $loc[$c]->category = 3; # = LDAP retrieved data
-            }
+                                                }
             $loc[$c]->lname = 'ldap:'.$tutos['ldap:'.$this->host.':'.$this->port]['servername'];
             foreach(location::$larray as  $f ) {
                 if (isset($tutos['ldap:'. $this->host .":". $this->port][$f]) ) {
@@ -521,9 +521,10 @@
      */
     function saveref($dn,&$obj) {
         global $current_user;
-        $msg = "";
+
+        $msg = '';
         $msg .= ldap::obj_delete($current_user,$obj);
-        $q = "INSERT INTO ". $this->tablename ." (adr_id,ldap_dn,host,port) values (". $obj->id .",". $this->dbconn->String($dn) .",". $this->dbconn->String($this->host) .",". $this->port .")";
+        $q = 'INSERT INTO '. $this->tablename ." (adr_id,ldap_dn,host,port) values (". $obj->id .",". $this->dbconn->String($dn) .",". $this->dbconn->String($this->host) .",". $this->port .")";
         $this->dbconn->Exec($q);
         return $msg;
     }
@@ -545,12 +546,14 @@
     /**
      * Read a list of groups related to the object
      */
-    static function obj_read(&$obj) {
+    static function obj_read(tutos_base $obj) {
+        global $table;
+
         if ( isset($obj->ldaplist) ) {
             return;
         }
         $obj->ldaplist = array();
-        $q = "SELECT * FROM ". $obj->dbconn->prefix ."adrldap WHERE adr_id = ". $obj->id;
+        $q = 'SELECT * FROM '. $obj->dbconn->prefix .$table['adrldap'][name].' WHERE adr_id = '. $obj->id;
         $r = $obj->dbconn->Exec($q);
         $n = $r->numrows();
         $a = 0;
@@ -570,8 +573,10 @@
      * delete reference
      */
     static function obj_delete(tutos_user $user,tutos_base $obj) {
-        $msg = "";
-        $q = "DELETE FROM ". $obj->dbconn->prefix ."adrldap WHERE adr_id = ". $obj->id;
+        global $table;
+
+        $msg = '';
+        $q = 'DELETE FROM '. $obj->dbconn->prefix .$table['adrldap'][name].' WHERE adr_id = '. $obj->id;
         $obj->dbconn->Exec($q);
         return $msg;
     }
@@ -614,5 +619,5 @@
         $r .= "</ul>\n";
         return $r;
     }
-  }
-?>
+}
+?>
\ No newline at end of file

Modified: trunk/php/ldap/ldap_show.php
===================================================================
--- trunk/php/ldap/ldap_show.php	2012-11-16 10:23:59 UTC (rev 841)
+++ trunk/php/ldap/ldap_show.php	2012-11-23 07:09:55 UTC (rev 842)
@@ -24,6 +24,19 @@
 loadmodule("ldap");
 loadlayout();
 
+function der2pem($der_data) {
+    $pem = chunk_split(base64_encode($der_data), 64, "\n");
+    $pem = "-----BEGIN CERTIFICATE-----\n".$pem."-----END CERTIFICATE-----\n";
+    return $pem;
+}
+function pem2der($pem_data) {
+    $begin = "CERTIFICATE-----";
+    $end   = "-----END";
+    $pem_data = substr($pem_data, strpos($pem_data, $begin)+strlen($begin));
+    $pem_data = substr($pem_data, 0, strpos($pem_data, $end));
+    $der = base64_decode($pem_data);
+    return $der;
+}
 /**
  * display a address
  */
@@ -35,13 +48,12 @@
         global $lang,$tutos;
 
         $r = '';
-        $binfo = 0;
         if ( ! $this->obj->connect() ) {
             $r .= $this->error($lang['LDAP_Err001']);
             return $r;
         }
 
-#    var_dump(ldap_explode_dn($this->filter,0));
+        #    var_dump(ldap_explode_dn($this->filter,0));
         $r .= $this->filter ."<br />";
         if (!isset($this->attribs) ) {
             $this->attribs = array( $this->keyname,"cn","l","sn","o","c","ou","mail","department","*");
@@ -65,21 +77,38 @@
         $r .= "<tr><th colspan=\"2\">". $this->obj->getFullName() ."</th></tr>\n";
         $x = ldap_first_entry($this->obj->ds,$sr);
         while ($x != false ) {
-            $y = ldap_first_attribute($this->obj->ds,$x,$binfo);
+            $y = ldap_first_attribute($this->obj->ds,$x);
             while ($y) {
                 $d = ldap_get_values_len($this->obj->ds,$x,$y);
-                $r .= "<tr>\n";
+                $r .= '<tr>'."\n ";
                 $r .= $this->showfield($y);
-                $r .= "<td>\n";
+                $r .= ' <td>'."\n";
                 if ( isset($d['count']) ) {
                     for ($k = 0;$k < $d['count'];$k++) {
                         if ( preg_match("#certificate#i",$y) ) {
                             // TODO make some cool OPSENSSL Stuff here
-                            $r .= "<br /><pre>skipped (". strlen($d[$k]) ." Bytes)</pre><br />";
+                            $r .= '<pre>skipped ('. strlen($d[$k]) .' Bytes)</pre><br />'."\n";
+                            //$r .= "<pre>". $d[$k] ."</pre><br />";
+                            $x2 = openssl_x509_read(der2pem($d[$k]));
+                            $x3 = openssl_x509_parse($x2);
+                            foreach ($x3 as $xi => $x4) {
+                                $r .=  $xi .' = ';
+                                if (is_array($x4)) {
+                                    foreach ($x4 as $xii => $x5) {
+                                        $r .= "<br />&nbsp;&nbsp;".$x5;
+                                    }
+                                } else
+                                    $r .=  $x4 ;
+                                $r .=  "<br />\n";
+                            }
+                            while ($xxx = openssl_error_string())
+                                $r .=  $xxx . " 4<br />\n";
                         } else if ( $y == "jpegPhoto" ) {
-                            $r .= "<br /><pre>skipped (". strlen($d[$k]) ." Bytes)</pre><br />";
+                            $r .= '<br /><pre>skipped ('. strlen($d[$k]) .' Bytes)</pre><br />'."\n";
                         } else if (preg_match("#facsimile#i",$y)){
                             $r .= handle('fax',$y,$this->obj->decode($d[$k]));
+                        } else if (preg_match("#fax#i",$y)){
+                            $r .= handle('fax',$y,$this->obj->decode($d[$k]));
                         } else if (preg_match("#telephone#i",$y)){
                             $r .= handle('phone',$y,$this->obj->decode($d[$k]));
                         } else if (preg_match("#mobile#i",$y)){
@@ -91,49 +120,49 @@
                         } else if (preg_match("#street#i",$y)){
                             $r .= preg_replace("#[$]#i","<br />",$d[$k]);
                         } else if (preg_match("#uri#i",$y)){
-                            $desc = "";
-                            $uri = "";
+                            $desc = '';
+                            $uri  = '';
                             foreach(explode(" ",$d[$k]) as $f) {
                                 if (preg_match("#^http#i",$f)) {
                                     $uri = $f;
                                 } else {
-                                    $desc .= $f." ";
+                                    $desc .= $f.' ';
                                 }
                             }
-                            $r .= "<br /><a target=\"_blank\" href=\"". $uri ."\">". $desc ."(". $uri .")</a>";
+                            $r .= '<br /><a target="_blank" href="'. $uri .'">'. $desc .'('. $uri .')</a>';
                         } else {
                             $r .= $this->obj->decode($d[$k])  ." <br />";
                         }
                     }
                 } else {
-                    $r .= ":". $this->obj->decode($d);
+                    $r .= ':'.$this->obj->decode($d);
                 }
-                $r .= "</td>";
-                $r .= "</tr>\n";
-                $y = ldap_next_attribute($this->obj->ds,$x,$binfo);
+                $r .= ' </td>'."\n";
+                $r .= '</tr>'."\n";
+                $y = ldap_next_attribute($this->obj->ds,$x);
             }
             $x = @ldap_next_entry($this->obj->ds,$x);
             if ($x != false) {
-                $r .= "<tr><td colspan=\"2\"><hr></td></tr>\n";
+                $r .= '<tr><td colspan="2"><hr></td></tr>'."\n";
             }
         }
         $r .= $this->DataTableEnd();
 
-        $r .= "<form name=\"ldap_adr_ins\" action=\"ldap_import.php\" method=\"post\">";
+        $r .= '<form name="ldap_adr_ins" action="ldap_import.php" method="post">';
         if ( !is_object($this->refadr) ) {
             $r .= $lang['LDAPNotSynced'];
-            $r .= "&nbsp;<input type=\"submit\" value=\"". $lang['LDAPImport']."\">";
+            $r .= '&nbsp;<input type="submit" value="'. $lang['LDAPImport'].'">';
         } else {
             $r .= $this->refadr->getLink();
-            $this->addHidden("adr_id",$this->refadr->id);
-            $r .= "&nbsp;<input type=\"submit\" value=\"". $lang['LDAPUpdate']."\">";
+            $this->addHidden('adr_id',$this->refadr->id);
+            $r .= '&nbsp;<input type="submit" value="'. $lang['LDAPUpdate'].'">';
         }
-        $this->addHidden("key",$this->filter);
-        $this->addHidden("host",$this->obj->host);
-        $this->addHidden("port",$this->obj->port);
+        $this->addHidden('key',$this->filter);
+        $this->addHidden('host',$this->obj->host);
+        $this->addHidden('port',$this->obj->port);
         $r .= hiddenFormElements();
         $r .= $this->getHidden();
-        $r .= "</form>";
+        $r .= '</form>';
         $this->obj->close();
         return $r;
     }

Modified: trunk/php/ldap/mconfig.pinc
===================================================================
--- trunk/php/ldap/mconfig.pinc	2012-11-16 10:23:59 UTC (rev 841)
+++ trunk/php/ldap/mconfig.pinc	2012-11-23 07:09:55 UTC (rev 842)
@@ -1,8 +1,9 @@
 <?php
 /*
+ * Copyright 2002 - 2012 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   
+ *  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; version 2 of the License.
  *
  * Module specific configuration
@@ -14,54 +15,50 @@
  * This module ldap integration in PHP
  */
 
-#
-# Every module must have an individual ID ( < 0 > -100 ).
-# this is module -17
-#
-
+//
+// Every module must have an individual ID ( < 0 > -100 ).
+// this is module -17
+//
 if (! defined('useldap')) {
-  define('useldap',-17);
+    define('useldap',-17);
 }
-$tutos[modules]['ldap'] = 
-array( 
-      name => "ldap", 
-      Desc => "searching ldap servers", 
-      file => "php/ldap/ldap.pinc",
-      'overview' => "address_select.php",
-      'perm' => useldap
-      );
-#
-# globally enable this module
-#
+$tutos[modules]['ldap'] =
+    array(
+        name => "ldap",
+        Desc => "searching ldap servers",
+        file => "php/ldap/ldap.pinc",
+        'overview' => "address_select.php",
+        'perm' => useldap
+        );
+//
+// globally enable this module
+//
 if (!isset($tutos[useldap]))
-  $tutos[useldap] = 1;
+    $tutos[useldap] = 1;
 
 if (($tutos[useldap] != 0) && !extension_loaded('ldap')) {
-  if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN')) {
-    dl('php_ldap.dll');
-  } else {
-    dl('ldap.so');
-  }
+    if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN')) {
+        dl('php_ldap.dll');
+    } else {
+        dl('ldap.so');
+    }
 }
 
 if ( ($tutos[useldap] != 0) && ! function_exists('ldap_connect')) {
-  $confmsg .= "<br />\nDisabled ldap (not supported by this PHP)<br />\n";
-  $confmsg .= "Please change your config file and add a line<br />\n";
-  $confmsg .= "\$tutos[". useldap. "] = 0;<br />\n";
-  $tutos[useldap] = 0;
+    $confmsg .= "<br />\nDisabled ldap (not supported by this PHP)<br />\n";
+    $confmsg .= "Please change your config file and add a line<br />\n";
+    $confmsg .= "\$tutos[". useldap. "] = 0;<br />\n";
+    $tutos[useldap] = 0;
 }
-#
-# List of objects/modules where we do something with this module
-# and need to include this module
-#
-$tutos[modulesinc]['ldap'] = 
-array(
-      "address",
-      "scheme",
-      );
-#
-#  skipped (unused) permissions
-#
+//
+// List of objects/modules where we do something with this module
+// and need to include this module
+//
+$tutos[modulesinc]['ldap'][] = 'address';
+$tutos[modulesinc]['ldap'][] = 'scheme';
+//
+//  skipped (unused) permissions
+//
 $permskip[useldap][PERM_NEW] = 1;
 $permskip[useldap][PERM_MOD] = 1;
 $permskip[useldap][PERM_DEL] = 1;

Modified: trunk/php/module_base.pinc
===================================================================
--- trunk/php/module_base.pinc	2012-11-16 10:23:59 UTC (rev 841)
+++ trunk/php/module_base.pinc	2012-11-23 07:09:55 UTC (rev 842)
@@ -15,7 +15,7 @@
  */
 Function moduleloaded($key) {
     return isset($tutos[activemodules][$key]);
-  }
+}
 
 /**
  * load modules that want to work here
@@ -153,7 +153,7 @@
 /**
  * add the addlinks of attached modules within the given object
  */
-Function add_module_addlinks(layout $layout,&$obj) {
+Function add_module_addlinks(layout $layout,tutos_base $obj) {
     global $tutos;
 
     foreach($tutos[activemodules] as $f) {

Modified: trunk/php/report-engine/mconfig.pinc
===================================================================
--- trunk/php/report-engine/mconfig.pinc	2012-11-16 10:23:59 UTC (rev 841)
+++ trunk/php/report-engine/mconfig.pinc	2012-11-23 07:09:55 UTC (rev 842)
@@ -10,46 +10,43 @@
  * report engine module
  */
 
-#
-# Every module must have an individual ID ( < 0 > -100 ).
-# this is module -88
-#
+//
+// Every module must have an individual ID ( < 0 > -100 ).
+// this is module -88
+//
 
 if (! defined('usereporter')) {
-  define('usereporter',-88);
+    define('usereporter',-88);
 }
-$tutos[modules]['report-engine'] = 
-array( 
-      name => "report", 
-      Desc => "generate reports , forms and documents", 
-      file => "php/report-engine/reporter.pinc",
-      'overview' => "report-engine/report_select.php",
-      'perm' => usereporter
-      );
-#
-# globally enable this module
-#
+$tutos[modules]['report-engine'] =
+    array(
+        name => "report",
+        Desc => "generate reports , forms and documents",
+        file => "php/report-engine/reporter.pinc",
+        'overview' => "report-engine/report_select.php",
+        'perm' => usereporter
+        );
+//
+// globally enable this module
+//
 if (!isset($tutos[usereporter]))
-  $tutos[usereporter] = 1;
+    $tutos[usereporter] = 1;
 
 
-#
-# List of objects/modules where we do something with this module
-# and need to include this module
-#
-$tutos[modulesinc]['report-engine'] = 
-array(
-      "address",
-      "group",
-      "company",
-      "product",
-      "bugtracking",
-      "task",
-      "scheme",
-      );
-#
-#  skipped (unused) permissions
-#
+//
+// List of objects/modules where we do something with this module
+// and need to include this module
+//
+$tutos[modulesinc]['report-engine'][] = 'address';
+$tutos[modulesinc]['report-engine'][] = 'group';
+$tutos[modulesinc]['report-engine'][] = 'company';
+$tutos[modulesinc]['report-engine'][] = 'product';
+$tutos[modulesinc]['report-engine'][] = 'bugtracking';
+$tutos[modulesinc]['report-engine'][] = 'task';
+$tutos[modulesinc]['report-engine'][] = 'scheme';
+//
+//  skipped (unused) permissions
+//
 $permskip[usereporter][PERM_NEW] = 1;
 $permskip[usereporter][PERM_MOD] = 1;
 $permskip[usereporter][PERM_DEL] = 1;

Modified: trunk/php/report-engine/reporter.pinc
===================================================================
--- trunk/php/report-engine/reporter.pinc	2012-11-16 10:23:59 UTC (rev 841)
+++ trunk/php/report-engine/reporter.pinc	2012-11-23 07:09:55 UTC (rev 842)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2004 - 2009 by Gero Kohnert
+ *  Copyright 2004 - 2012 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
@@ -63,7 +63,7 @@
             $this->target = $report[$name]['target'];
         }
         ReadLang1($lang,dirname($tutos['base'] ."/php/report-engine/".$report[$name]['dir']."/".$report[$name]['file'] ),$current_user);
-#   echo dirname($tutos['base'] ."/php/report-engine/".$report[$name]['dir']."/".$report[$name]['file'] )." XXX<br />";
+        // echo dirname($tutos['base'] ."/php/report-engine/".$report[$name]['dir']."/".$report[$name]['file'] )." XXX<br />";
         return;
     }
 
@@ -95,7 +95,7 @@
     /**
      * Return Info about possible reports to a object
      */
-    static function obj_read(&$obj,$c,$t) {
+    static function obj_read(tutos_base $obj,$c,$t) {
         global $lang,$tutos,$msg;
 
         if (! file_exists($tutos['base'] ."/php/report-engine/report_list.php") ) {
@@ -108,20 +108,20 @@
 
         foreach ($report as $i => $j) {
             if (!isset($j['category'])) {
-                $j['category'] = 1; # default
+                $j['category'] = 1; // default
             }
             if (is_array($j['class'])) {
                 foreach($j['class'] as $i2 => $j2) {
                     if ($j['class'][$i2] != $c) continue;
                     if ($j['type'][$i2] != $t) continue;
                     $obj->list[usereporter][$i] = $j;
-#     echo $i.' '.$c.' '.$t.' '.$j['category']."<br />";
+                    //echo $i.' '.$c.' '.$t.' '.$j['category']."<br />";
                 }
             } else {
                 if ($j['class'] != $c) continue;
                 if ($j['type'] != $t) continue;
                 $obj->list[usereporter][$i] = $j;
-#     echo $i.' '.$c.' '.$t.' '.$j['category']."<br />";
+                //echo $i.' '.$c.' '.$t.' '.$j['category']."<br />";
             }
         }
         return;
@@ -156,7 +156,7 @@
                     );
             }
         }
-#    print_r($xa);
+        #    print_r($xa);
         return $xa;
     }
     /**
@@ -189,7 +189,7 @@
                     );
             }
         }
-#    print_r($xa);
+        #    print_r($xa);
         return $xa;
 
     }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 841
          http://tutos.svn.sourceforge.net/tutos/?rev=841&view=rev
Author:   gokohnert
Date:     2012-11-16 10:23:59 +0000 (Fri, 16 Nov 2012)
Log Message:
-----------
fix

Modified Paths:
--------------
    trunk/php/testmanager/testcase_overview.php
    trunk/php/testmanager/testsuite_overview.php

Modified: trunk/php/testmanager/testcase_overview.php
===================================================================
--- trunk/php/testmanager/testcase_overview.php	2012-11-15 13:55:22 UTC (rev 840)
+++ trunk/php/testmanager/testcase_overview.php	2012-11-16 10:23:59 UTC (rev 841)
@@ -86,11 +86,11 @@
                 $linkup = addUrlParameter($this->link2,'up='.$b->id);
                 $linkdown = addUrlParameter($this->link2,'down='.$b->id);
                 $r .= ' <td class="over_l">';
-                if($b->mod_ok() && $_GET['xf'] == 'pos') {
+                if($b->mod_ok() && $this->order_fld == 'pos') {
                     $r .= makelink($linkup,$this->theme->getImage(up,'list'));
                 }
                 $r .= $b->pos;
-                if($b->mod_ok() && $_GET['xf'] == 'pos') {
+                if($b->mod_ok() && $this->order_fld == 'pos') {
                     $r .= makelink($linkdown,$this->theme->getImage(down,'list'));
                 }
                 $r .= '</td>'."\n";

Modified: trunk/php/testmanager/testsuite_overview.php
===================================================================
--- trunk/php/testmanager/testsuite_overview.php	2012-11-15 13:55:22 UTC (rev 840)
+++ trunk/php/testmanager/testsuite_overview.php	2012-11-16 10:23:59 UTC (rev 841)
@@ -97,11 +97,11 @@
                 $xx = '';
                 $linkup = addUrlParameter($this->link2,'up='.$b->id);
                 $linkdown = addUrlParameter($this->link2,'down='.$b->id);
-                if($b->mod_ok() && $_GET['xf'] == 'pos') {
+                if($b->mod_ok() && $this->order_fld == 'pos') {
                     $xx .= makelink($linkup,$this->theme->getImage(up,'list'));
                 }
                 $xx .= $b->pos;
-                if($b->mod_ok() && $_GET['xf'] == 'pos') {
+                if($b->mod_ok() && $this->order_fld == 'pos') {
                     $xx .= makelink($linkdown,$this->theme->getImage(down,'list'));
                 }
                 $r .= $this->OverviewRowBlock($xx,'over_l');
@@ -231,7 +231,6 @@
         if (isset($this->filter['ref_id']) && is_object($this->filter['ref_id']) && $this->filter['ref_id']->getType() == 'testsuite') {
             $this->head['pos'] = true;
             if (!isset($_GET['xf'])) {
-                $_GET['xf'] = 'pos';
                 $defsort = array('pos',1);
             }
         }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 840
          http://tutos.svn.sourceforge.net/tutos/?rev=840&view=rev
Author:   gokohnert
Date:     2012-11-15 13:55:22 +0000 (Thu, 15 Nov 2012)
Log Message:
-----------
also work with testruns

Modified Paths:
--------------
    trunk/php/subversion/revision.pinc

Modified: trunk/php/subversion/revision.pinc
===================================================================
--- trunk/php/subversion/revision.pinc	2012-11-15 13:24:17 UTC (rev 839)
+++ trunk/php/subversion/revision.pinc	2012-11-15 13:55:22 UTC (rev 840)
@@ -36,23 +36,35 @@
         global $lang,$current_user;
 
         // search the svn object
-        if ($obj->getTypeId() != usebugtracking) return;
+        if ( ($obj->getTypeId() != usebugtracking) &&
+             ($obj->getTypeId() != usetestrun) )
+            return;
 
 
-        if (is_object($obj->target)) {
-            svn::obj_read($obj->target);
-            $s = $this->find_shortest($obj->target);
-            if ($s) {
-                return $s->getLink($arg,'rev='.$arg);
+        if ( $obj->getTypeId() == usetestrun ) {
+            if (is_object($obj->ref)) {
+                svn::obj_read($obj->ref);
+                $s = $this->find_shortest($obj->ref);
+                if ($s) {
+                    return $s->getLink($arg,'rev='.$arg);
+                }
             }
         }
-
-        if (is_object($obj->parent)) {
-            svn::obj_read($obj->parent);
-            $s = $this->find_shortest($obj->parent);
-            if ($s) {
-                return $s->getLink($arg,'rev='.$arg);
+        if ( $obj->getTypeId() == usebugtracking ) {
+            if (is_object($obj->target)) {
+                svn::obj_read($obj->target);
+                $s = $this->find_shortest($obj->target);
+                if ($s) {
+                    return $s->getLink($arg,'rev='.$arg);
+                }
             }
+            if (is_object($obj->parent)) {
+                svn::obj_read($obj->parent);
+                $s = $this->find_shortest($obj->parent);
+                if ($s) {
+                    return $s->getLink($arg,'rev='.$arg);
+                }
+            }
         }
         return 'X '. $obj->getType().' '.$arg.' '.$cnt;
     }
@@ -61,7 +73,7 @@
      * check if all is ok
      */
     function check(&$obj,$arg) {
-        return true;
+        if ($arg != '') return true;
     }
 }
-?>
\ No newline at end of file
+?>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 839
          http://tutos.svn.sourceforge.net/tutos/?rev=839&view=rev
Author:   gokohnert
Date:     2012-11-15 13:24:17 +0000 (Thu, 15 Nov 2012)
Log Message:
-----------
added handler for revisions

Added Paths:
-----------
    trunk/php/subversion/revision.pinc

Added: trunk/php/subversion/revision.pinc
===================================================================
--- trunk/php/subversion/revision.pinc	                        (rev 0)
+++ trunk/php/subversion/revision.pinc	2012-11-15 13:24:17 UTC (rev 839)
@@ -0,0 +1,67 @@
+<?php
+/**
+ *  Copyright 2002 - 2012 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
+ *  Free Software Foundation; version 2 of the License.
+ *
+ *  SVN Info  $Id: cia.pinc 444 2011-11-30 10:56:20Z gokohnert $
+ *  $Author: gokohnert $
+ */
+
+/**
+ * a handler for resolving svn revision numbers
+ */
+class svn_revision extends tutos_handler {
+
+    function find_shortest(tutos_base $obj) {
+        if (count($obj->list[usesvn]) == 0) return;
+        $x = null;
+        $l = null;
+        foreach($obj->list[usesvn] as $s) {
+            if (($l == null) || (strlen($s->uri) < $l) ) {
+                $x = $s;
+                $l = strlen($s->uri);
+            }
+            unset ($s);
+        }
+        return $x;
+    }
+
+    /**
+     * run the handler
+     */
+    function handle(tutos_base $obj,$arg,$cnt) {
+        global $lang,$current_user;
+
+        // search the svn object
+        if ($obj->getTypeId() != usebugtracking) return;
+
+
+        if (is_object($obj->target)) {
+            svn::obj_read($obj->target);
+            $s = $this->find_shortest($obj->target);
+            if ($s) {
+                return $s->getLink($arg,'rev='.$arg);
+            }
+        }
+
+        if (is_object($obj->parent)) {
+            svn::obj_read($obj->parent);
+            $s = $this->find_shortest($obj->parent);
+            if ($s) {
+                return $s->getLink($arg,'rev='.$arg);
+            }
+        }
+        return 'X '. $obj->getType().' '.$arg.' '.$cnt;
+    }
+
+    /**
+     * check if all is ok
+     */
+    function check(&$obj,$arg) {
+        return true;
+    }
+}
+?>
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 838
          http://tutos.svn.sourceforge.net/tutos/?rev=838&view=rev
Author:   gokohnert
Date:     2012-11-15 13:23:14 +0000 (Thu, 15 Nov 2012)
Log Message:
-----------
added handler for revisions

Modified Paths:
--------------
    trunk/php/bugtracking/bug.pinc
    trunk/php/subversion/README
    trunk/php/subversion/mconfig.pinc
    trunk/php/subversion/svn.pinc

Modified: trunk/php/bugtracking/bug.pinc
===================================================================
--- trunk/php/bugtracking/bug.pinc	2012-11-14 07:37:34 UTC (rev 837)
+++ trunk/php/bugtracking/bug.pinc	2012-11-15 13:23:14 UTC (rev 838)
@@ -224,7 +224,10 @@
      */
     function getFullName() {
         $this->read_reference();
-        return $this->ref->getFullName();
+        if (is_object($this->ref))
+            return $this->ref->getFullName();
+        else
+            return '['.$this->bugid.']';
     }
 
     /**
@@ -557,7 +560,7 @@
                     $r .= '&#160;<i>'. $lang['HistoryDeleted'] ."</i>\n";
                 }
                 if ($this->parent->tutos['bug_use_revision'] == 1)
-                    $r .= '&#160;&#160;<span align="right"><b>- '. $i->revision ." -</b></span>\n";
+                    $r .= '&#160;&#160;<span align="right"><b>- '. handle('revision',$this,$i->revision) ." -</b></span>\n";
 
                 $r .= "<br />\n";
                 if ($desc != $olddesc) {

Modified: trunk/php/subversion/README
===================================================================
--- trunk/php/subversion/README	2012-11-14 07:37:34 UTC (rev 837)
+++ trunk/php/subversion/README	2012-11-15 13:23:14 UTC (rev 838)
@@ -74,6 +74,14 @@
   subversion report in the report engine.
   After defining a subversion path for a project you can select the report/workflow
   on the right side menu and trigger the creation and filling of the repository
+
+
+  Subversion module also includes a handler for resolving revision ids (as used in bugtracking)
+  see the line
+
+  $tutos[handler]['revision']['svn'] = 'subversion/revision.pinc';
+
+  in mconfig.pinc
   
   See tutos/php/report-engine/rep_subversion/README for an installation guide
 

Modified: trunk/php/subversion/mconfig.pinc
===================================================================
--- trunk/php/subversion/mconfig.pinc	2012-11-14 07:37:34 UTC (rev 837)
+++ trunk/php/subversion/mconfig.pinc	2012-11-15 13:23:14 UTC (rev 838)
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2009 - 2010 by Gero Kohnert
+ * Copyright 2009 - 2012 by Gero Kohnert
  *
  * Module specific configuration
  *
@@ -8,10 +8,10 @@
  *  $Author$
  */
 
-#
-# Every module must have an individual ID ( < 0 > -100 ).
-# this is module 42
-#
+//
+// Every module must have an individual ID ( < 0 > -100 ).
+// this is module 42
+//
 define('usesvn',-42);
 $tutos[modules]['svn'] = array(
     name => 'svn',
@@ -21,21 +21,26 @@
     'configurl' => 'subversion/svn_config.php',
     'perm' => usesvn
     );
-#
-# globally enable this module
-#
+//
+// globally enable this module
+//
 if (!isset($tutos[usesvn]))
     $tutos[usesvn] = 1;
-# but disable it use
+
+// but disable it use
 $tutos['defaultperm'][usesvn] = 0;
-#
-# List of objects/modules where we do something with this module
-# and need to include this module
-#
+//
+// List of objects/modules where we do something with this module
+// and need to include this module
+//
 $tutos[modulesinc]['svn'][] = 'scheme';
 $tutos[modulesinc]['svn'][] = 'product';
 
 $tutos[modulesinc]['report-engine'][] = 'svn';
 
 $permskip[usesvn][PERM_MYTUTOS]  = 1;
+
+// a handler for resolving revision numbers
+$tutos[handler]['revision']['svn_revision'] = 'subversion/revision.pinc';
+
 ?>
\ No newline at end of file

Modified: trunk/php/subversion/svn.pinc
===================================================================
--- trunk/php/subversion/svn.pinc	2012-11-14 07:37:34 UTC (rev 837)
+++ trunk/php/subversion/svn.pinc	2012-11-15 13:23:14 UTC (rev 838)
@@ -78,6 +78,15 @@
  */
 class svn extends tutos_module {
     /**
+     * URL to use for modify this object
+     */
+    protected $modurl  = 'subversion/svn_new.php';
+    /**
+     * URL to use for display this object
+     */
+    protected $showurl = 'subversion/svn_show.php';
+
+    /**
      * constructor
      */
     function svn(tutos_db $dbconn) {
@@ -205,20 +214,6 @@
     }
 
     /**
-     * Return a link to this svn
-     */
-    function getURL() {
-        return 'subversion/svn_show.php?id='.$this->id;
-    }
-
-    /**
-     * Return a link to modify this svn
-     */
-    function getModURL() {
-        return 'subversion/svn_new.php?id='.$this->id;
-    }
-
-    /**
      *  Return a fullname
      */
     function getFullname() {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 837
          http://tutos.svn.sourceforge.net/tutos/?rev=837&view=rev
Author:   gokohnert
Date:     2012-11-14 07:37:34 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
speedup

Modified Paths:
--------------
    trunk/php/testmanager/testrun_overview.php

Modified: trunk/php/testmanager/testrun_overview.php
===================================================================
--- trunk/php/testmanager/testrun_overview.php	2012-11-08 09:18:26 UTC (rev 836)
+++ trunk/php/testmanager/testrun_overview.php	2012-11-14 07:37:34 UTC (rev 837)
@@ -58,8 +58,8 @@
                 $b->read_result($this->result,$a);
                 if (!$b->see_ok()) continue;
                 $b->read_reference();
-                $b->run->collectstats();
-                foreach($b->run->statarr[0] as $si => $sf) {
+                $b->collectstats();
+                foreach($b->statarr[0] as $si => $sf) {
                     if (!isset($this->statarr[$si]))
                         $this->statarr[$si] = 0;
                     $this->statarr[$si] += $sf;
@@ -380,4 +380,4 @@
 <!--
 SVN Info  $Id$
 $Author$
--->
\ No newline at end of file
+-->

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 836
          http://tutos.svn.sourceforge.net/tutos/?rev=836&view=rev
Author:   gokohnert
Date:     2012-11-08 09:18:26 +0000 (Thu, 08 Nov 2012)
Log Message:
-----------
virtual roles in bugpermissions also look on target project now

Modified Paths:
--------------
    trunk/php/bugtracking/bug.pinc
    trunk/php/bugtracking/bug_overview.php

Modified: trunk/php/bugtracking/bug.pinc
===================================================================
--- trunk/php/bugtracking/bug.pinc	2012-11-06 18:16:56 UTC (rev 835)
+++ trunk/php/bugtracking/bug.pinc	2012-11-08 09:18:26 UTC (rev 836)
@@ -1642,10 +1642,10 @@
             $x[$this->getTypeId()][6] = $lang[$this->getType()].':'.$lang['Bug'].' '.$lang['BugReference'].' '.$lang['Installation'].' - '.$lang['SoldBy'];
             $x[$this->getTypeId()][7] = $lang[$this->getType()].':'.$lang['Bug'].' '.$lang['BugReference'].' '.$lang['Installation'].' - '.$lang['InstalledBy'];
         }
-        $x[$this->getTypeId()][8] = $lang[$this->getType()].':'.$lang['BugReference'].' '.$lang['ProdRoles'];
+        $x[$this->getTypeId()][8] = $lang[$this->getType()].':'.$lang['BugReference'].'/'.$lang['BugTarget'].' '.$lang['ProdRoles'];
         foreach ($lang['ProdRole'] as $role => $f) {
             if ( $tutos[rolecheck][$role] != "p") {
-                $x[$this->getTypeId()][10+$role] = $lang[$this->getType()].':'.$lang['BugReference'].' '.$f;
+                $x[$this->getTypeId()][10+$role] = $lang[$this->getType()].':'.$lang['BugReference'].'/'.$lang['BugTarget'].' '.$f;
             }
         }
         return $x;
@@ -1664,9 +1664,12 @@
         }
 
         $x = parent::getObjectGroupList($id);
+
         if (($id2 == 2) && is_object($this->solver)) {
+            // ASSIGNED
             $x[$this->solver->id] = $this->solver;
         } elseif (($id2 == 2) && is_numeric($this->solver)) {
+            // ASSIGNED
             // add all members of a projects subteam
             if (is_object($this->parent) && ($this->parent->getTypeId() == useprojects) ) {
                 $this->parent->readroles();
@@ -1676,15 +1679,27 @@
                         unset($f);
                     }
             }
+            // add all members of a target subteam
+            if (is_object($this->target) && ($this->target->getTypeId() == useprojects) ) {
+                $this->target->readroles();
+                if (isset($this->target->role[-(10+$this->solver)]))
+                    foreach ($this->target->role[-(10+$this->solver)] as $f) {
+                        $x[$f->id] = $f;
+                        unset($f);
+                    }
+            }
         } elseif (($id2 == 3) && is_object($this->reporter)) {
+            // reported from
             $x[$this->reporter->id] = $this->reporter;
         }
 
+        // 5 = Parent Creator
         if (is_object($this->parent) ) {
             if ($id2 == 5) {
                 $x[$this->parent->creator->id] = $this->parent->creator;
             }
         }
+        // 4 = Parent Task Worker
         if (is_object($this->parent) && ($this->parent->getTypeId() == usetaskmanagement) ) {
             if ($id2 == 4) {
                 $x = $this->parent->getObjectGroupList(2);
@@ -1701,8 +1716,10 @@
             }
         }
 
+        // parent project roles
         if (is_object($this->parent) && ($this->parent->getTypeId() == useprojects) ) {
             $this->parent->readroles();
+            // All Parent Project Roles
             if ($id2 == 8) {
                 $x = $this->parent->getObjectGroupList(8);
             }
@@ -1713,6 +1730,20 @@
                 }
             }
         }
+        // target project roles
+        if (is_object($this->target) && ($this->target->getTypeId() == useprojects) ) {
+            $this->target->readroles();
+            // All target Project Roles
+            if ($id2 == 8) {
+                $x += $this->target->getObjectGroupList(8);
+            }
+            foreach ($lang['ProdRole'] as $role => $f) {
+                if ( $tutos[rolecheck][$role] == "p") continue;
+                if ($role+10 == $id2) {
+                    $x += $this->target->getObjectGroupList($role+128);
+                }
+            }
+        }
         return $x;
     }
 

Modified: trunk/php/bugtracking/bug_overview.php
===================================================================
--- trunk/php/bugtracking/bug_overview.php	2012-11-06 18:16:56 UTC (rev 835)
+++ trunk/php/bugtracking/bug_overview.php	2012-11-08 09:18:26 UTC (rev 836)
@@ -851,7 +851,7 @@
                 }
                 $spie['data'] .=  ']';
                 $pre = ',';
-#                break;
+                #                break;
             }
 
             $r .= "<tr>\n";
@@ -1249,6 +1249,7 @@
 
         $n2 = $this->result2->numrows();
 
+
         // Make a big array of all visible bugs
         $this->blist = array();
         $h = array();
@@ -1268,9 +1269,13 @@
             // fake acl read
             acl_read($b);
             if ( ! $b->see_ok() ) {
-                $skip++;
-                unset($b);
-                continue;
+                // deeper check after reading complete
+                $b->read_result($this->result2,$x-1);
+                if ( ! $b->see_ok() ) {
+                    $skip++;
+                    unset($b);
+                    continue;
+                }
             }
             // only read if in range
             if ($this->format != "html" ||
@@ -1291,6 +1296,7 @@
 
         $n = count($this->blist);
         $this->result2->free();
+        //        $msg .= $n.' '.$n2.' '.$this->q;
 
         if ( 0 == $n) {
             $msg = addLine($msg,$lang['Err0048']);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 835
          http://tutos.svn.sourceforge.net/tutos/?rev=835&view=rev
Author:   gokohnert
Date:     2012-11-06 18:16:56 +0000 (Tue, 06 Nov 2012)
Log Message:
-----------
fixes

Modified Paths:
--------------
    trunk/php/admin/customize_show.php
    trunk/php/admin/restore.php
    trunk/php/admin/scheme.php

Modified: trunk/php/admin/customize_show.php
===================================================================
--- trunk/php/admin/customize_show.php	2012-11-06 18:15:01 UTC (rev 834)
+++ trunk/php/admin/customize_show.php	2012-11-06 18:16:56 UTC (rev 835)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2007 - 2010 by Gero Kohnert
+ *  Copyright 2007 - 2012 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
@@ -101,7 +101,7 @@
                     }
                     $r .= $this->OverviewRowStart($line);
                     $r .= ' <td>&nbsp;&nbsp;&nbsp;&nbsp;$lang[\''. $i .'\'][\''. $i2.'\'] = </td>'."\n";
-                    $r .= ' <td>&quot;'. myentities($j) .'&quot;</td>'."\n";
+                    $r .= ' <td>&quot;'. myentities($j2) .'&quot;</td>'."\n";
                     $r .= ' <td>&quot;<input name="lg2_'.$i.'__'.$i2.'" value="'. $lang2[$i][$i2] .'" />&quot;</td>'."\n";
                     $r .= ' <td>&quot;<input name="lg3_'.$i.'__'.$i2.'" value="'. $lang3[$i][$i2] .'" />&quot;</td>'."\n";
                     $r .= $this->OverviewRowEnd($line);

Modified: trunk/php/admin/restore.php
===================================================================
--- trunk/php/admin/restore.php	2012-11-06 18:15:01 UTC (rev 834)
+++ trunk/php/admin/restore.php	2012-11-06 18:16:56 UTC (rev 835)
@@ -18,8 +18,6 @@
 require_once 'permission.p3';
 
 loadlayout();
-$lang = array();
-ReadLang($lang);
 
 class Restore extends layout {
     Function info() {
@@ -28,8 +26,6 @@
     }
 }
 
-$l = new Restore($current_user);
-$l->PageHeader('RESTORE');
 
 
 $zipname  = $tutos[sessionpath] .'/backup.zip';
@@ -43,6 +39,12 @@
 $_SESSION['dbnr'] = $dbnr;
 $dbconn = DB_Open($dbnr,false);
 
+$lang = array();
+ReadLang($lang);
+
+$l = new Restore($current_user);
+$l->PageHeader('RESTORE');
+
 if (!is_object($dbconn)) {
     die ('No database with id '.$dbnr.' found');
 }

Modified: trunk/php/admin/scheme.php
===================================================================
--- trunk/php/admin/scheme.php	2012-11-06 18:15:01 UTC (rev 834)
+++ trunk/php/admin/scheme.php	2012-11-06 18:16:56 UTC (rev 835)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2001-2011 by Gero Kohnert
+ *  Copyright 2001-2012 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
@@ -378,7 +378,8 @@
     }
 }
 
-$dbc = null;
+#$dbc = null;
+$dbc = DB_Open(-3,false);
 $x = new tutos_user($dbc);
 $l = new Admin_scheme($x);
 $l->display();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 834
          http://tutos.svn.sourceforge.net/tutos/?rev=834&view=rev
Author:   gokohnert
Date:     2012-11-06 18:15:01 +0000 (Tue, 06 Nov 2012)
Log Message:
-----------
formatting

Modified Paths:
--------------
    trunk/php/timetrack/timetrack.pinc

Modified: trunk/php/timetrack/timetrack.pinc
===================================================================
--- trunk/php/timetrack/timetrack.pinc	2012-10-29 15:07:51 UTC (rev 833)
+++ trunk/php/timetrack/timetrack.pinc	2012-11-06 18:15:01 UTC (rev 834)
@@ -720,7 +720,7 @@
         $r .= txt2csv($w);
         $r .= txt2csv($ref);
         $r .= txt2csv($this->desc);
-        $r .= txt2csv($this->volume);
+        $r .= txt2csv(my_number_format($this->volume,2));
         $r .= txt2csv($this->cph);
         $r .= txt2csv($this->currency);
         $r .= txt2csv($this->state);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.