|
Attached Files |
 base_path_1005.patch [^] (5,389 bytes) 2011-10-17 10:40
[Show Content]
Index: install.php
===================================================================
--- install.php (revision 14656)
+++ install.php (working copy)
@@ -784,7 +784,6 @@
if ($domain != '') {
if (strstr($domain, $license_domain) || $modules_helper->_IsLocalSite($domain)) {
$this->toolkit->setSystemConfig('Misc', 'Domain', $domain);
- $this->toolkit->SaveConfig();
}
else {
$this->errorMessage = 'Domain name entered does not match domain name in the license!';
@@ -793,6 +792,8 @@
else {
$this->errorMessage = 'Please enter valid domain!';
}
+ $this->toolkit->setSystemConfig('Misc', 'WebsitePath', BASE_PATH.'/');
+ $this->toolkit->SaveConfig();
break;
case 'root_password':
@@ -801,7 +802,6 @@
$config_values = Array (
'RootPass' => $password,
- 'Site_Path' => BASE_PATH.'/', // set Site_Path (for SSL & old in-portal code)
'Backup_Path' => FULL_PATH . $this->toolkit->getSystemConfig('Misc', 'WriteablePath') . DIRECTORY_SEPARATOR . 'backupdata',
'Smtp_AdminMailFrom' => 'portal@' . $this->toolkit->getSystemConfig('Misc', 'Domain')
);
@@ -876,7 +876,7 @@
FROM ' . $theme_table . '
WHERE ' . $theme_idfield . ' = ' . $theme_id;
$theme_name = $this->Conn->GetOne($sql);
- $site_path = $this->Application->ConfigValue('Site_Path');
+ $site_path = $this->toolkit->getSystemConfig('Misc', 'WebsitePath');
$file_helper =& $this->Application->recallObject('FileHelper');
/* @var $file_helper FileHelper */
Index: install/install_data.sql
===================================================================
--- install/install_data.sql (revision 14656)
+++ install/install_data.sql (working copy)
@@ -29,7 +29,6 @@
# Section "in-portal:configure_advanced":
INSERT INTO ConfigurationValues VALUES(DEFAULT, 'PageHitCounter', '0', 'In-Portal', 'in-portal:configure_advanced', '', '', '', NULL, NULL, 0, 0, 0, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Site_Path', '/', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_PathToWebsite', 'text', '', '', 10.01, 0, 1, NULL);
INSERT INTO ConfigurationValues VALUES(DEFAULT, 'UseModRewrite', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_use_modrewrite', 'checkbox', '', '', 10.02, 0, 1, NULL);
INSERT INTO ConfigurationValues VALUES(DEFAULT, 'ModRewriteUrlEnding', '.html', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_ModRewriteUrlEnding', 'select', '', '=+||/=+/||.html=+.html', 10.021, 0, 0, NULL);
INSERT INTO ConfigurationValues VALUES(DEFAULT, 'ForceModRewriteUrlEnding', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_ForceModRewriteUrlEnding', 'checkbox', '', NULL, 10.022, 0, 0, 'la_hint_ForceModRewriteUrlEnding');
Index: install/step_templates/fix_paths.tpl
===================================================================
--- install/step_templates/fix_paths.tpl (revision 14656)
+++ install/step_templates/fix_paths.tpl (working copy)
@@ -1,5 +1,5 @@
<?php
- $config_vars = Array ('Site_Path', 'Site_Name', 'Backup_Path');
+ $config_vars = Array ('Site_Name', 'Backup_Path');
$sql = 'SELECT Prompt, VariableName
FROM ' . TABLE_PREFIX . 'ConfigurationValues
Index: install/upgrades.sql
===================================================================
--- install/upgrades.sql (revision 14656)
+++ install/upgrades.sql (working copy)
@@ -2146,3 +2146,5 @@
ALTER TABLE ItemReview
ADD HelpfulCount INT NOT NULL ,
ADD NotHelpfulCount INT NOT NULL;
+
+DELETE FROM ConfigurationValues WHERE VariableName = 'Site_Path';
\ No newline at end of file
Index: kernel/application.php
===================================================================
--- kernel/application.php (revision 14656)
+++ kernel/application.php (working copy)
@@ -1498,7 +1498,7 @@
{
if ($ssl === null) {
// stay on same encryption level
- return PROTOCOL . SERVER_NAME . ($add_port && defined('PORT') ? ':' . PORT : '') . rtrim(BASE_PATH, '/') . $prefix . '/';
+ return PROTOCOL . SERVER_NAME . ($add_port && defined('PORT') ? ':' . PORT : '') . BASE_PATH . $prefix . '/';
}
if ($ssl) {
@@ -1520,7 +1520,7 @@
$domain = DOMAIN;
}
- return 'http://' . $domain . ($add_port && defined('PORT') ? ':' . PORT : '') . rtrim($this->ConfigValue('Site_Path'), '/') . $prefix . '/';
+ return 'http://' . $domain . ($add_port && defined('PORT') ? ':' . PORT : '') . BASE_PATH . $prefix . '/';
}
function Redirect($t = '', $params = Array(), $prefix = '', $index_file = null)
Index: kernel/startup.php
===================================================================
--- kernel/startup.php (revision 14656)
+++ kernel/startup.php (working copy)
@@ -40,7 +40,7 @@
$relative_path = REL_PATH;
}
- $ps = rtrim(preg_replace('/' . preg_quote(rtrim($relative_path, '/'), '/') . '$/', '', str_replace('\\', '/', dirname($_SERVER['PHP_SELF']))), '/');
+ $ps = rtrim( isset($vars['WebsitePath']) ? $vars['WebsitePath'] : preg_replace('/' . preg_quote(rtrim($relative_path, '/'), '/') . '$/', '', str_replace('\\', '/', dirname($_SERVER['PHP_SELF']))), '/');
define('BASE_PATH', $ps);
# New path detection method: end
base_path_1005.2.patch [^] (11,499 bytes) 2011-10-21 05:37
[Show Content]
Index: install.php
===================================================================
--- install.php (revision 14670)
+++ install.php (working copy)
@@ -784,7 +784,6 @@
if ($domain != '') {
if (strstr($domain, $license_domain) || $modules_helper->_IsLocalSite($domain)) {
$this->toolkit->setSystemConfig('Misc', 'Domain', $domain);
- $this->toolkit->SaveConfig();
}
else {
$this->errorMessage = 'Domain name entered does not match domain name in the license!';
@@ -793,6 +792,8 @@
else {
$this->errorMessage = 'Please enter valid domain!';
}
+ $this->toolkit->setSystemConfig('Misc', 'WebsitePath', BASE_PATH.'/');
+ $this->toolkit->SaveConfig();
break;
case 'root_password':
@@ -801,7 +802,6 @@
$config_values = Array (
'RootPass' => $password,
- 'Site_Path' => BASE_PATH.'/', // set Site_Path (for SSL & old in-portal code)
'Backup_Path' => FULL_PATH . $this->toolkit->getSystemConfig('Misc', 'WriteablePath') . DIRECTORY_SEPARATOR . 'backupdata',
'Smtp_AdminMailFrom' => 'portal@' . $this->toolkit->getSystemConfig('Misc', 'Domain')
);
@@ -876,7 +876,7 @@
FROM ' . $theme_table . '
WHERE ' . $theme_idfield . ' = ' . $theme_id;
$theme_name = $this->Conn->GetOne($sql);
- $site_path = $this->Application->ConfigValue('Site_Path');
+ $site_path = $this->toolkit->getSystemConfig('Misc', 'WebsitePath');
$file_helper =& $this->Application->recallObject('FileHelper');
/* @var $file_helper FileHelper */
Index: install/install_data.sql
===================================================================
--- install/install_data.sql (revision 14670)
+++ install/install_data.sql (working copy)
@@ -29,19 +29,18 @@
# Section "in-portal:configure_advanced":
INSERT INTO ConfigurationValues VALUES(DEFAULT, 'PageHitCounter', '0', 'In-Portal', 'in-portal:configure_advanced', '', '', '', NULL, NULL, 0, 0, 0, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Site_Path', '/', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_PathToWebsite', 'text', '', '', 10.01, 0, 1, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'UseModRewrite', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_use_modrewrite', 'checkbox', '', '', 10.02, 0, 1, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'ModRewriteUrlEnding', '.html', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_ModRewriteUrlEnding', 'select', '', '=+||/=+/||.html=+.html', 10.021, 0, 0, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'ForceModRewriteUrlEnding', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_ForceModRewriteUrlEnding', 'checkbox', '', NULL, 10.022, 0, 0, 'la_hint_ForceModRewriteUrlEnding');
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'UseContentLanguageNegotiation', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_UseContentLanguageNegotiation', 'checkbox', '', '', 10.023, 0, 0, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'cms_DefaultDesign', '#default_design#', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_DefaultDesignTemplate', 'text', NULL, NULL, 10.03, 0, 0, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'ErrorTemplate', 'error_notfound', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_error_template', 'text', '', '', 10.04, 0, 0, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'NoPermissionTemplate', 'no_permission', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_nopermission_template', 'text', '', '', 10.05, 0, 0, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'UsePageHitCounter', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_UsePageHitCounter', 'checkbox', '', '', 10.06, 0, 0, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'ForceImageMagickResize', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_ForceImageMagickResize', 'checkbox', '', '', 10.07, 0, 0, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'CheckStopWords', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_CheckStopWords', 'checkbox', '', '', 10.08, 0, 0, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'UseVisitorTracking', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_UseVisitorTracking', 'checkbox', '', '', 10.09, 0, 0, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'cms_DefaultTrackingCode', '', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_DefaultTrackingCode', 'textarea', NULL, 'COLS=40 ROWS=5', 10.10, 0, 0, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'UseModRewrite', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_use_modrewrite', 'checkbox', '', '', 10.01, 0, 1, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'ModRewriteUrlEnding', '.html', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_ModRewriteUrlEnding', 'select', '', '=+||/=+/||.html=+.html', 10.011, 0, 0, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'ForceModRewriteUrlEnding', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_ForceModRewriteUrlEnding', 'checkbox', '', NULL, 10.012, 0, 0, 'la_hint_ForceModRewriteUrlEnding');
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'UseContentLanguageNegotiation', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_UseContentLanguageNegotiation', 'checkbox', '', '', 10.013, 0, 0, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'cms_DefaultDesign', '#default_design#', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_DefaultDesignTemplate', 'text', NULL, NULL, 10.02, 0, 0, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'ErrorTemplate', 'error_notfound', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_error_template', 'text', '', '', 10.03, 0, 0, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'NoPermissionTemplate', 'no_permission', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_nopermission_template', 'text', '', '', 10.04, 0, 0, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'UsePageHitCounter', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_UsePageHitCounter', 'checkbox', '', '', 10.05, 0, 0, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'ForceImageMagickResize', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_ForceImageMagickResize', 'checkbox', '', '', 10.06, 0, 0, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'CheckStopWords', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_CheckStopWords', 'checkbox', '', '', 10.07, 0, 0, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'UseVisitorTracking', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_UseVisitorTracking', 'checkbox', '', '', 10.08, 0, 0, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'cms_DefaultTrackingCode', '', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_DefaultTrackingCode', 'textarea', NULL, 'COLS=40 ROWS=5', 10.09, 0, 0, NULL);
INSERT INTO ConfigurationValues VALUES(DEFAULT, 'CookieSessions', '2', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsSession', 'la_prompt_session_management', 'select', NULL, '0=lu_opt_QueryString||1=lu_opt_Cookies||2=lu_opt_AutoDetect', 20.01, 0, 1, NULL);
INSERT INTO ConfigurationValues VALUES(DEFAULT, 'SessionCookieName', 'sid', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsSession', 'la_prompt_session_cookie_name', 'text', '', '', 20.02, 0, 1, NULL);
INSERT INTO ConfigurationValues VALUES(DEFAULT, 'SessionCookieDomains', '', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsSession', 'la_config_SessionCookieDomains', 'textarea', '', 'rows="5" cols="40"', 20.021, 0, 0, NULL);
Index: install/step_templates/fix_paths.tpl
===================================================================
--- install/step_templates/fix_paths.tpl (revision 14670)
+++ install/step_templates/fix_paths.tpl (working copy)
@@ -1,5 +1,5 @@
<?php
- $config_vars = Array ('Site_Path', 'Site_Name', 'Backup_Path');
+ $config_vars = Array ('Site_Name', 'Backup_Path');
$sql = 'SELECT Prompt, VariableName
FROM ' . TABLE_PREFIX . 'ConfigurationValues
Index: install/upgrades.sql
===================================================================
--- install/upgrades.sql (revision 14670)
+++ install/upgrades.sql (working copy)
@@ -2147,6 +2147,8 @@
ADD HelpfulCount INT NOT NULL ,
ADD NotHelpfulCount INT NOT NULL;
+DELETE FROM ConfigurationValues WHERE VariableName = 'Site_Path';
+
ALTER TABLE PermissionConfig ADD IsSystem TINYINT(1) NOT NULL DEFAULT '0';
UPDATE PermissionConfig SET IsSystem = 1;
@@ -2158,4 +2160,10 @@
ALTER TABLE Agents
ADD Timeout INT(10) UNSIGNED NULL AFTER RunTime,
ADD LastTimeoutOn int(10) unsigned default NULL AFTER Timeout,
- ADD INDEX (Timeout);
\ No newline at end of file
+ ADD INDEX (Timeout);
+
+UPDATE ConfigurationValues
+ SET DisplayOrder = DisplayOrder + 0.01
+ WHERE
+ `Section` = 'in-portal:configure_advanced'
+ AND Heading = 'la_section_SettingsWebsite';
Index: kernel/application.php
===================================================================
--- kernel/application.php (revision 14670)
+++ kernel/application.php (working copy)
@@ -1504,7 +1504,7 @@
{
if ($ssl === null) {
// stay on same encryption level
- return PROTOCOL . SERVER_NAME . ($add_port && defined('PORT') ? ':' . PORT : '') . rtrim(BASE_PATH, '/') . $prefix . '/';
+ return PROTOCOL . SERVER_NAME . ($add_port && defined('PORT') ? ':' . PORT : '') . BASE_PATH . $prefix . '/';
}
if ($ssl) {
@@ -1526,7 +1526,7 @@
$domain = DOMAIN;
}
- return 'http://' . $domain . ($add_port && defined('PORT') ? ':' . PORT : '') . rtrim($this->ConfigValue('Site_Path'), '/') . $prefix . '/';
+ return 'http://' . $domain . ($add_port && defined('PORT') ? ':' . PORT : '') . BASE_PATH . $prefix . '/';
}
function Redirect($t = '', $params = Array(), $prefix = '', $index_file = null)
Index: kernel/startup.php
===================================================================
--- kernel/startup.php (revision 14670)
+++ kernel/startup.php (working copy)
@@ -40,7 +40,7 @@
$relative_path = REL_PATH;
}
- $ps = rtrim(preg_replace('/' . preg_quote(rtrim($relative_path, '/'), '/') . '$/', '', str_replace('\\', '/', dirname($_SERVER['PHP_SELF']))), '/');
+ $ps = rtrim( php_sapi_name() == 'cli' ? $vars['WebsitePath'] : preg_replace('/' . preg_quote(rtrim($relative_path, '/'), '/') . '$/', '', str_replace('\\', '/', dirname($_SERVER['PHP_SELF']))), '/');
define('BASE_PATH', $ps);
# New path detection method: end
base_path_modules_1005.2.patch [^] (613 bytes) 2011-10-21 05:38
[Show Content]
Index: in-auction/units/sections/ebay_eh.php
===================================================================
--- in-auction/units/sections/ebay_eh.php (revision 14670)
+++ in-auction/units/sections/ebay_eh.php (working copy)
@@ -2796,7 +2796,7 @@
$a_params = Array(
'ApplicationDeliveryPreferences' => Array(
- 'ApplicationURL' => 'http://'.DOMAIN.$this->Application->ConfigValue('Site_Path').'in-auction/notify.php',
+ 'ApplicationURL' => 'http://'.DOMAIN.BASE_PATH.'/in-auction/notify.php',
'ApplicationEnable' => 'Enable',
),
'UserDeliveryPreferenceArray' => Array(
base_path_core_v3.patch [^] (19,854 bytes) 2011-10-25 08:35
[Show Content]
Index: core/editor/editor/filemanager/connectors/php/config.php
===================================================================
--- core/editor/editor/filemanager/connectors/php/config.php (revision 14653)
+++ core/editor/editor/filemanager/connectors/php/config.php (working copy)
@@ -24,7 +24,6 @@
define('DBG_SKIP_REPORTING', 1);
define('FULL_PATH', realpath(dirname(__FILE__).'/../../../../../..') );
-define('REL_PATH', 'core/editor/editor/filemanager/connectors/php');
include_once(FULL_PATH.'/core/kernel/startup.php');
Index: core/install.php
===================================================================
--- core/install.php (revision 14671)
+++ core/install.php (working copy)
@@ -63,7 +63,7 @@
var $stepsPreset = '';
/**
- * Installtion steps to be done
+ * Installation steps to be done
*
* @var Array
*/
@@ -170,13 +170,19 @@
}
if ( !$this->toolkit->getSystemConfig('Misc', 'WriteablePath') ) {
- // set global writable folder when such setting is missing
$this->toolkit->setSystemConfig('Misc', 'WriteablePath', $this->toolkit->defaultWritablePath);
- $this->toolkit->SaveConfig(true); // immediately save, because this path will be used in Application later
}
if ( !$this->toolkit->getSystemConfig('Misc', 'RestrictedPath') ) {
$this->toolkit->setSystemConfig('Misc', 'RestrictedPath', $this->toolkit->getSystemConfig('Misc', 'WriteablePath') . DIRECTORY_SEPARATOR . '.restricted');
+ }
+
+ if ( !$this->toolkit->getSystemConfig('Misc', 'WebsitePath') ) {
+ $this->toolkit->setSystemConfig('Misc', 'WebsitePath', $base_path);
+ }
+
+ if ( $this->toolkit->systemConfigChanged ) {
+ // immediately save, because this paths will be used in kApplication class later
$this->toolkit->SaveConfig(true);
}
@@ -801,7 +807,6 @@
$config_values = Array (
'RootPass' => $password,
- 'Site_Path' => BASE_PATH.'/', // set Site_Path (for SSL & old in-portal code)
'Backup_Path' => FULL_PATH . $this->toolkit->getSystemConfig('Misc', 'WriteablePath') . DIRECTORY_SEPARATOR . 'backupdata',
'Smtp_AdminMailFrom' => 'portal@' . $this->toolkit->getSystemConfig('Misc', 'Domain')
);
@@ -876,7 +881,7 @@
FROM ' . $theme_table . '
WHERE ' . $theme_idfield . ' = ' . $theme_id;
$theme_name = $this->Conn->GetOne($sql);
- $site_path = $this->Application->ConfigValue('Site_Path');
+ $site_path = $this->toolkit->getSystemConfig('Misc', 'WebsitePath') . '/';
$file_helper =& $this->Application->recallObject('FileHelper');
/* @var $file_helper FileHelper */
@@ -1242,16 +1247,18 @@
/**
* Show next step screen
*
+ * @param string $error_message
+ * @return void
*/
function Done($error_message = null)
{
- if (isset($error_message)) {
+ if ( isset($error_message) ) {
$this->errorMessage = $error_message;
}
- include_once (FULL_PATH.'/'.REL_PATH.'/install/incs/install.tpl');
+ include_once (FULL_PATH . '/' . REL_PATH . '/install/incs/install.tpl');
- if (isset($this->Application)) {
+ if ( isset($this->Application) ) {
$this->Application->Done();
}
@@ -1662,9 +1669,9 @@
* @param string $errstr
* @param string $errfile
* @param int $errline
- * @param Array $errcontext
+ * @param Array|string $errcontext
*/
- function ErrorHandler($errno, $errstr, $errfile = '', $errline = '', $errcontext = '')
+ function ErrorHandler($errno, $errstr, $errfile = '', $errline = 0, $errcontext = '')
{
if ($errno == E_USER_ERROR) {
// only react on user fatal errors
Index: core/install/install_data.sql
===================================================================
--- core/install/install_data.sql (revision 14685)
+++ core/install/install_data.sql (working copy)
@@ -29,19 +29,18 @@
# Section "in-portal:configure_advanced":
INSERT INTO ConfigurationValues VALUES(DEFAULT, 'PageHitCounter', '0', 'In-Portal', 'in-portal:configure_advanced', '', '', '', NULL, NULL, 0, 0, 0, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Site_Path', '/', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_PathToWebsite', 'text', '', '', 10.01, 0, 1, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'UseModRewrite', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_use_modrewrite', 'checkbox', '', '', 10.02, 0, 1, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'ModRewriteUrlEnding', '.html', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_ModRewriteUrlEnding', 'select', '', '=+||/=+/||.html=+.html', 10.021, 0, 0, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'ForceModRewriteUrlEnding', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_ForceModRewriteUrlEnding', 'checkbox', '', NULL, 10.022, 0, 0, 'la_hint_ForceModRewriteUrlEnding');
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'UseContentLanguageNegotiation', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_UseContentLanguageNegotiation', 'checkbox', '', '', 10.023, 0, 0, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'cms_DefaultDesign', '#default_design#', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_DefaultDesignTemplate', 'text', NULL, NULL, 10.03, 0, 0, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'ErrorTemplate', 'error_notfound', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_error_template', 'text', '', '', 10.04, 0, 0, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'NoPermissionTemplate', 'no_permission', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_nopermission_template', 'text', '', '', 10.05, 0, 0, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'UsePageHitCounter', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_UsePageHitCounter', 'checkbox', '', '', 10.06, 0, 0, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'ForceImageMagickResize', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_ForceImageMagickResize', 'checkbox', '', '', 10.07, 0, 0, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'CheckStopWords', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_CheckStopWords', 'checkbox', '', '', 10.08, 0, 0, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'UseVisitorTracking', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_UseVisitorTracking', 'checkbox', '', '', 10.09, 0, 0, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'cms_DefaultTrackingCode', '', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_DefaultTrackingCode', 'textarea', NULL, 'COLS=40 ROWS=5', 10.10, 0, 0, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'UseModRewrite', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_use_modrewrite', 'checkbox', '', '', 10.01, 0, 1, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'ModRewriteUrlEnding', '.html', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_ModRewriteUrlEnding', 'select', '', '=+||/=+/||.html=+.html', 10.011, 0, 0, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'ForceModRewriteUrlEnding', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_ForceModRewriteUrlEnding', 'checkbox', '', NULL, 10.012, 0, 0, 'la_hint_ForceModRewriteUrlEnding');
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'UseContentLanguageNegotiation', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_UseContentLanguageNegotiation', 'checkbox', '', '', 10.013, 0, 0, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'cms_DefaultDesign', '#default_design#', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_DefaultDesignTemplate', 'text', NULL, NULL, 10.02, 0, 0, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'ErrorTemplate', 'error_notfound', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_error_template', 'text', '', '', 10.03, 0, 0, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'NoPermissionTemplate', 'no_permission', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_nopermission_template', 'text', '', '', 10.04, 0, 0, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'UsePageHitCounter', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_UsePageHitCounter', 'checkbox', '', '', 10.05, 0, 0, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'ForceImageMagickResize', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_ForceImageMagickResize', 'checkbox', '', '', 10.06, 0, 0, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'CheckStopWords', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_CheckStopWords', 'checkbox', '', '', 10.07, 0, 0, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'UseVisitorTracking', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_UseVisitorTracking', 'checkbox', '', '', 10.08, 0, 0, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'cms_DefaultTrackingCode', '', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_DefaultTrackingCode', 'textarea', NULL, 'COLS=40 ROWS=5', 10.09, 0, 0, NULL);
INSERT INTO ConfigurationValues VALUES(DEFAULT, 'CookieSessions', '2', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsSession', 'la_prompt_session_management', 'select', NULL, '0=lu_opt_QueryString||1=lu_opt_Cookies||2=lu_opt_AutoDetect', 20.01, 0, 1, NULL);
INSERT INTO ConfigurationValues VALUES(DEFAULT, 'SessionCookieName', 'sid', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsSession', 'la_prompt_session_cookie_name', 'text', '', '', 20.02, 0, 1, NULL);
INSERT INTO ConfigurationValues VALUES(DEFAULT, 'SessionCookieDomains', '', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsSession', 'la_config_SessionCookieDomains', 'textarea', '', 'rows="5" cols="40"', 20.021, 0, 0, NULL);
Index: core/install/install_toolkit.php
===================================================================
--- core/install/install_toolkit.php (revision 14653)
+++ core/install/install_toolkit.php (working copy)
@@ -75,6 +75,14 @@
var $systemConfig = Array ();
/**
+ * Tells, that system config was changed
+ *
+ * @var bool
+ * @access public
+ */
+ public $systemConfigChanged = false;
+
+ /**
* Path, used by system to store data on filesystem
*
* @var string
@@ -197,8 +205,8 @@
* Sets module version to passed
*
* @param string $module_name
- * @param string $module_path
- * @param string $version
+ * @param string|bool $module_path
+ * @param string|bool $version
*/
function SetModuleVersion($module_name, $module_path = false, $version = false)
{
@@ -229,7 +237,7 @@
* Sets module root category to passed
*
* @param string $module_name
- * @param string $category_id
+ * @param int $category_id
*/
function SetModuleRootCategory($module_name, $category_id = 0)
{
@@ -249,7 +257,7 @@
/**
* Returns maximal version of given module by scanning it's upgrade scripts
*
- * @param string $module_name
+ * @param string $module_path
* @return string
*/
function GetMaxModuleVersion($module_path)
@@ -306,6 +314,8 @@
* @param string $sqls
* @param mixed $replace_from
* @param mixed $replace_to
+ * @param int $start_from
+ * @return bool
*/
function RunSQLText(&$sqls, $replace_from = null, $replace_to = null, $start_from = 0)
{
@@ -534,6 +544,8 @@
}
fclose($fp);
+
+ $this->systemConfigChanged = false;
}
/**
@@ -545,6 +557,8 @@
*/
function setSystemConfig($section, $key, $value = null)
{
+ $this->systemConfigChanged = true;
+
if (isset($value)) {
if (!array_key_exists($section, $this->systemConfig)) {
// create section, when missing
@@ -562,15 +576,17 @@
/**
* Returns information from system config
*
- * @return string
+ * @param string $section
+ * @param string $key
+ * @return string|bool
*/
function getSystemConfig($section, $key)
{
- if (!array_key_exists($section, $this->systemConfig)) {
+ if ( !array_key_exists($section, $this->systemConfig) ) {
return false;
}
- if (!array_key_exists($key, $this->systemConfig[$section])) {
+ if ( !array_key_exists($key, $this->systemConfig[$section]) ) {
return false;
}
@@ -781,6 +797,7 @@
* Link custom field records with search config records + create custom field columns
*
* @param string $module_folder
+ * @param string $prefix
* @param int $item_type
*/
function linkCustomFields($module_folder, $prefix, $item_type)
@@ -822,6 +839,8 @@
/**
* Deletes cache, useful after separate module install and installator last step
*
+ * @param bool $refresh_permissions
+ * @return void
*/
function deleteCache($refresh_permissions = false)
{
Index: core/install/step_templates/fix_paths.tpl
===================================================================
--- core/install/step_templates/fix_paths.tpl (revision 14653)
+++ core/install/step_templates/fix_paths.tpl (working copy)
@@ -1,5 +1,5 @@
<?php
- $config_vars = Array ('Site_Path', 'Site_Name', 'Backup_Path');
+ $config_vars = Array ('Site_Name', 'Backup_Path');
$sql = 'SELECT Prompt, VariableName
FROM ' . TABLE_PREFIX . 'ConfigurationValues
Index: core/install/upgrades.sql
===================================================================
--- core/install/upgrades.sql (revision 14671)
+++ core/install/upgrades.sql (working copy)
@@ -2187,3 +2187,9 @@
KEY ResponseHttpCode (ResponseHttpCode),
KEY CurlError (CurlError)
);
+
+DELETE FROM ConfigurationValues WHERE VariableName = 'Site_Path';
+
+UPDATE ConfigurationValues
+SET DisplayOrder = DisplayOrder + 0.01
+WHERE `Section` = 'in-portal:configure_advanced' AND Heading = 'la_section_SettingsWebsite';
Index: core/install/utf.php
===================================================================
--- core/install/utf.php (revision 14653)
+++ core/install/utf.php (working copy)
@@ -18,7 +18,6 @@
$start = microtime(true);
define('FULL_PATH', realpath(dirname(__FILE__)).'/../../');
-define('REL_PATH', '/core/install');
include_once(FULL_PATH.'/core/kernel/startup.php');
$application =& kApplication::Instance();
Index: core/kernel/application.php
===================================================================
--- core/kernel/application.php (revision 14665)
+++ core/kernel/application.php (working copy)
@@ -1504,7 +1504,7 @@
{
if ($ssl === null) {
// stay on same encryption level
- return PROTOCOL . SERVER_NAME . ($add_port && defined('PORT') ? ':' . PORT : '') . rtrim(BASE_PATH, '/') . $prefix . '/';
+ return PROTOCOL . SERVER_NAME . ($add_port && defined('PORT') ? ':' . PORT : '') . BASE_PATH . $prefix . '/';
}
if ($ssl) {
@@ -1526,7 +1526,7 @@
$domain = DOMAIN;
}
- return 'http://' . $domain . ($add_port && defined('PORT') ? ':' . PORT : '') . rtrim($this->ConfigValue('Site_Path'), '/') . $prefix . '/';
+ return 'http://' . $domain . ($add_port && defined('PORT') ? ':' . PORT : '') . BASE_PATH . $prefix . '/';
}
function Redirect($t = '', $params = Array(), $prefix = '', $index_file = null)
Index: core/kernel/startup.php
===================================================================
--- core/kernel/startup.php (revision 14653)
+++ core/kernel/startup.php (working copy)
@@ -29,21 +29,6 @@
$admin_Presets_directory = isset($vars['AdminPresetsDirectory']) ? $vars['AdminPresetsDirectory'] : ADMIN_DIRECTORY;
define('ADMIN_PRESETS_DIRECTORY', $admin_Presets_directory);
- # New path detection method: begin
- if (defined('REL_PATH')) {
- // location of index.php relatively to site base folder
- $relative_path = preg_replace('/^[\/]{0,1}admin(.*)/', $admin_directory . '\\1', REL_PATH);
- }
- else {
- // default index.php relative location is administrative console folder
- define('REL_PATH', $admin_directory);
- $relative_path = REL_PATH;
- }
-
- $ps = rtrim(preg_replace('/' . preg_quote(rtrim($relative_path, '/'), '/') . '$/', '', str_replace('\\', '/', dirname($_SERVER['PHP_SELF']))), '/');
- define('BASE_PATH', $ps);
- # New path detection method: end
-
$https_mark = getArrayValue($_SERVER, 'HTTPS');
define('PROTOCOL', ($https_mark == 'on') || ($https_mark == '1') ? 'https://' : 'http://');
@@ -73,11 +58,16 @@
if (!$vars) {
echo 'In-Portal is probably not installed, or configuration file is missing.<br/>';
echo 'Please use the installation script to fix the problem.<br/><br/>';
- echo '<a href="' . PROTOCOL . SERVER_NAME . rtrim(BASE_PATH, '/') . '/core/install.php">Go to installation script</a><br><br>';
+
+ $base_path = rtrim(preg_replace('/'.preg_quote(rtrim($admin_directory, '/'), '/').'$/', '', str_replace('\\', '/', dirname($_SERVER['PHP_SELF']))), '/');
+ echo '<a href="' . PROTOCOL . SERVER_NAME . $base_path . '/core/install.php">Go to installation script</a><br><br>';
flush();
exit;
}
+ // variable WebsitePath is auto-detected once during installation/upgrade
+ define('BASE_PATH', $vars['WebsitePath']);
+
define('APPLICATION_CLASS', isset($vars['ApplicationClass']) ? $vars['ApplicationClass'] : 'kApplication');
define('APPLICATION_PATH', isset($vars['ApplicationPath']) ? $vars['ApplicationPath'] : '/core/kernel/application.php');
Index: tools/cron.php
===================================================================
--- tools/cron.php (revision 14653)
+++ tools/cron.php (working copy)
@@ -20,7 +20,6 @@
define('CRON', 1);
define('ADMIN', 1);
- define('REL_PATH', 'tools');
define('FULL_PATH', realpath(dirname(__FILE__) . '/..'));
define('CMD_MODE', isset($argv) && count($argv) ? 1 : 0);
Index: tools/run_event.php
===================================================================
--- tools/run_event.php (revision 14653)
+++ tools/run_event.php (working copy)
@@ -18,7 +18,6 @@
define('CRON', 1);
define('ADMIN', 1);
-define('REL_PATH', 'tools');
define('FULL_PATH', realpath(dirname(__FILE__) . '/..'));
define('DBG_SKIP_REPORTING', 1);
Index: tools/show_cache.php
===================================================================
--- tools/show_cache.php (revision 14653)
+++ tools/show_cache.php (working copy)
@@ -17,9 +17,8 @@
$start = microtime(true);
-define('FULL_PATH', realpath(dirname(__FILE__).'/..'));
-define('REL_PATH', 'tools/');
define('ADMIN', 0);
+define('FULL_PATH', realpath(dirname(__FILE__).'/..'));
include_once(FULL_PATH.'/core/kernel/startup.php');
@@ -49,7 +48,7 @@
$var_names = $application->Conn->GetCol($sql);
foreach ($var_names as $index => $var_name) {
- $var_names[$index] = '<a href="' . $application->BaseURL() . REL_PATH. 'show_cache.php?show_var=' . $var_name . '">' . $var_name . '</a>';
+ $var_names[$index] = '<a href="' . $application->BaseURL() . 'tools/show_cache.php?show_var=' . $var_name . '">' . $var_name . '</a>';
}
kUtil::print_r( $var_names, 'Cache variable names:', true);
base_path_modules_v3.patch [^] (13,265 bytes) 2011-10-25 08:35
[Show Content]
Index: custom/install.php
===================================================================
--- custom/install.php (revision 14653)
+++ custom/install.php (working copy)
@@ -5,7 +5,6 @@
// separate module install
define('IS_INSTALL', 1);
define('ADMIN', 1);
- define('REL_PATH', $module_folder);
define('FULL_PATH', realpath(dirname(__FILE__) . '/../..') );
include_once(FULL_PATH . '/core/kernel/startup.php');
Index: in-auction/cron.php
===================================================================
--- in-auction/cron.php (revision 14653)
+++ in-auction/cron.php (working copy)
@@ -14,7 +14,6 @@
$start = microtime(true);
define('ADMIN', 1);
- define('REL_PATH', 'modules/in-auction');
define('FULL_PATH', realpath(dirname(__FILE__).'/../..') );
include_once(FULL_PATH . '/core/kernel/startup.php');
Index: in-auction/generate_keys.php
===================================================================
--- in-auction/generate_keys.php (revision 14653)
+++ in-auction/generate_keys.php (working copy)
@@ -13,7 +13,6 @@
$start = microtime(true);
define('ADMIN', 1);
- define('REL_PATH', 'modules/in-auction');
define('FULL_PATH', realpath(dirname(__FILE__).'/../..') );
include_once(FULL_PATH . '/core/kernel/startup.php');
Index: in-auction/hitcounter.php
===================================================================
--- in-auction/hitcounter.php (revision 14653)
+++ in-auction/hitcounter.php (working copy)
@@ -14,7 +14,6 @@
define('ADMIN', 1);
define('DBG_SKIP_REPORTING', 1);
- define('REL_PATH', 'modules/in-auction');
define('FULL_PATH', realpath(dirname(__FILE__).'/../..') );
include_once(FULL_PATH . '/core/kernel/startup.php');
Index: in-auction/install.php
===================================================================
--- in-auction/install.php (revision 14653)
+++ in-auction/install.php (working copy)
@@ -16,7 +16,6 @@
// separate module install
define('IS_INSTALL', 1);
define('ADMIN', 1);
- define('REL_PATH', $module_folder);
define('FULL_PATH', realpath(dirname(__FILE__) . '/../..') );
include_once(FULL_PATH . '/core/kernel/startup.php');
Index: in-auction/new_token_accept.php
===================================================================
--- in-auction/new_token_accept.php (revision 14653)
+++ in-auction/new_token_accept.php (working copy)
@@ -13,7 +13,6 @@
$start = microtime(true);
define('ADMIN', 1);
- define('REL_PATH', 'modules/in-auction');
define('FULL_PATH', realpath(dirname(__FILE__).'/../..') );
include_once(FULL_PATH . '/core/kernel/startup.php');
Index: in-auction/new_token_reject.php
===================================================================
--- in-auction/new_token_reject.php (revision 14653)
+++ in-auction/new_token_reject.php (working copy)
@@ -13,7 +13,6 @@
$start = microtime(true);
define('ADMIN', 1);
- define('REL_PATH', 'modules/in-auction');
define('FULL_PATH', realpath(dirname(__FILE__).'/../..') );
include_once(FULL_PATH . '/core/kernel/startup.php');
Index: in-auction/notify.php
===================================================================
--- in-auction/notify.php (revision 14653)
+++ in-auction/notify.php (working copy)
@@ -14,7 +14,6 @@
$start = microtime(true);
define('ADMIN', 1);
- define('REL_PATH', 'modules/in-auction');
define('FULL_PATH', realpath(dirname(__FILE__).'/../..') );
include_once(FULL_PATH . '/core/kernel/startup.php');
Index: in-auction/units/sections/ebay_eh.php
===================================================================
--- in-auction/units/sections/ebay_eh.php (revision 14653)
+++ in-auction/units/sections/ebay_eh.php (working copy)
@@ -2796,7 +2796,7 @@
$a_params = Array(
'ApplicationDeliveryPreferences' => Array(
- 'ApplicationURL' => 'http://'.DOMAIN.$this->Application->ConfigValue('Site_Path').'in-auction/notify.php',
+ 'ApplicationURL' => 'http://'.DOMAIN.BASE_PATH.'/modules/in-auction/notify.php',
'ApplicationEnable' => 'Enable',
),
'UserDeliveryPreferenceArray' => Array(
Index: in-bulletin/install.php
===================================================================
--- in-bulletin/install.php (revision 14653)
+++ in-bulletin/install.php (working copy)
@@ -17,7 +17,6 @@
// separate module install
define('IS_INSTALL', 1);
define('ADMIN', 1);
- define('REL_PATH', $module_folder);
define('FULL_PATH', realpath(dirname(__FILE__) . '/../..') );
include_once(FULL_PATH . '/core/kernel/startup.php');
Index: in-commerce/gw_notify.php
===================================================================
--- in-commerce/gw_notify.php (revision 14653)
+++ in-commerce/gw_notify.php (working copy)
@@ -11,7 +11,6 @@
* See http://www.in-portal.org/commercial-license for copyright notices and details.
*/
define('GW_NOTIFY', 1);
- define('REL_PATH', 'modules/in-commerce');
define('FULL_PATH', realpath(dirname(__FILE__) . '/../..'));
include_once(FULL_PATH . '/core/kernel/startup.php');
Index: in-commerce/install.php
===================================================================
--- in-commerce/install.php (revision 14653)
+++ in-commerce/install.php (working copy)
@@ -16,7 +16,6 @@
// separate module install
define('IS_INSTALL', 1);
define('ADMIN', 1);
- define('REL_PATH', $module_folder);
define('FULL_PATH', realpath(dirname(__FILE__) . '/../..') );
include_once(FULL_PATH . '/core/kernel/startup.php');
Index: in-commerce/units/gateways/gw_classes/notify_scripts/atosorigin_notify.php
===================================================================
--- in-commerce/units/gateways/gw_classes/notify_scripts/atosorigin_notify.php (revision 14653)
+++ in-commerce/units/gateways/gw_classes/notify_scripts/atosorigin_notify.php (working copy)
@@ -11,9 +11,9 @@
* See http://www.in-portal.org/commercial-license for copyright notices and details.
*/
+ define('ADMIN', 1);
define('FULL_PATH', realpath(dirname(__FILE__) . '/../../../../../..'));
- define('REL_PATH', 'modules/in-commerce/units/gateways/gw_classes/notify_scripts');
- define('ADMIN', 1);
+
include_once(FULL_PATH . '/core/kernel/startup.php');
$application =& kApplication::Instance();
Index: in-commerce/units/gateways/gw_classes/notify_scripts/google_checkout_notify.php
===================================================================
--- in-commerce/units/gateways/gw_classes/notify_scripts/google_checkout_notify.php (revision 14653)
+++ in-commerce/units/gateways/gw_classes/notify_scripts/google_checkout_notify.php (working copy)
@@ -11,9 +11,9 @@
* See http://www.in-portal.org/commercial-license for copyright notices and details.
*/
+ define('ADMIN', 1);
define('FULL_PATH', realpath(dirname(__FILE__) . '/../../../../../..'));
- define('REL_PATH', 'modules/in-commerce/units/gateways/gw_classes/notify_scripts');
- define('ADMIN', 1);
+
include_once(FULL_PATH.'/core/kernel/startup.php');
$application =& kApplication::Instance();
Index: in-commerce/units/gateways/gw_classes/notify_scripts/google_checkout_shippings.php
===================================================================
--- in-commerce/units/gateways/gw_classes/notify_scripts/google_checkout_shippings.php (revision 14653)
+++ in-commerce/units/gateways/gw_classes/notify_scripts/google_checkout_shippings.php (working copy)
@@ -11,9 +11,9 @@
* See http://www.in-portal.org/commercial-license for copyright notices and details.
*/
+ define('ADMIN', 1);
define('FULL_PATH', realpath(dirname(__FILE__) . '/../../../../../..'));
- define('REL_PATH', 'modules/in-commerce/units/gateways/gw_classes/notify_scripts');
- define('ADMIN', 1);
+
include_once(FULL_PATH . '/core/kernel/startup.php');
$application =& kApplication::Instance();
Index: in-commerce/units/gateways/gw_classes/notify_scripts/multicards_notify.php
===================================================================
--- in-commerce/units/gateways/gw_classes/notify_scripts/multicards_notify.php (revision 14653)
+++ in-commerce/units/gateways/gw_classes/notify_scripts/multicards_notify.php (working copy)
@@ -11,10 +11,9 @@
* See http://www.in-portal.org/commercial-license for copyright notices and details.
*/
+ define('ADMIN', 1);
define('FULL_PATH', realpath(dirname(__FILE__) . '/../../../../../..'));
- define('REL_PATH', 'modules/in-commerce/units/gateways/gw_classes/notify_scripts');
- define('ADMIN', 1);
include_once(FULL_PATH . '/core/kernel/startup.php');
$application =& kApplication::Instance();
Index: in-commerce/units/gateways/gw_classes/notify_scripts/paybox_notify.php
===================================================================
--- in-commerce/units/gateways/gw_classes/notify_scripts/paybox_notify.php (revision 14653)
+++ in-commerce/units/gateways/gw_classes/notify_scripts/paybox_notify.php (working copy)
@@ -11,10 +11,9 @@
* See http://www.in-portal.org/commercial-license for copyright notices and details.
*/
+ define('ADMIN', 1);
define('FULL_PATH', realpath(dirname(__FILE__) . '/../../../../../..'));
- define('REL_PATH', 'modules/in-commerce/units/gateways/gw_classes/notify_scripts');
- define('ADMIN', 1);
include_once(FULL_PATH.'/core/kernel/startup.php');
$application =& kApplication::Instance();
Index: in-commerce/units/gateways/gw_classes/notify_scripts/sella_error.php
===================================================================
--- in-commerce/units/gateways/gw_classes/notify_scripts/sella_error.php (revision 14653)
+++ in-commerce/units/gateways/gw_classes/notify_scripts/sella_error.php (working copy)
@@ -11,9 +11,9 @@
* See http://www.in-portal.org/commercial-license for copyright notices and details.
*/
+ define('ADMIN', 1);
define('FULL_PATH', realpath(dirname(__FILE__) . '/../../../../../..'));
- define('REL_PATH', 'modules/in-commerce/units/gateways/gw_classes/notify_scripts');
- define('ADMIN', 1);
+
include_once(FULL_PATH.'/core/kernel/startup.php');
$application =& kApplication::Instance();
Index: in-commerce/units/gateways/gw_classes/notify_scripts/sella_notify.php
===================================================================
--- in-commerce/units/gateways/gw_classes/notify_scripts/sella_notify.php (revision 14653)
+++ in-commerce/units/gateways/gw_classes/notify_scripts/sella_notify.php (working copy)
@@ -11,9 +11,9 @@
* See http://www.in-portal.org/commercial-license for copyright notices and details.
*/
+ define('ADMIN', 1);
define('FULL_PATH', realpath(dirname(__FILE__) . '/../../../../../..'));
- define('REL_PATH', 'modules/in-commerce/units/gateways/gw_classes/notify_scripts');
- define('ADMIN', 1);
+
include_once(FULL_PATH.'/core/kernel/startup.php');
$application =& kApplication::Instance();
Index: in-commerce/units/gateways/gw_classes/notify_scripts/sella_ok.php
===================================================================
--- in-commerce/units/gateways/gw_classes/notify_scripts/sella_ok.php (revision 14653)
+++ in-commerce/units/gateways/gw_classes/notify_scripts/sella_ok.php (working copy)
@@ -11,9 +11,9 @@
* See http://www.in-portal.org/commercial-license for copyright notices and details.
*/
+ define('ADMIN', 1);
define('FULL_PATH', realpath(dirname(__FILE__) . '/../../../../../..'));
- define('REL_PATH', 'modules/in-commerce/units/gateways/gw_classes/notify_scripts');
- define('ADMIN', 1);
+
include_once(FULL_PATH . '/core/kernel/startup.php');
$application =& kApplication::Instance();
Index: in-commerce/units/gateways/gw_classes/notify_scripts/verisign_pflink_notify.php
===================================================================
--- in-commerce/units/gateways/gw_classes/notify_scripts/verisign_pflink_notify.php (revision 14653)
+++ in-commerce/units/gateways/gw_classes/notify_scripts/verisign_pflink_notify.php (working copy)
@@ -11,9 +11,9 @@
* See http://www.in-portal.org/commercial-license for copyright notices and details.
*/
+ define('ADMIN', 1);
define('FULL_PATH', realpath(dirname(__FILE__) . '/../../../../../..'));
- define('REL_PATH', 'modules/in-commerce/units/gateways/gw_classes/notify_scripts');
- define('ADMIN', 1);
+
include_once(FULL_PATH . '/core/kernel/startup.php');
$application =& kApplication::Instance();
Index: in-link/install.php
===================================================================
--- in-link/install.php (revision 14653)
+++ in-link/install.php (working copy)
@@ -17,7 +17,6 @@
// separate module install
define('IS_INSTALL', 1);
define('ADMIN', 1);
- define('REL_PATH', $module_folder);
define('FULL_PATH', realpath(dirname(__FILE__) . '/../..') );
include_once(FULL_PATH . '/core/kernel/startup.php');
Index: in-news/install.php
===================================================================
--- in-news/install.php (revision 14653)
+++ in-news/install.php (working copy)
@@ -17,7 +17,6 @@
// separate module install
define('IS_INSTALL', 1);
define('ADMIN', 1);
- define('REL_PATH', $module_folder);
define('FULL_PATH', realpath(dirname(__FILE__) . '/../..') );
include_once(FULL_PATH . '/core/kernel/startup.php');
|
Relationships [ Relation Graph ]
[ Dependency Graph ]
Relationships 
(0004063)
(0004076)
