[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] api class.base.php, 1.1.1.1.2.2, 1.1.1.1.2.3 class.la
|
From: |
Dan Kuykendall <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] api class.base.php, 1.1.1.1.2.2, 1.1.1.1.2.3 class.lang.php, 1.1.2.5, 1.1.2.6 class.phpgw.php, 1.1.1.1.2.6, 1.1.1.1.2.7 class.xmltool.php, 1.1.1.1.2.1, 1.1.1.1.2.2 core_functions.inc.php, 1.1.1.1.2.3, 1.1.1.1.2.4 starter.inc.php, 1.1.1.1.2.4, 1.1.1.1.2.5 |
|
Date: |
Sun, 26 Oct 2003 07:43:09 +0000 |
Update of /cvsroot/phpgroupware/api
In directory subversions:/tmp/cvs-serv20952/api
Modified Files:
Tag: proposal-branch
class.base.php class.lang.php class.phpgw.php
class.xmltool.php core_functions.inc.php starter.inc.php
Log Message:
fighting stupid issues
Index: starter.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/starter.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
*** starter.inc.php 26 Oct 2003 06:15:44 -0000 1.1.1.1.2.4
--- starter.inc.php 26 Oct 2003 07:43:06 -0000 1.1.1.1.2.5
***************
*** 210,214 ****
else
{
! $GLOBALS['msgbox']->add(lang('You do not have access to
').$methodname,__LINE__,__FILE__, 'access');
foreach($inputs as $key=>$val)
{
--- 210,220 ----
else
{
! $msg = 'You do not have access to';
! if(function_exists('lang'))
! {
! $msg = lang($msg);
! }
!
! $GLOBALS['msgbox']->add(lang($msg.'
').$methodname,__LINE__,__FILE__, 'access');
foreach($inputs as $key=>$val)
{
Index: class.base.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/class.base.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.base.php 24 Oct 2003 06:22:15 -0000 1.1.1.1.2.2
--- class.base.php 26 Oct 2003 07:43:06 -0000 1.1.1.1.2.3
***************
*** 38,41 ****
--- 38,42 ----
{
$GLOBALS['phpgw']->add_xsl('api.login');
+ $GLOBALS['phpgw']->load_base();
$GLOBALS['phpgw']->phpgw_out(False);
}
Index: class.phpgw.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/class.phpgw.php,v
retrieving revision 1.1.1.1.2.6
retrieving revision 1.1.1.1.2.7
diff -C2 -d -r1.1.1.1.2.6 -r1.1.1.1.2.7
*** class.phpgw.php 26 Oct 2003 06:15:44 -0000 1.1.1.1.2.6
--- class.phpgw.php 26 Oct 2003 07:43:06 -0000 1.1.1.1.2.7
***************
*** 89,92 ****
--- 89,97 ----
}
}
+ $this->load_base();
+ }
+
+ function load_base()
+ {
/* load up the accounts, preferences and application
classeses */
/* and also have them send their appropriate data to
phpgw_data */
***************
*** 104,109 ****
$this->apps = createobject('api_apps');
! $this->apps->fill_phpgw_data();
! }
function add_xsl($xsl)
--- 109,114 ----
$this->apps = createobject('api_apps');
! $this->apps->fill_phpgw_data();
! }
function add_xsl($xsl)
***************
*** 127,160 ****
function apimenu()
{
! if(is_object($this->acl))
{
! if($this->acl->check('api.base.start', 1))
! {
! $menu[] = array(
! 'title' => lang('Home', 'api'),
! 'op' => 'api.base.start',
! );
! }
! if($this->acl->check('api.admin.start', 1))
! {
! $menu[] = array(
! 'title' => lang('Admin', 'api'),
! 'op' => 'api.admin.start',
! );
! }
! if($this->acl->check('api.base.prefs', 1))
! {
! $menu[] = array(
! 'title' => lang('Preferences',
'api'),
! 'op' => 'api.base.prefs',
! );
! }
! if($this->acl->check('api.base.about', 1))
! {
! $menu[] = array(
! 'title' => lang('About', 'api'),
! 'op' => 'api.base.about',
! );
! }
}
$menu[] = array(
--- 132,162 ----
function apimenu()
{
! if($this->acl->check('api.base.start', 1))
{
! $menu[] = array(
! 'title' => lang('Home', 'api'),
! 'op' => 'api.base.start',
! );
! }
! if($this->acl->check('api.admin.start', 1))
! {
! $menu[] = array(
! 'title' => lang('Admin', 'api'),
! 'op' => 'api.admin.start',
! );
! }
! if($this->acl->check('api.base.prefs', 1))
! {
! $menu[] = array(
! 'title' => lang('Preferences', 'api'),
! 'op' => 'api.base.prefs',
! );
! }
! if($this->acl->check('api.base.about', 1))
! {
! $menu[] = array(
! 'title' => lang('About', 'api'),
! 'op' => 'api.base.about',
! );
}
$menu[] = array(
***************
*** 187,190 ****
--- 189,193 ----
$GLOBALS['phpgw_xml_apinode']->add_node($this->hooks->data,'hooks');
}
+ //html_print_r($GLOBALS);
$GLOBALS['phpgw_xml_apinode']->add_node($this->apimenu(),'apimenu');
Index: class.lang.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/Attic/class.lang.php,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -d -r1.1.2.5 -r1.1.2.6
*** class.lang.php 26 Oct 2003 06:15:44 -0000 1.1.2.5
--- class.lang.php 26 Oct 2003 07:43:06 -0000 1.1.2.6
***************
*** 79,83 ****
if(!isset($GLOBALS['phpgw_data']['server']['translate_service']))
{
!
$GLOBALS['phpgw_data']['server']['translate_service'] = 'google';
}
--- 79,83 ----
if(!isset($GLOBALS['phpgw_data']['server']['translate_service']))
{
!
$GLOBALS['phpgw_data']['server']['translate_service'] = 'disabled';
}
Index: core_functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/core_functions.inc.php,v
retrieving revision 1.1.1.1.2.3
retrieving revision 1.1.1.1.2.4
diff -C2 -d -r1.1.1.1.2.3 -r1.1.1.1.2.4
*** core_functions.inc.php 26 Oct 2003 04:57:27 -0000 1.1.1.1.2.3
--- core_functions.inc.php 26 Oct 2003 07:43:06 -0000 1.1.1.1.2.4
***************
*** 94,99 ****
if(file_exists($filename))
{
! require_once($filename);
!
if(class_exists($class))
{
--- 94,98 ----
if(file_exists($filename))
{
! require_once($filename);
if(class_exists($class))
{
***************
*** 318,322 ****
$msg =
lang($msg);
}
!
$GLOBALS['msgbox']->add($msg.' "'.$key.'" ' . "$file:$line",$line,$file,
'fatal');
}
}
--- 317,321 ----
$msg =
lang($msg);
}
!
$GLOBALS['msgbox']->add($msg.' "'.$key.'"',$line,$file, 'fatal');
}
}
***************
*** 371,377 ****
return (preg_match("/^[[:print:]]+$/", $input)
&& !preg_match("/['\"<>*#;]/$/", $input));
break;
case 'ip': /* IP4 address */
if
(preg_match("^([012]?\d{1,2}\.){3}[012]?\d{1,2}$",$input))
! {
$octets = explode('.',$input);
$n = count($octets);
--- 370,390 ----
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))
! {
$octets = explode('.',$input);
$n = count($octets);
Index: class.xmltool.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/class.xmltool.php,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -C2 -d -r1.1.1.1.2.1 -r1.1.1.1.2.2
*** class.xmltool.php 24 Oct 2003 22:09:44 -0000 1.1.1.1.2.1
--- class.xmltool.php 26 Oct 2003 07:43:06 -0000 1.1.1.1.2.2
***************
*** 493,497 ****
foreach($this->attributes as
$key=>$val)
{
! $result .= '
'.$key.'="'.htmlspecialchars($val).'"';
}
}
--- 493,498 ----
foreach($this->attributes as
$key=>$val)
{
! $val = htmlspecialchars($val);
! $result .= '
'.$key.'="'.$val.'"';
}
}
***************
*** 515,519 ****
}
!
/*if(preg_match("(&|<|>)", $this->data)) // this is unnecessary with
htmlspecialchars($this->data)
{
$result .=
'<![CDATA['.$this->data.']]>';
--- 516,520 ----
}
! /*if($this->data != ''
&& !sanitize($this->data,'isbaseasci')) // this is unnecessary with
htmlspecialchars($this->data)
{
$result .=
'<![CDATA['.$this->data.']]>';
***************
*** 522,531 ****
else*/if(strlen($this->data) > 120 && !empty($this->indentstring))
{
! $result .=
"\n".$indentstring.$this->indentstring.htmlspecialchars($this->data)."\n";
$endtag_indent
= $indentstring;
}
else
{
! $result .=
htmlspecialchars($this->data);
$endtag_indent
= '';
}
--- 523,540 ----
else*/if(strlen($this->data) > 120 && !empty($this->indentstring))
{
! $this->data =
htmlspecialchars($this->data);
! $result .=
"\n".$indentstring.$this->indentstring.$this->data."\n";
$endtag_indent
= $indentstring;
}
else
{
! /*
! $this->data =
htmlspecialchars($this->data);
! if
(!sanitize($this->data,'isbaseasci'))
! {
!
$this->data = '<![CDATA['.$this->data.']]>';
! }
! */
! $result .=
$this->data ;
$endtag_indent
= '';
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] api class.base.php, 1.1.1.1.2.2, 1.1.1.1.2.3 class.lang.php, 1.1.2.5, 1.1.2.6 class.phpgw.php, 1.1.1.1.2.6, 1.1.1.1.2.7 class.xmltool.php, 1.1.1.1.2.1, 1.1.1.1.2.2 core_functions.inc.php, 1.1.1.1.2.3, 1.1.1.1.2.4 starter.inc.php, 1.1.1.1.2.4, 1.1.1.1.2.5,
Dan Kuykendall <address@hidden> <=