Updated: Completing kernel autoload move to var, and modules move to …

…kernel dir/, admin tested as working post migration. woot!
se7enxweb · Dec 21, 2024 · e5642dc · e5642dc
1 parent 6cf74dc
commit e5642dc
Show file tree

Hide file tree

Showing 15 changed files with 75 additions and 75 deletions.
diff --git a/autoload.php b/autoload.php
@@ -62,7 +62,7 @@ public static function autoload( $className )
         {
             if ( self::$ezpClasses === null )
             {
-                $ezpKernelClasses = require __DIR__ . '/autoload/ezp_kernel.php';
+                $ezpKernelClasses = require __DIR__ . '/var/autoload/ezp_kernel.php';
                 $ezpExtensionClasses = false;
                 $ezpTestClasses = false;
 

diff --git a/autoload/.keep b/autoload/.keep
diff --git a/bin/shell/clearcache.sh b/bin/shell/clearcache.sh
@@ -2,30 +2,30 @@
 echo "Clearing the eZ publish cache . . ."
 
 dirs="
-ezad
-ezaddress
-ezarticle
-ezbug
-ezcalendar
-ezcontact
-ezforum
-ezlink
-eznewsfeed
-ezpoll
-ezstats
-eztodo
-eztrade
-ezuser
-ezfilemanager
-ezimagecatalogue
-ezsitemanager
-ezquiz
+kernel/ezad
+kernel/ezaddress
+kernel/ezarticle
+kernel/ezbug
+kernel/ezcalendar
+kernel/ezcontact
+kernel/ezforum
+kernel/ezlink
+kernel/eznewsfeed
+kernel/ezpoll
+kernel/ezstats
+kernel/eztodo
+kernel/eztrade
+kernel/ezuser
+kernel/ezfilemanager
+kernel/ezimagecatalogue
+kernel/ezsitemanager
+kernel/ezquiz
 kernel/classes
-ezurltranslator
-ezbulkmail
-ezform
-ezmediacatalogue
-ezsysinfo
+kernel/ezurltranslator
+kernel/ezbulkmail
+kernel/ezform
+kernel/ezmediacatalogue
+kernel/ezsysinfo
 "
 
 for dir in $dirs

diff --git a/design/admin/footer.php b/design/admin/footer.php
@@ -23,17 +23,17 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, US
 //
 
-include_once( "classes/INIFile.php" );
+//include_once( "kernel/classes/INIFile.php" );
 $ini =& INIFile::globalINI();
 
 $Language = $ini->read_var( "eZArticleMain", "Language" );
 
-// include_once( "classes/template.inc" );
+// include_once( "kernel/classes/template.inc" );
 // $t = new Template( $siteDir . "design/admin/templates/" . $SiteDesign );
 // $t->set_var( "www_dir", $GlobalSiteIni->WWWDir );
 // $t->set_var( "index", $GlobalSiteIni->Index );
 
-include_once( "classes/eztemplate.php" );
+//include_once( "kernel/classes/eztemplate.php" );
 $t = new eZTemplate( "design/admin/templates/" . $SiteDesign,
                      "design/admin/intl/", $Language, "footer.php" );
 

diff --git a/design/admin/header.php b/design/admin/header.php
@@ -24,11 +24,11 @@
 //
 
 
-include_once( "ezmodule/classes/ezmodulehandler.php" );
+//include_once( "kernel/ezmodule/classes/ezmodulehandler.php" );
 
-include_once( "classes/eztemplate.php" );
-include_once( "classes/ezlocale.php" );
-include_once( "classes/ezpublish.php" );
+//include_once( "kernel/classes/eztemplate.php" );
+//include_once( "kernel/classes/ezlocale.php" );
+//include_once( "kernel/classes/ezpublish.php" );
 
 $ini =& INIFile::globalINI();
 $Language =& $ini->read_var( "eZUserMain", "Language" );
@@ -41,12 +41,12 @@
 
 //$site_modules = $ini->read_array( "site", "EnabledModules" );
 $site_modules = eZModuleHandler::all();
-include_once( "ezmodule/classes/ezmodulehandler.php" );
+//include_once( "kernel/ezmodule/classes/ezmodulehandler.php" );
 
 $ModuleTab = eZModuleHandler::activeTab();
 $singleModule = eZPreferences::variable( 'SingleModule' );
 
-include_once( "ezsession/classes/ezpreferences.php" );
+//include_once( "kernel/ezsession/classes/ezpreferences.php" );
 
 $session =& eZSession::globalSession();
 
@@ -72,12 +72,12 @@
     $CategoryID = isset($url_array[4])?$url_array[4]:'';
     if ( $url_array[2] == "articleedit" )
     {
-        include_once( "ezarticle/classes/ezarticle.php" );
+        // include_once( "kernel/ezarticle/classes/ezarticle.php" );
         $CategoryID = eZArticle::categoryDefinitionStatic( $CategoryID );
     }
 
-    include_once( "ezarticle/classes/ezarticlecategory.php" );
-    include_once( "ezsitemanager/classes/ezsection.php" );
+    // include_once( "kernel/ezarticle/classes/ezarticlecategory.php" );
+    // include_once( "kernel/ezsitemanager/classes/ezsection.php" );
 
     $GlobalSectionID = eZArticleCategory::sectionIDStatic( $CategoryID );
 
@@ -90,7 +90,7 @@
     $CategoryID = $url_array[4];
     if ( $url_array[3] == "edit" )
     {
-        include_once( "ezimagecatalogue/classes/ezimage.php" );
+        // include_once( "kernel/ezimagecatalogue/classes/ezimage.php" );
         $img = new eZImage( $CategoryID );
         $Category = $img->categoryDefinition();
         if ( is_a( $Category, "eZImageCategory" ))
@@ -99,8 +99,8 @@
         }
     }
 
-    include_once( "ezimagecatalogue/classes/ezimagecategory.php" );
-    include_once( "ezsitemanager/classes/ezsection.php" );
+    // include_once( "kernel/ezimagecatalogue/classes/ezimagecategory.php" );
+    // include_once( "kernel/ezsitemanager/classes/ezsection.php" );
 
     $GlobalSectionID = eZImageCategory::sectionIDStatic( $CategoryID );
 
@@ -210,7 +210,7 @@
     foreach( $site_modules as $site_module )
     {
         $module = strtolower( $site_module );
-        if ( eZFile::file_exists( $module ) )
+        if ( eZFile::file_exists( "kernel/" . $module ) )
         {
             if ( $single_module )
             {
@@ -226,7 +226,7 @@
             $moduleLanguage = $ini->read_var( $moduleSettingName, "Language" );
             if ( !$moduleLanguage )
                 $moduleLanguage = $Language;
-            $lang_file = new INIFile( "$module/admin/intl/$moduleLanguage/menubox.php.ini" );
+            $lang_file = new INIFile( "kernel/$module/admin/intl/$moduleLanguage/menubox.php.ini" );
             $mod_name = $lang_file->read_var( "strings", "module_name" );
             $t->set_var( "module_name", $mod_name );
             $t->parse( "module_item", "module_item_tpl", true );

diff --git a/design/admin/loginfooter.php b/design/admin/loginfooter.php
@@ -23,16 +23,16 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, US
 //
 
-include_once( "classes/INIFile.php" );
+// include_once( "classes/INIFile.php" );
 $ini =& INIFile::globalINI();
 
 $Language = $ini->read_var( "eZArticleMain", "Language" );
 
-include_once( "classes/template.inc" );
+// include_once( "classes/template.inc" );
 
 // $t = new Template( $siteDir . "design/admin/templates/" . $SiteDesign );
 $t = new eZTemplate( "design/admin/templates/" . $SiteDesign,
-                     "ezuser/admin/intl/", $Language, "menubox.php" );
+                     "kernel/ezuser/admin/intl/", $Language, "menubox.php" );
 
 $t->set_file( array(
     "footer_tpl" => "loginfooter.tpl"

diff --git a/design/admin/loginheader.php b/design/admin/loginheader.php
@@ -23,9 +23,9 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, US
 //
 
-include_once( "classes/eztemplate.php" );
-include_once( "classes/ezlocale.php" );
-include_once( "classes/ezpublish.php" );
+// include_once( "classes/eztemplate.php" );
+// include_once( "classes/ezlocale.php" );
+// include_once( "classes/ezpublish.php" );
 
 $ini =& INIFile::globalINI();
 $Language =& $ini->read_var( "eZUserMain", "Language" );
@@ -34,7 +34,7 @@
 
 
 $t = new eZTemplate( "design/admin/templates/" . $SiteDesign,
-                     "ezuser/admin/intl/", $Language, "menubox.php" );
+                     "kernel/ezuser/admin/intl/", $Language, "menubox.php" );
 $t->set_file( array(
     "header_tpl" => "loginheader.tpl"
     ) );

diff --git a/design/admin/print_footer.php b/design/admin/print_footer.php
@@ -23,13 +23,13 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, US
 //
 
-include_once( "classes/INIFile.php" );
+// include_once( "classes/INIFile.php" );
 
 $ini =& INIFile::globalINI();
 $Language = $ini->read_var( "eZArticleMain", "Language" );
 
 //kracker: is this resource template.inc still required / used?
-include_once( "classes/template.inc" );
+// include_once( "classes/template.inc" );
 
 $t = new Template( "design/admin/templates/" . $SiteDesign );
 

diff --git a/design/admin/print_header.php b/design/admin/print_header.php
@@ -23,9 +23,9 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, US
 //
 
-include_once( "classes/eztemplate.php" );
-include_once( "classes/ezlocale.php" );
-include_once( "classes/ezhttptool.php" );
+// include_once( "classes/eztemplate.php" );
+// include_once( "classes/ezlocale.php" );
+// include_once( "classes/ezhttptool.php" );
 
 $ini =& INIFile::globalINI();
 $Language =& $ini->read_var( "eZUserMain", "Language" );

diff --git a/design/admin/separator.php b/design/admin/separator.php
@@ -23,20 +23,20 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, US
 //
 
-include_once( "ezsession/classes/ezpreferences.php" );
+// include_once( "kernel/ezsession/classes/ezpreferences.php" );
 $single_module = $preferences->variable( "SingleModule" ) == "enabled";
 
-include_once( "ezmodule/classes/ezmodulehandler.php" );
+// include_once( "kernel/ezmodule/classes/ezmodulehandler.php" );
 
-include_once( "classes/INIFile.php" );
+// include_once( "kernel/classes/INIFile.php" );
 $ini =& INIFile::globalINI();
 
 $Language = $ini->read_var( "eZ" . ucfirst( $moduleName ) . "Main", "Language" );
 
-include_once( "classes/eztemplate.php" );
+// include_once( "kernel/classes/eztemplate.php" );
 
 $t = new eZTemplate( "design/admin/templates/" . $SiteDesign,
-                     "ez" . $moduleName . "/admin/intl/", $Language, "menubox.php" );
+                     "kernel/ez" . $moduleName . "/admin/intl/", $Language, "menubox.php" );
 
 
 $t->set_file( array(
@@ -56,11 +56,11 @@
 if( isset( $url_array[2] ) )
 {
     // check for help file
-    $helpFile = "ez" . $moduleName . "/admin/help/". $Language . "/" . $url_array[1] . "_" . $url_array[2] . ".hlp";
+    $helpFile = "kernel/ez" . $moduleName . "/admin/help/". $Language . "/" . $url_array[1] . "_" . $url_array[2] . ".hlp";
 }
 else {
     // check for help file
-    $helpFile = "ez" . $moduleName . "/admin/help/". $Language . "/" . $url_array[1] . ".hlp";
+    $helpFile = "kernel/ez" . $moduleName . "/admin/help/". $Language . "/" . $url_array[1] . ".hlp";
 }
 $t->set_var( "help", "" );
 

diff --git a/index_admin.php b/index_admin.php
@@ -199,11 +199,11 @@
     }
 
 
-//    require( "ezuser/admin/admincheck.php" );
+//    require( "kernel/ezuser/admin/admincheck.php" );
 
     if ( $HelpMode != "enabled" ) 
     {
-        // // include_once( "ezsession/classes/ezpreferences.php" );
+        // // include_once( "kernel/ezsession/classes/ezpreferences.php" );
         $preferences = new eZPreferences();
 
         $site_modules = $ini->read_array( "site", "EnabledModules" );
@@ -257,13 +257,13 @@
             {
                 if ( !empty( $module ) )
                 {
-                    $module_dir =& strtolower( $module );
+                    $module_dir = "kernel/" . strtolower( $module );
                     unset( $menuItems );
                     include( "$module_dir/admin/menubox.php" );
                     if ( isset( $menuItems ) )
                         eZMenuBox::createBox( $module, $module_dir, "admin",
                         $SiteDesign, $menuItems, true, false,
-                        "$module_dir/admin/menubox.php", false, true );
+                        "kernel/$module_dir/admin/menubox.php", false, true );
                 }
             }
         }
@@ -320,7 +320,7 @@
 
 
         // send the URI to the right decoder
-        $page = "ez" . $url_array[1] . "/admin/datasupplier.php";
+        $page = "kernel/ez" . $url_array[1] . "/admin/datasupplier.php";
         // set the module logo
         $moduleName =& $url_array[1];
 
@@ -340,14 +340,14 @@
         }
         else
         {
-            include( "ezuser/admin/welcome.php" );
+            include( "kernel/ezuser/admin/welcome.php" );
         }
     }
     else
     {
         // show the help page
 
-        $helpFile = "ez" . $url_array[2] . "/admin/help/". $Language . "/" . $url_array[3] . "_" . $url_array[4] . ".hlp";
+        $helpFile = "kernel/ez" . $url_array[2] . "/admin/help/". $Language . "/" . $url_array[3] . "_" . $url_array[4] . ".hlp";
 
         if ( eZFile::file_exists( $helpFile ) )
         {
@@ -395,7 +395,7 @@
     $page = "";
 
     // send the URI to the right decoder
-    $page = "ezuser/admin/datasupplier.php";
+    $page = "kernel/ezuser/admin/datasupplier.php";
 
     if ( eZFile::file_exists( $page ) )
     {

diff --git a/kernel/classes/INIFile.php b/kernel/classes/INIFile.php
@@ -109,7 +109,7 @@ function __construct( $inifilename = "", $write = false )
             }
             $buffer = "<?php\n" . $buffer . "\n?>";
 
-            $fp = eZFile::fopen( $cachedFile, "w+" );
+	    $fp = eZFile::fopen( $cachedFile, "w+" );
             fwrite ( $fp, $buffer );
             fclose( $fp );
         }

diff --git a/kernel/classes/ezmenubox.php b/kernel/classes/ezmenubox.php
@@ -38,8 +38,8 @@
 
 */
 
-include_once( "kernel/classes/INIFile.php" );
-include_once( "kernel/classes/eztemplate.php" );
+// include_once( "kernel/classes/INIFile.php" );
+// include_once( "kernel/classes/eztemplate.php" );
 
 class eZMenuBox
 {
@@ -96,7 +96,7 @@ static public function createBox( $ModuleName, $module_dir, $place, $SiteDesign,
         if ( $allow_module_template )
         {
             $mod_dir = $ini->read_var( $ModuleName . "Main", "AdminTemplateDir" );
-            $mod_dir = "$module_dir/admin/$mod_dir";
+            $mod_dir = "kernel/$module_dir/admin/$mod_dir";
             if ( eZFile::file_exists( "$mod_dir/menubox.tpl" ) and
                  eZFile::file_exists( "$mod_dir/menubox_closed.tpl" ) )
             {

diff --git a/kernel/ezmodule/admin/activate.php b/kernel/ezmodule/admin/activate.php
@@ -73,7 +73,7 @@
 {
     // set the first menu item active
     unset( $menuItems );
-    include( strtolower($ModuleName) ."/admin/menubox.php" );
+    include( "kernel/" . strtolower($ModuleName) ."/admin/menubox.php" );
     $uri = $menuItems[0][0];
     unset( $menuItems );
 }