[Phpgroupware-cvs] CVS: etemplate/inc class.editor.inc.php,1.9,1.10

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/etemplate/inc
In directory subversions:/tmp/cvs-serv10265

Modified Files:
        class.editor.inc.php 
Log Message:
new function to search for or list existing eTeamplates

Index: class.editor.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/etemplate/inc/class.editor.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** class.editor.inc.php        3 Sep 2002 10:21:44 -0000       1.9
--- class.editor.inc.php        3 Sep 2002 22:58:53 -0000       1.10
***************
*** 24,28 ****
                        'error_writing' => 'Error: while saveing !!!',
                        'other_version' => 'only an other Version found !!!',
!                       'ext_loaded' => 'Extensions loaded: '
                );
                var $aligns = array(
--- 24,29 ----
                        'error_writing' => 'Error: while saveing !!!',
                        'other_version' => 'only an other Version found !!!',
!                       'ext_loaded' => 'Extensions loaded:',
!                       'x_found'    => '%d eTemplates found'
                );
                var $aligns = array(
***************
*** 70,74 ****
                                if (count($this->extensions))
                                {
!                                       $msg .= $this->messages['ext_loaded'] . 
implode(', ',$this->extensions);
                                        $msg_ext_loaded = True;
                                }
--- 71,75 ----
                                if (count($this->extensions))
                                {
!                                       $msg .= $this->messages['ext_loaded'] . 
' ' . implode(', ',$this->extensions);
                                        $msg_ext_loaded = True;
                                }
***************
*** 81,85 ****
                                if (count($extensions))
                                {
!                                       $msg .= 
(!$msg_ext_loaded?$this->messages['ext_loaded']:', ') . implode(', 
',$extensions);
                                        $this->extensions += $extensions;
                                }
--- 82,86 ----
                                if (count($extensions))
                                {
!                                       $msg .= 
(!$msg_ext_loaded?$this->messages['ext_loaded'].' ':', ') . implode(', 
',$extensions);
                                        $this->extensions += $extensions;
                                }
***************
*** 304,311 ****
                                {
                                        $content['version'] = '';       // 
trying it without version
!                                       $msg = $this->messages['other_version'];
!                                       if (!$this->etemplate->read($content))
                                        {
!                                               $msg = 
$this->messages['not_found'];
                                        }
                                }
--- 305,323 ----
                                {
                                        $content['version'] = '';       // 
trying it without version
!                                       if ($this->etemplate->read($content))
                                        {
!                                               $msg = 
$this->messages['other_version'];
!                                       }
!                                       else
!                                       {
!                                               $result = 
$this->etemplate->search($content);
!                                               if (count($result) > 1)
!                                               {
!                                                       return 
$this->list_result(array('result' => $result));
!                                               }
!                                               elseif (!count($result) || 
$this->etemplate->read($result[0]))
!                                               {
!                                                       $msg = 
$this->messages['not_found'];
!                                               }
                                        }
                                }
***************
*** 350,353 ****
--- 362,369 ----
                function delete($post_vars='',$back = 'edit')
                {
+                       if ($this->debug)
+                       {
+                               echo "delete(back='$back') cont = "; 
_debug_array($post_vars);
+                       }
                        if (!$post_vars)
                        {
***************
*** 364,375 ****
                                        $read_ok = $this->etemplate->delete();
                                }
!                               $this->edit($this->messages[$read_ok ? 
'deleted' : 'not_found']);
                                return;
                        }
                        if (isset($post_vars['no']))    // Back to ...
                        {
!                               if (($back = $post_vars['back']) != 'show')
                                {
!                                       $back = 'edit';
                                }
                                $this->$back();
--- 380,406 ----
                                        $read_ok = $this->etemplate->delete();
                                }
!                               $msg = $this->messages[$read_ok ? 'deleted' : 
'not_found'];
! 
!                               if ($post_vars['back'] == 'list_result')
!                               {
!                                       
$this->list_result($post_vars['preserv'],$msg);
!                               }
!                               else
!                               {
!                                       $this->edit($msg);
!                               }
                                return;
                        }
                        if (isset($post_vars['no']))    // Back to ...
                        {
!                               switch ($back = $post_vars['back'])
                                {
!                                       case 'list_result':
!                                               
$this->$back($post_vars['preserv']);
!                                               return;
!                                       case 'show':
!                                               break;
!                                       default:
!                                               $back = 'edit';
                                }
                                $this->$back();
***************
*** 381,389 ****
                                return;
                        }
!                       $content = $this->etemplate->as_array() + array('back' 
=> $back);
  
                        $delete = new etemplate('etemplate.editor.delete');
  
!                       
$delete->exec('etemplate.editor.delete',$content,array(),array(),$content,'');
                }
  
--- 412,477 ----
                                return;
                        }
!                       $content = $this->etemplate->as_array();
  
                        $delete = new etemplate('etemplate.editor.delete');
+                       
$delete->exec('etemplate.editor.delete',$content,array(),array(),$content+ 
array(
+                               'back' => $back,
+                               'preserv' => $post_vars['preserv']
+                       ),'');
+               }
+ 
+               function list_result($cont='',$msg='')
+               {
+                       if ($this->debug)
+                       {
+                               echo "<p>etemplate.editor.list_result: cont="; 
_debug_array($cont);
+                       }
+                       if (!$cont || !is_array($cont))
+                       {
+                               return $this->edit('error');
+                       }
+          if (!isset($cont['result']) || isset($cont['search']))
+                       {
+                               $cont['result'] = 
$this->etemplate->search($cont);
+                       }
+                       $result = $cont['result'];
  
!                       if (isset($cont['delete']))
!                       {
!                               list($delete) = each($cont['delete']);
!                               $read = $result[$delete-1];
!                               
$this->etemplate->read($read['et_name'],$read['et_template'],$read['et_lang'],$read['group'],$read['et_version']);
!                               unset($cont['delete']);
!                               unset($cont['result']);
!                               $this->delete(array('preserv' => 
$cont),'list_result');
!                               return;
!                       }
!                       if (isset($cont['read']))
!                       {
!                               list($read) = each($cont['read']);
!                               $read = $result[$read-1];
!                               
$this->etemplate->read($read['et_name'],$read['et_template'],$read['et_lang'],$read['group'],$read['et_version']);
!                               $this->edit();
!                               return;
!                       }
!                       if (!$msg)
!                       {
!                               $msg = 
sprintf($this->messages['x_found'],count($result));
!                       }
!                       unset($cont['result']);
!                       if (!isset($cont['name']))
!                       {
!                               $cont += $this->etemplate->as_array();
!                       }
!                       $content = $cont + array('msg' => $msg);
! 
!                       reset($result);
!                       for ($row=1; list(,$param) = each($result); ++$row)
!                       {
!                               $content[$row] = $param;
!                       }
!                       $list_result = new 
etemplate('etemplate.editor.list_result');
!                       //$list_result->debug=1;
!                       
$list_result->exec('etemplate.editor.list_result',$content,'','',array('result' 
=> $result),'');
                }