Index: branches/5.1.x/install.php =================================================================== diff -u -r12920 -r14255 --- branches/5.1.x/install.php (.../5.0.x/install.php) (revision 12920) +++ branches/5.1.x/install.php (.../5.1.x/install.php) (revision 14255) @@ -1,6 +1,6 @@ <?php /** -* @version $Id: install.php 12920 2009-11-12 19:16:27Z alex $ +* @version $Id: install.php 14255 2011-03-16 21:33:31Z alex $ * @package In-News * @copyright Copyright (C) 1997 - 2009 Intechnic. All rights reserved. * @license GNU/GPL @@ -11,14 +11,14 @@ * or other free or open source software licenses. * See http://www.in-portal.org/license for copyright notices and details. */ - $module_folder = 'in-news'; + $module_folder = 'modules/in-news'; if (!defined('IS_INSTALL')) { // separate module install define('IS_INSTALL', 1); define('ADMIN', 1); define('REL_PATH', $module_folder); - define('FULL_PATH', realpath(dirname(__FILE__) . '/..') ); + define('FULL_PATH', realpath(dirname(__FILE__) . '/../..') ); include_once(FULL_PATH . '/core/kernel/startup.php'); require_once FULL_PATH . '/core/install/install_toolkit.php'; @@ -34,7 +34,7 @@ $application =& kApplication::Instance(); $application->Init(); - if ($application->RecallVar('user_id') != -1) { + if ($application->RecallVar('user_id') != USER_ROOT) { die('restricted access!'); } @@ -44,9 +44,9 @@ $toolkit->RunSQL('/' . $module_folder . '/install/install_data.sql', '{NewsCatId}', $category->GetID()); $toolkit->ImportLanguage('/' . $module_folder . '/install/english'); - $toolkit->SetModuleRootCategory($module_folder, $category->GetID()); + $toolkit->SetModuleRootCategory(basename($module_folder), $category->GetID()); - $toolkit->linkCustomFields($module_folder, 'n', 2); // to create Custom Fields for News + $toolkit->linkCustomFields(basename($module_folder), 'n', 2); // to create Custom Fields for News $toolkit->linkCustomFields('KERNEL', 'c', 1); // to create ItemTemplate custom field $toolkit->setModuleItemTemplate($category, 'n', '#in-news/item_design#');