[Phpgroupware-cvs] api class.phpgw.php, 1.1.1.1.2.7, 1.1.1.1.2.8 class.xmltool.php, 1.1.1.1.2.2, 1.1.1.1.2.3 core_functions.inc.php, 1.1.1.1.2.4, 1.1.1.1.2.5

[Dan Kuykendall <address@hidden>]

Update of /cvsroot/phpgroupware/api
In directory subversions:/tmp/cvs-serv22073/api

Modified Files:
      Tag: proposal-branch
        class.phpgw.php class.xmltool.php core_functions.inc.php 
Log Message:
fixed stupid extended asci code problem

Index: core_functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/core_functions.inc.php,v
retrieving revision 1.1.1.1.2.4
retrieving revision 1.1.1.1.2.5
diff -C2 -d -r1.1.1.1.2.4 -r1.1.1.1.2.5
*** core_functions.inc.php      26 Oct 2003 07:43:06 -0000      1.1.1.1.2.4
--- core_functions.inc.php      26 Oct 2003 07:54:48 -0000      1.1.1.1.2.5
***************
*** 370,387 ****
                                return (preg_match("/^[[:print:]]+$/", $input) 
&& !preg_match("/['\"<>*#;]/$/", $input));
                                break;
! //                    case 'isbaseasci': /* html printable chars. excludes 
stuff dangerous to sql */
                                //return 
(preg_match('/[\001-\031]|[\128-\255]+$/', $input));
! //                            return (preg_match('/[\128-\255]+$/', $input));
!                               /*
!                               $n = count($this->css_files);
!                               for($i=0;$i<$n;$i++)
!                               {
!                                       list($app,$file) = 
explode('.',$this->css_files[$i]);
!                                       $css_files[]     = array('app'=>$app, 
'file'=>$file);
!                                       
$GLOBALS['phpgw_xml_apinode']->add_node($css_files,'css_list');
!                               }
!                               return True;
!                               */
! //                            break;
                        case 'ip': /* IP4 address */
                                if 
(preg_match("^([012]?\d{1,2}\.){3}[012]?\d{1,2}$",$input))
--- 370,380 ----
                                return (preg_match("/^[[:print:]]+$/", $input) 
&& !preg_match("/['\"<>*#;]/$/", $input));
                                break;
!                       /*
!                       case 'isxmlsafe':
                                //return 
(preg_match('/[\001-\031]|[\128-\255]+$/', $input));
!                               //return (preg_match('/[\128-\255]+$/', 
$input));
!                               return (preg_match('/[\001-\177]+$/', $input));
!                               break;
!                       */
                        case 'ip': /* IP4 address */
                                if 
(preg_match("^([012]?\d{1,2}\.){3}[012]?\d{1,2}$",$input))

Index: class.xmltool.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/class.xmltool.php,v
retrieving revision 1.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -C2 -d -r1.1.1.1.2.2 -r1.1.1.1.2.3
*** class.xmltool.php   26 Oct 2003 07:43:06 -0000      1.1.1.1.2.2
--- class.xmltool.php   26 Oct 2003 07:54:48 -0000      1.1.1.1.2.3
***************
*** 454,458 ****
                                if($this->show_xml_headers)
                                {
!                                       $result = '<?xml 
version="'.$this->xmlversion.'"?>'."\n";
                                        if(count($this->doctype) == 1)
                                        {
--- 454,458 ----
                                if($this->show_xml_headers)
                                {
!                                       $result = '<?xml 
version="'.$this->xmlversion.'" encoding="iso-8859-1"?>'."\n";
                                        if(count($this->doctype) == 1)
                                        {
***************
*** 515,520 ****
                                                                break;
                                                        }
!                                                       
!                                                       /*if($this->data != '' 
&& !sanitize($this->data,'isbaseasci'))  // this is unnecessary with 
htmlspecialchars($this->data)
                                                        {
                                                                $result .= 
'<![CDATA['.$this->data.']]>';
--- 515,519 ----
                                                                break;
                                                        }
!                                                       /*if($this->data != '' 
&& !sanitize($this->data,'isxmlsafe'))   // this is unnecessary with 
htmlspecialchars($this->data)
                                                        {
                                                                $result .= 
'<![CDATA['.$this->data.']]>';

Index: class.phpgw.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/class.phpgw.php,v
retrieving revision 1.1.1.1.2.7
retrieving revision 1.1.1.1.2.8
diff -C2 -d -r1.1.1.1.2.7 -r1.1.1.1.2.8
*** class.phpgw.php     26 Oct 2003 07:43:06 -0000      1.1.1.1.2.7
--- class.phpgw.php     26 Oct 2003 07:54:48 -0000      1.1.1.1.2.8
***************
*** 103,106 ****
--- 103,107 ----
                        $this->prefs->fill_phpgw_data();
  
+ //$GLOBALS['phpgw_data']['server']['translate_service'] = 'google';
  //$GLOBALS['phpgw_data']['prefs']['api.lang'] = 'es';
                        $this->lang = createobject('api_lang');