[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] sitemgr/inc class.Categories_BO.inc.php class.C... [s
|
From: |
Dave Hall |
|
Subject: |
[Phpgroupware-cvs] sitemgr/inc class.Categories_BO.inc.php class.C... [skwashd-16-compat] |
|
Date: |
Mon, 14 Aug 2006 01:51:14 +0000 |
CVSROOT: /cvsroot/phpgroupware
Module name: sitemgr
Branch: skwashd-16-compat
Changes by: Dave Hall <skwashd> 06/08/14 01:51:14
Modified files:
inc : class.Categories_BO.inc.php
class.Content_BO.inc.php
class.Content_UI.inc.php
Log message:
make error message a little nicer
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/sitemgr/inc/class.Categories_BO.inc.php?cvsroot=phpgroupware&only_with_tag=skwashd-16-compat&r1=1.6.2.2.4.3&r2=1.6.2.2.4.4
http://cvs.savannah.gnu.org/viewcvs/sitemgr/inc/class.Content_BO.inc.php?cvsroot=phpgroupware&only_with_tag=skwashd-16-compat&r1=1.2.2.1.4.1&r2=1.2.2.1.4.2
http://cvs.savannah.gnu.org/viewcvs/sitemgr/inc/class.Content_UI.inc.php?cvsroot=phpgroupware&only_with_tag=skwashd-16-compat&r1=1.3.2.4.2.3&r2=1.3.2.4.2.4
Patches:
Index: class.Categories_BO.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Categories_BO.inc.php,v
retrieving revision 1.6.2.2.4.3
retrieving revision 1.6.2.2.4.4
diff -u -b -r1.6.2.2.4.3 -r1.6.2.2.4.4
--- class.Categories_BO.inc.php 28 Mar 2006 01:07:17 -0000 1.6.2.2.4.3
+++ class.Categories_BO.inc.php 14 Aug 2006 01:51:13 -0000 1.6.2.2.4.4
@@ -347,13 +347,13 @@
if (in_array($cat_id,$this->currentcats)
|| ($cat_id == CURRENT_SITE_ID &&
$GLOBALS['Common_BO']->acl->is_admin() ) )
{
- return True;
+ return true;
}
else
{
- //print_r($this->currentcats);
//var_dump(debug_backtrace());
- echo '<p><center><b>'.lang('Attempt to access
information outside current website').'</b></center>';
+ echo '<h1 style="color: #f00; font-family:
Arial, Helvetica, sans-serif;">'.lang('Attempt to access information outside
current website').'</h1>';
+ echo '<pre>' . print_r($this->currentcats,
true) . '</pre>';
$GLOBALS['phpgw']->common->phpgw_exit(True);
}
}
Index: class.Content_BO.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Content_BO.inc.php,v
retrieving revision 1.2.2.1.4.1
retrieving revision 1.2.2.1.4.2
diff -u -b -r1.2.2.1.4.1 -r1.2.2.1.4.2
--- class.Content_BO.inc.php 27 Mar 2006 13:13:24 -0000 1.2.2.1.4.1
+++ class.Content_BO.inc.php 14 Aug 2006 01:51:13 -0000 1.2.2.1.4.2
@@ -136,7 +136,7 @@
while(list(,$versionid) = @each($versions))
{
//since we already did the ACL we force
- $this->deleteversion($versionid,True);
+ $this->deleteversion($versionid, true);
}
return true;
}
Index: class.Content_UI.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Content_UI.inc.php,v
retrieving revision 1.3.2.4.2.3
retrieving revision 1.3.2.4.2.4
diff -u -b -r1.3.2.4.2.3 -r1.3.2.4.2.4
--- class.Content_UI.inc.php 27 Mar 2006 13:13:24 -0000 1.3.2.4.2.3
+++ class.Content_UI.inc.php 14 Aug 2006 01:51:13 -0000 1.3.2.4.2.4
@@ -182,7 +182,7 @@
//if we delete a block we were editing, there
is nothing left to do
if ($block_id)
{
- echo '<html><head></head><body
onload="opener.location.reload();self.close()"></body></html>';
+ die('<html><head></head><body
onload="opener.location.reload();self.close()"></body></html>');
}
}
elseif ($btnCreateVersion)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] sitemgr/inc class.Categories_BO.inc.php class.C... [skwashd-16-compat],
Dave Hall <=