[Phpgroupware-cvs] CVS: etemplate/inc class.editor.inc.php,1.24,1.25 class.soetemplate.inc.php,1.18,1.19

[Ralf Becker <address@hidden>]

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

Modified Files:
        class.editor.inc.php class.soetemplate.inc.php 
Log Message:
added more error-messages and changed soetemplate::toTranslate to not write 
messages starting with '@' and do write extra-line of selection in options

Index: class.editor.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/etemplate/inc/class.editor.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** class.editor.inc.php        3 Oct 2002 13:24:45 -0000       1.24
--- class.editor.inc.php        3 Oct 2002 16:46:18 -0000       1.25
***************
*** 30,34 ****
                        'not_writeable' => "Error: webserver is not allowed to 
write into '%s' !!!",
                        'exported'   => "eTemplate '%s' written to '%s'",
!                       'newer_version' => "newer version '%s' exists !!!"
                );
                var $aligns = array(
--- 30,35 ----
                        'not_writeable' => "Error: webserver is not allowed to 
write into '%s' !!!",
                        'exported'   => "eTemplate '%s' written to '%s'",
!                       'newer_version' => "newer version '%s' exists !!!",
!                       'need_name'  => 'Application name needed to write a 
langfile !!!'
                );
                var $aligns = array(
***************
*** 407,417 ****
                        elseif ($content['langfile'])
                        {
!                               $additional = array();
!                               if (substr($content['name'],0,9) == 'etemplate')
                                {
!                                       $m = new editor(False);
!                                       $additional = $m->messages + 
$this->etemplate->types + $this->extensions + $this->aligns;
                                }
-                               $msg = 
$this->etemplate->writeLangFile($content['name'],'en',$additional);
                        }
                        elseif ($content['export_xml'])
--- 408,426 ----
                        elseif ($content['langfile'])
                        {
!                               list($name) = explode('.',$content['name']);
!                               if (empty($name) || 
address@hidden(PHPGW_SERVER_ROOT.'/'.$name))
                                {
!                                       $msg = $this->messages['need_name'];
!                               }
!                               else
!                               {
!                                       $additional = array();
!                                       if ($name == 'etemplate')
!                                       {
!                                               $m = new editor(False);
!                                               $additional = $m->messages + 
$this->etemplate->types + $this->extensions + $this->aligns;
!                                       }
!                                       $msg = 
$this->etemplate->writeLangFile($name,'en',$additional);
                                }
                        }
                        elseif ($content['export_xml'])

Index: class.soetemplate.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/etemplate/inc/class.soetemplate.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** class.soetemplate.inc.php   3 Oct 2002 11:10:52 -0000       1.18
--- class.soetemplate.inc.php   3 Oct 2002 16:46:18 -0000       1.19
***************
*** 432,436 ****
                                        $arr[$key] = 
$this->compress_array($val);
                                }
!                               elseif ($val == '' || $val == '0')
                                {
                                        unset($arr[$key]);
--- 432,436 ----
                                        $arr[$key] = 
$this->compress_array($val);
                                }
!                               elseif ($val == '')
                                {
                                        unset($arr[$key]);
***************
*** 629,636 ****
                                while (list($col,$cell) = each($cols))
                                {
!                                       $all = 
explode('|',$cell['help'].($cell['type'] != 'image'?'|'.$cell['label']:''));
                                        while (list(,$str) = each($all))
                                        {
!                                               if (strlen($str) > 1)
                                                {
                                                        
$to_trans[strtolower($str)] = $str;
--- 629,640 ----
                                while (list($col,$cell) = each($cols))
                                {
!                                       list($extra_row) = 
explode(',',$cell['size']);
!                                       if (substr($cell['type'],0,6) != 
'select' || !empty($extra_row) && $extra_row > 0)
!                                               $extra_row = '';
!                                       $all = 
explode('|',$cell['help'].($cell['type'] != 'image'?'|'.$cell['label']:'').
!                                               (!empty($extra_row) ? 
'|'.$extra_row : ''));
                                        while (list(,$str) = each($all))
                                        {
!                                               if (strlen($str) > 1 && $str[0] 
!= '@')
                                                {
                                                        
$to_trans[strtolower($str)] = $str;
***************
*** 680,683 ****
--- 684,691 ----
                        list($app) = explode('.',$app);
  
+                       if 
(!file_exists(PHPGW_SERVER_ROOT.'/developer_tools/inc/class.solangfile.inc.php'))
+                       {
+                               return 'Error: app developer-tools not 
installed !!!';
+                       }
                        $solangfile = 
CreateObject('developer_tools.solangfile');