mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-11 09:04:38 +02:00
Code Issues Releases Wiki Activity

Introducing e_IFRAME mod; NOHEADER changed to e_NOHEADER; overall menu.php url checks cleaned (API, header, footer); menu related code cleanup and fixes, e_parse improvements (more work is needed); smarter getSingleton() and getObject() (in progress)

Browse Source
This commit is contained in:
secretr
2009-08-19 14:39:57 +00:00
parent e8f6645d10
commit 3099bf9052
9 changed files with 356 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
e107_admin/menus.php
View File

@@ -10,11 +10,19 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_admin/menus.php,v $
| $Revision: 1.32 $
| $Date: 2009-08-16 16:30:56 $
| $Revision: 1.33 $
| $Date: 2009-08-19 14:39:56 $
| $Author: secretr $
+----------------------------------------------------------------------------+
*/
if(isset($_GET['configure']))
{
//Switch to Front-end
define("USER_AREA", true);
//Switch to desired layout
define('THEME_LAYOUT', $_GET['configure']);
}
require_once("../class2.php");
if (!getperms("2"))
{
@@ -23,7 +31,6 @@ if (!getperms("2"))
}
$e_sub_cat = 'menus';
require_once(e_HANDLER."file_class.php");
require_once(e_HANDLER."form_handler.php");
require_once (e_HANDLER.'message_handler.php');
@@ -35,23 +42,22 @@ require_once(e_HANDLER."menumanager_class.php");
$men = new e_menuManager(); // use 1 for dragdrop.
if(isset($_GET['ajax']))
{
$men->menuSaveAjax();
if(e_AJAX_REQUEST)
{
$men->menuSaveAjax();
exit;
}
}
if(isset($_GET['configure']))
{
//No layout parse when in iframe mod
define('e_IFRAME', true);
}
require_once("auth.php");
if($_POST)
{
// print_a($_POST);
// exit;
$e107cache->clear_sys("menus_");
}
@@ -63,7 +69,8 @@ if($_POST)
}
if (strpos(e_QUERY, 'configure') === FALSE)
//BC - configure and dot delimiter deprecated
if (!isset($_GET['configure']))
{
$men->menuScanMenus();
$text .= $men->menuRenderMessage();
@@ -71,23 +78,9 @@ if($_POST)
$text .= $men->menuVisibilityOptions();
$text .= $men->menuRenderIframe();
$ns -> tablerender(ADLAN_6." :: ".LAN_MENULAYOUT, $text, 'menus_config');
// $text .= "<iframe name='menu_iframe' id='menu_iframe' src='".e_SELF."?configure.$curLayout' width='100%' style='width: 100%; height: ".(($cnt*90)+600)."px; border: 0px' frameborder='0' scrolling='auto' ></iframe>";
}
else // Within the IFrame.
{
/* echo "<div>
e_QUERY = ".e_QUERY."<br />
curLayout = ".$men->curLayout."<br />
dbLayout = ".$men->dbLayout."<br />";
print_a($_POST);
echo "
</div>";*/
$men->menuRenderPage();
}
@@ -123,6 +116,7 @@ function headerjs()
if(strpos(e_QUERY, 'configure') !== FALSE )
{
//FIXME - proto/scripty already loaded, create and jsmanager handler
$ret = "
<!-- load prototype and scriptaculous -->
@@ -161,7 +155,7 @@ function headerjs()
};
var options = {
editorEnabled : true,
'saveurl' : '".e_SELF."?ajax=',
'saveurl' : '".e_SELF."?ajax_used=1',
hoverclass: 'block-hover'
};