Index: trunk/admin/include/sections.php
===================================================================
diff -u -r837 -r843
--- trunk/admin/include/sections.php (.../sections.php) (revision 837)
+++ trunk/admin/include/sections.php (.../sections.php) (revision 843)
@@ -390,15 +390,33 @@
break;
}
- $o = '
-
+ if( defined('REQUIRE_LAYER_HEADER') )
+ {
+
+ $o = "
+
+
![](".$imagesURL.)
![](".$imagesURL."/spacer.gif)
+
";
+ $o .= "
+
+ ![\"\"](\"$icon\") $caption
+
+ |
";
+ }
+ else
+ {
+ $o = '
+
+
 '.$caption.'
|
-
';
+
+ ';
+ }
}
}
return $o;
Index: trunk/admin/advanced_view.php
===================================================================
diff -u -r642 -r843
--- trunk/admin/advanced_view.php (.../advanced_view.php) (revision 642)
+++ trunk/admin/advanced_view.php (.../advanced_view.php) (revision 843)
@@ -1,371 +1,372 @@
-
";
-
-if(!strlen($pathtoroot))
-{
- $path=dirname(realpath(__FILE__));
- if(strlen($path))
- {
- /* determine the OS type for path parsing */
- $pos = strpos($path,":");
- if ($pos === false)
- {
- $gOS_TYPE="unix";
- $pathchar = "/";
- }
- else
- {
- $gOS_TYPE="win";
- $pathchar="\\";
- }
- $p = $path.$pathchar;
- /*Start looking for the root flag file */
- while(!strlen($pathtoroot) && strlen($p))
- {
- $sub = substr($p,strlen($pathchar)*-1);
- if($sub==$pathchar)
- {
- $filename = $p."root.flg";
- }
- else
- $filename = $p.$pathchar."root.flg";
- if(file_exists($filename))
- {
- $pathtoroot = $p;
- }
- else
- {
- $parent = realpath($p.$pathchar."..".$pathchar);
- if($parent!=$p)
- {
- $p = $parent;
- }
- else
- $p = "";
- }
- }
- if(!strlen($pathtoroot))
- $pathtoroot = ".".$pathchar;
- }
- else
- {
- $pathtoroot = ".".$pathchar;
- }
-}
-
-$sub = substr($pathtoroot,strlen($pathchar)*-1);
-if($sub!=$pathchar)
-{
- $pathtoroot = $pathtoroot.$pathchar;
-}
-//echo $pathtoroot;
-
-require_once($pathtoroot."kernel/startup.php");
-
-if (!admin_login())
-{
- if(!headers_sent())
- setcookie("sid"," ",time()-3600);
- $objSession->Logout();
- header("Location: ".$adminURL."/login.php");
- die();
- //require_once($pathtoroot."admin/login.php");
-}
-
-$rootURL="http://".ThisDomain().$objConfig->Get("Site_Path");
-$admin = $objConfig->Get("AdminDirectory");
-if(!strlen($admin))
- $admin = "admin";
-
-$localURL=$rootURL."kernel/";
-$adminURL = $rootURL.$admin;
-$imagesURL = $adminURL."/images";
-$browseURL = $adminURL."/browse";
-$cssURL = $adminURL."/include";
-
-$indexURL = $rootURL."index.php";
-
-$m_var_list_update["cat"] = 0;
-$homeURL = "javascript:AdminCatNav('".$_SERVER["PHP_SELF"]."?env=".BuildEnv()."');";
-unset($m_var_list_update["cat"]);
-
-//admin only util
-
-$pathtolocal = $pathtoroot."kernel/";
-require_once ($pathtoroot.$admin."/include/elements.php");
-//require_once ($pathtoroot."kernel/admin/include/navmenu.php");
-require_once ($pathtolocal."admin/include/navmenu.php");
-require_once($pathtoroot.$admin."/browse/toolbar.php");
-
-$mod_prefixes = Array();
-$m = GetModuleArray();
-foreach($m as $key=>$value)
-{
- $path = $pathtoroot.$value."admin/include/parser.php";
- if(file_exists($path))
- {
- //echo "";
- $mod_prefixes[] = $key;
- @include_once($path);
- }
-}
-
-if(!defined('IS_INSTALL'))define('IS_INSTALL',0);
-if(!IS_INSTALL)
-{
- if (!admin_login())
- {
- if(!headers_sent())
- setcookie("sid"," ",time()-3600);
- $objSession->Logout();
- header("Location: ".$adminURL."/login.php");
- die();
- //require_once($pathtoroot."admin/login.php");
- }
-}
-//Set Section
-$section = 'in-portal:advanced_view';
-
-//Set Environment Variable
-
-// save last category visited
-$objSession->SetVariable('prev_category', $objSession->GetVariable('last_category') );
-$objSession->SetVariable('last_category', $objCatList->CurrentCategoryID() );
-
-$objSession->SetVariable("HasChanges", 0);
-// where should all edit popups submit changes
-$objSession->SetVariable("ReturnScript", basename($_SERVER['PHP_SELF']) );
-
-
-// common "Advanced View" tab php functions: begin
-function GetAdvView_SearchWord($prefix)
-{
- global $objSession;
- return $objSession->GetVariable($prefix.'_adv_view_search');
-}
-
-function SaveAdvView_SearchWord($prefix)
-{
- global $objSession;
- $SearchWord = $objSession->GetVariable($prefix.'_adv_view_search');
- if( isset($_REQUEST['SearchWord']) )
- {
- $SearchWord = $_REQUEST['SearchWord'];
- $objSession->SetVariable($prefix.'_adv_view_search', $SearchWord);
- }
-}
-
-function ResetAdvView_SearchWord($prefix)
-{
- global $objSession;
- $objSession->SetVariable($prefix.'_adv_view_search', '');
-}
-
-function ShowSearchForm($prefix, $envar, $TabID)
-{
- global $imagesURL;
- $btn_prefix = $imagesURL.'/toolbar/icon16_search';
- $SearchWord = GetAdvView_SearchWord($prefix);
- echo '
-
-
- ';
-}
-// common "Advanced View" tab php functions: end
-
-/* page header */
-print <<
-
- In-portal
-
-
-
-
-END;
-
- require_once($pathtoroot.$admin."/include/mainscript.php");
-
-print <<
- if (window.opener != null) {
- theMainScript.CloseAndRefreshParent();
- }
-
-END;
-
-print <<
-
-
-
-
-
-END;
-load_module_styles();
-if( !isset($list) ) $list = '';
-
-int_SectionHeader();
-
- $filter = false;
- $bit_combo = $objModules->ExecuteFunction('GetModuleInfo', 'all_bitmask');
- $bit_combo = $objModules->MergeReturn($bit_combo);
- foreach($bit_combo['VarName'] as $mod_name => $VarName)
- {
- //echo "VarName: [$VarName] = [".$objConfig->Get($VarName)."], ALL = [".$bit_combo['Bits'][$mod_name]."]
";
- if( $objConfig->Get($VarName) )
- if( $objConfig->Get($VarName) != $bit_combo['Bits'][$mod_name] )
- {
- $filter = true;
- break;
- }
- }
-
-?>
-
-
-
-
-
-
-
-
-
-
- TabRow();
-
- if(count($ItemTabs->Tabs))
- {
- ?>
-
-
-
-
- $value)
- {
- $path = $pathtoroot.$value."admin/advanced_view.php";
- //echo "Including File: $path
";
- if(file_exists($path))
- {
- //echo "\n\n";
- include_once($path);
- }
- }
- ?>
-
-
";
+
+if(!strlen($pathtoroot))
+{
+ $path=dirname(realpath(__FILE__));
+ if(strlen($path))
+ {
+ /* determine the OS type for path parsing */
+ $pos = strpos($path,":");
+ if ($pos === false)
+ {
+ $gOS_TYPE="unix";
+ $pathchar = "/";
+ }
+ else
+ {
+ $gOS_TYPE="win";
+ $pathchar="\\";
+ }
+ $p = $path.$pathchar;
+ /*Start looking for the root flag file */
+ while(!strlen($pathtoroot) && strlen($p))
+ {
+ $sub = substr($p,strlen($pathchar)*-1);
+ if($sub==$pathchar)
+ {
+ $filename = $p."root.flg";
+ }
+ else
+ $filename = $p.$pathchar."root.flg";
+ if(file_exists($filename))
+ {
+ $pathtoroot = $p;
+ }
+ else
+ {
+ $parent = realpath($p.$pathchar."..".$pathchar);
+ if($parent!=$p)
+ {
+ $p = $parent;
+ }
+ else
+ $p = "";
+ }
+ }
+ if(!strlen($pathtoroot))
+ $pathtoroot = ".".$pathchar;
+ }
+ else
+ {
+ $pathtoroot = ".".$pathchar;
+ }
+}
+
+$sub = substr($pathtoroot,strlen($pathchar)*-1);
+if($sub!=$pathchar)
+{
+ $pathtoroot = $pathtoroot.$pathchar;
+}
+//echo $pathtoroot;
+
+require_once($pathtoroot."kernel/startup.php");
+
+if (!admin_login())
+{
+ if(!headers_sent())
+ setcookie("sid"," ",time()-3600);
+ $objSession->Logout();
+ header("Location: ".$adminURL."/login.php");
+ die();
+ //require_once($pathtoroot."admin/login.php");
+}
+
+$rootURL="http://".ThisDomain().$objConfig->Get("Site_Path");
+$admin = $objConfig->Get("AdminDirectory");
+if(!strlen($admin))
+ $admin = "admin";
+
+$localURL=$rootURL."kernel/";
+$adminURL = $rootURL.$admin;
+$imagesURL = $adminURL."/images";
+$browseURL = $adminURL."/browse";
+$cssURL = $adminURL."/include";
+
+$indexURL = $rootURL."index.php";
+
+$m_var_list_update["cat"] = 0;
+$homeURL = "javascript:AdminCatNav('".$_SERVER["PHP_SELF"]."?env=".BuildEnv()."');";
+unset($m_var_list_update["cat"]);
+
+//admin only util
+
+$pathtolocal = $pathtoroot."kernel/";
+require_once ($pathtoroot.$admin."/include/elements.php");
+//require_once ($pathtoroot."kernel/admin/include/navmenu.php");
+require_once ($pathtolocal."admin/include/navmenu.php");
+require_once($pathtoroot.$admin."/browse/toolbar.php");
+
+$mod_prefixes = Array();
+$m = GetModuleArray();
+foreach($m as $key=>$value)
+{
+ $path = $pathtoroot.$value."admin/include/parser.php";
+ if(file_exists($path))
+ {
+ //echo "";
+ $mod_prefixes[] = $key;
+ @include_once($path);
+ }
+}
+
+if(!defined('IS_INSTALL'))define('IS_INSTALL',0);
+if(!IS_INSTALL)
+{
+ if (!admin_login())
+ {
+ if(!headers_sent())
+ setcookie("sid"," ",time()-3600);
+ $objSession->Logout();
+ header("Location: ".$adminURL."/login.php");
+ die();
+ //require_once($pathtoroot."admin/login.php");
+ }
+}
+//Set Section
+$section = 'in-portal:advanced_view';
+
+//Set Environment Variable
+
+// save last category visited
+$objSession->SetVariable('prev_category', $objSession->GetVariable('last_category') );
+$objSession->SetVariable('last_category', $objCatList->CurrentCategoryID() );
+
+$objSession->SetVariable("HasChanges", 0);
+// where should all edit popups submit changes
+$objSession->SetVariable("ReturnScript", basename($_SERVER['PHP_SELF']) );
+
+
+// common "Advanced View" tab php functions: begin
+function GetAdvView_SearchWord($prefix)
+{
+ global $objSession;
+ return $objSession->GetVariable($prefix.'_adv_view_search');
+}
+
+function SaveAdvView_SearchWord($prefix)
+{
+ global $objSession;
+ $SearchWord = $objSession->GetVariable($prefix.'_adv_view_search');
+ if( isset($_REQUEST['SearchWord']) )
+ {
+ $SearchWord = $_REQUEST['SearchWord'];
+ $objSession->SetVariable($prefix.'_adv_view_search', $SearchWord);
+ }
+}
+
+function ResetAdvView_SearchWord($prefix)
+{
+ global $objSession;
+ $objSession->SetVariable($prefix.'_adv_view_search', '');
+}
+
+function ShowSearchForm($prefix, $envar, $TabID)
+{
+ global $imagesURL;
+ $btn_prefix = $imagesURL.'/toolbar/icon16_search';
+ $SearchWord = GetAdvView_SearchWord($prefix);
+ echo '
+
+
+ ';
+}
+// common "Advanced View" tab php functions: end
+
+/* page header */
+print <<
+
+ In-portal
+
+
+
+
+END;
+
+ require_once($pathtoroot.$admin."/include/mainscript.php");
+
+print <<
+ if (window.opener != null) {
+ theMainScript.CloseAndRefreshParent();
+ }
+
+END;
+
+print <<
+
+
+
+
+
+END;
+load_module_styles();
+if( !isset($list) ) $list = '';
+
+int_SectionHeader();
+
+ $filter = false;
+ $bit_combo = $objModules->ExecuteFunction('GetModuleInfo', 'all_bitmask');
+ $bit_combo = $objModules->MergeReturn($bit_combo);
+ foreach($bit_combo['VarName'] as $mod_name => $VarName)
+ {
+ //echo "VarName: [$VarName] = [".$objConfig->Get($VarName)."], ALL = [".$bit_combo['Bits'][$mod_name]."]
";
+ if( $objConfig->Get($VarName) )
+ if( $objConfig->Get($VarName) != $bit_combo['Bits'][$mod_name] )
+ {
+ $filter = true;
+ break;
+ }
+ }
+
+?>
+
+
+
+
+
+
+
+
+
+
+ TabRow();
+
+ if(count($ItemTabs->Tabs))
+ {
+ ?>
+
+
+
+
+ $value)
+ {
+ $path = $pathtoroot.$value."admin/advanced_view.php";
+ //echo "Including File: $path
";
+ if(file_exists($path))
+ {
+ //echo "\n\n";
+ include_once($path);
+ }
+ }
+ ?>
+
+
";
Index: trunk/admin/include/elements.php
===================================================================
diff -u -r837 -r843
--- trunk/admin/include/elements.php (.../elements.php) (revision 837)
+++ trunk/admin/include/elements.php (.../elements.php) (revision 843)
@@ -456,6 +456,7 @@
{
//phpinfo();
}
+ if( defined('REQUIRE_LAYER_HEADER') ) echo '
';
print <<