projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove money hook
[platal.git]
/
include
/
xorg.inc.php
diff --git
a/include/xorg.inc.php
b/include/xorg.inc.php
index
8c121dc
..
52cd829
100644
(file)
--- a/
include/xorg.inc.php
+++ b/
include/xorg.inc.php
@@
-18,6
+18,7
@@
* Foundation, Inc., *
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
***************************************************************************/
* Foundation, Inc., *
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
***************************************************************************/
+
require_once('platal.inc.php');
require_once('xorg/globals.inc.php');
require_once('xorg/session.inc.php');
require_once('platal.inc.php');
require_once('xorg/globals.inc.php');
require_once('xorg/session.inc.php');
@@
-25,13
+26,13
@@
XorgGlobals::init();
XorgGlobals::setlocale();
XorgSession::init();
XorgGlobals::setlocale();
XorgSession::init();
-require_once
('platal/page.inc.php')
;
+require_once
dirname(__FILE__).'/../classes/Page.php'
;
// {{{ class XorgPage
class XorgPage extends PlatalPage
{
// {{{ class XorgPage
class XorgPage extends PlatalPage
{
- function XorgPage($tpl, $type
=
SKINNED)
+ function XorgPage($tpl, $type
=
SKINNED)
{
$this->PlatalPage($tpl, $type);
}
{
$this->PlatalPage($tpl, $type);
}
@@
-39,9
+40,7
@@
class XorgPage extends PlatalPage
function run()
{
global $globals;
function run()
{
global $globals;
- if ($this->_page_type != NO_SKIN) {
- $this->assign('menu', $globals->menu->menu());
- }
+ $this->assign('globals', $globals);
$this->_run('skin/'.S::v('skin', 'default.tpl'));
}
}
$this->_run('skin/'.S::v('skin', 'default.tpl'));
}
}
@@
-55,7
+54,7
@@
class XorgAdmin extends XorgPage
{
// {{{ function XorgAdmin()
{
// {{{ function XorgAdmin()
- function XorgAdmin($tpl, $type
=
SKINNED)
+ function XorgAdmin($tpl, $type
=
SKINNED)
{
$this->XorgPage($tpl, $type);
check_perms();
{
$this->XorgPage($tpl, $type);
check_perms();
@@
-98,10
+97,6
@@
function new_admin_page($tpl_name)
function new_admin_table_editor($table, $idfield, $idedit=false)
{
function new_admin_table_editor($table, $idfield, $idedit=false)
{
- array_walk($_GET, 'unfix_gpc_magic');
- array_walk($_POST, 'unfix_gpc_magic');
- array_walk($_REQUEST, 'unfix_gpc_magic');
-
global $editor;
new_admin_page('table-editor.tpl');
require_once('xorg.table-editor.inc.php');
global $editor;
new_admin_page('table-editor.tpl');
require_once('xorg.table-editor.inc.php');