diff --git a/application/classes/actions/ActionBlog.class.php b/application/classes/actions/ActionBlog.class.php
index 70b8540b..9f428aac 100644
--- a/application/classes/actions/ActionBlog.class.php
+++ b/application/classes/actions/ActionBlog.class.php
@@ -1608,7 +1608,7 @@ class ActionBlog extends Action {
)
);
- require_once Config::Get('path.root.engine').'/lib/external/XXTEA/encrypt.php';
+ require_once Config::Get('path.framework.libs_vendor.server').'/XXTEA/encrypt.php';
/**
* Формируем код подтверждения в URL
*/
@@ -1646,7 +1646,7 @@ class ActionBlog extends Action {
* Обработка отправленого пользователю приглашения вступить в блог
*/
protected function EventInviteBlog() {
- require_once Config::Get('path.root.engine').'/lib/external/XXTEA/encrypt.php';
+ require_once Config::Get('path.framework.libs_vendor.server').'/XXTEA/encrypt.php';
/**
* Получаем код подтверждения из ревеста и дешефруем его
*/
diff --git a/application/classes/actions/ActionProfile.class.php b/application/classes/actions/ActionProfile.class.php
index 2d3540e5..bcb2d35d 100644
--- a/application/classes/actions/ActionProfile.class.php
+++ b/application/classes/actions/ActionProfile.class.php
@@ -692,7 +692,7 @@ class ActionProfile extends Action {
* Добавление пользователя в друзья, по отправленной заявке
*/
public function EventFriendOffer() {
- require_once Config::Get('path.root.engine').'/lib/external/XXTEA/encrypt.php';
+ require_once Config::Get('path.framework.libs_vendor.server').'/XXTEA/encrypt.php';
/**
* Из реквеста дешефруем ID польователя
*/
@@ -1074,7 +1074,7 @@ class ActionProfile extends Action {
)
);
- require_once Config::Get('path.root.engine').'/lib/external/XXTEA/encrypt.php';
+ require_once Config::Get('path.framework.libs_vendor.server').'/XXTEA/encrypt.php';
$sCode=$this->oUserCurrent->getId().'_'.$oUser->getId();
$sCode=rawurlencode(base64_encode(xxtea_encrypt($sCode, Config::Get('module.talk.encrypt'))));
diff --git a/application/classes/modules/blog/entity/Blog.entity.class.php b/application/classes/modules/blog/entity/Blog.entity.class.php
index 06c72936..0b059143 100644
--- a/application/classes/modules/blog/entity/Blog.entity.class.php
+++ b/application/classes/modules/blog/entity/Blog.entity.class.php
@@ -178,7 +178,7 @@ class ModuleBlog_EntityBlog extends Entity {
if ($sPath=$this->getAvatar()) {
return preg_replace("#_\d{1,3}x\d{1,3}(\.\w{3,4})$#", ((($iSize==0)?"":"_{$iSize}x{$iSize}") . "\\1"),$sPath);
} else {
- return Config::Get('path.static.assets').'/images/avatars/avatar_blog_'.$iSize.'x'.$iSize.'.png';
+ return Config::Get('path.skin.assets.web').'/images/avatars/avatar_blog_'.$iSize.'x'.$iSize.'.png';
}
}
/**
diff --git a/application/classes/modules/sphinx/Sphinx.class.php b/application/classes/modules/sphinx/Sphinx.class.php
index 6d58041a..1161665b 100644
--- a/application/classes/modules/sphinx/Sphinx.class.php
+++ b/application/classes/modules/sphinx/Sphinx.class.php
@@ -1,5 +1,5 @@
getProfileAvatar()) {
return str_replace('_100x100',(($iSize==0)?"":"_{$iSize}x{$iSize}"),$sPath."?".date('His',strtotime($this->getProfileDate())));
} else {
- return Config::Get('path.static.assets').'/images/avatars/avatar_'.($this->getProfileSex()=='woman' ? 'female' : 'male').'_'.$iSize.'x'.$iSize.'.png';
+ return Config::Get('path.skin.assets.web').'/images/avatars/avatar_'.($this->getProfileSex()=='woman' ? 'female' : 'male').'_'.$iSize.'x'.$iSize.'.png';
}
}
/**
@@ -386,7 +386,7 @@ class ModuleUser_EntityUser extends Entity {
* @return string
*/
public function getProfileFotoDefault() {
- return Config::Get('path.static.assets').'/images/avatars/user_photo_'.($this->getProfileSex()=='woman' ? 'female' : 'male').'.png';
+ return Config::Get('path.skin.assets.web').'/images/avatars/user_photo_'.($this->getProfileSex()=='woman' ? 'female' : 'male').'.png';
}
/**
* Возвращает объект голосования за пользователя текущего пользователя
diff --git a/application/config/config.php b/application/config/config.php
index 04bd6d39..50a1a579 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -22,6 +22,19 @@
* Все изменения нужно вносить в файл config/config.local.php
*/
+
+/**
+ * Основные настройки путей
+ * Если необходимо установить движек в директорию(не корень сайта) то следует сделать так:
+ * $config['path']['root']['web'] = 'http://'.$_SERVER['HTTP_HOST'].'/subdir';
+ * и увеличить значение $config['path']['offset_request_url'] на число вложенных директорий,
+ * например, для директории первой вложенности www.site.ru/livestreet/ поставить значение равное 1
+ */
+$config['path']['root']['server'] = dirname(dirname(dirname(__FILE__)));
+$config['path']['root']['web'] = isset($_SERVER['HTTP_HOST']) ? 'http://'.$_SERVER['HTTP_HOST'] : null;
+$config['path']['offset_request_url'] = 0;
+
+
/**
* Настройки HTML вида
*/
@@ -406,84 +419,84 @@ $config['block']['rule_profile'] = array(
$config['head']['default']['js'] = array(
/* Vendor libs */
- "___path.static.framework___/js/vendor/html5shiv.js" => array('browser'=>'lt IE 9'),
- "___path.static.framework___/js/vendor/jquery-1.9.1.min.js",
- "___path.static.framework___/js/vendor/jquery-ui/js/jquery-ui-1.10.2.custom.min.js",
- "___path.static.framework___/js/vendor/jquery-ui/js/localization/jquery-ui-datepicker-ru.js",
- "___path.static.framework___/js/vendor/jquery.browser.js",
- "___path.static.framework___/js/vendor/jquery.scrollto.js",
- "___path.static.framework___/js/vendor/jquery.rich-array.min.js",
- "___path.static.framework___/js/vendor/jquery.form.js",
- "___path.static.framework___/js/vendor/jquery.jqplugin.js",
- "___path.static.framework___/js/vendor/jquery.cookie.js",
- "___path.static.framework___/js/vendor/jquery.serializejson.js",
- "___path.static.framework___/js/vendor/jquery.file.js",
- "___path.static.framework___/js/vendor/jcrop/jquery.Jcrop.js",
- "___path.static.framework___/js/vendor/jquery.placeholder.min.js",
- "___path.static.framework___/js/vendor/jquery.charcount.js",
- "___path.static.framework___/js/vendor/jquery.imagesloaded.js",
- "___path.static.framework___/js/vendor/notifier/jquery.notifier.js",
- "___path.static.framework___/js/vendor/prettify/prettify.js",
- "___path.static.framework___/js/vendor/prettyphoto/js/jquery.prettyphoto.js",
- "___path.static.framework___/js/vendor/parsley/parsley.js",
- "___path.static.framework___/js/vendor/parsley/i18n/messages.ru.js",
+ "___path.framework.frontend.web___/js/vendor/html5shiv.js" => array('browser'=>'lt IE 9'),
+ "___path.framework.frontend.web___/js/vendor/jquery-1.9.1.min.js",
+ "___path.framework.frontend.web___/js/vendor/jquery-ui/js/jquery-ui-1.10.2.custom.min.js",
+ "___path.framework.frontend.web___/js/vendor/jquery-ui/js/localization/jquery-ui-datepicker-ru.js",
+ "___path.framework.frontend.web___/js/vendor/jquery.browser.js",
+ "___path.framework.frontend.web___/js/vendor/jquery.scrollto.js",
+ "___path.framework.frontend.web___/js/vendor/jquery.rich-array.min.js",
+ "___path.framework.frontend.web___/js/vendor/jquery.form.js",
+ "___path.framework.frontend.web___/js/vendor/jquery.jqplugin.js",
+ "___path.framework.frontend.web___/js/vendor/jquery.cookie.js",
+ "___path.framework.frontend.web___/js/vendor/jquery.serializejson.js",
+ "___path.framework.frontend.web___/js/vendor/jquery.file.js",
+ "___path.framework.frontend.web___/js/vendor/jcrop/jquery.Jcrop.js",
+ "___path.framework.frontend.web___/js/vendor/jquery.placeholder.min.js",
+ "___path.framework.frontend.web___/js/vendor/jquery.charcount.js",
+ "___path.framework.frontend.web___/js/vendor/jquery.imagesloaded.js",
+ "___path.framework.frontend.web___/js/vendor/notifier/jquery.notifier.js",
+ "___path.framework.frontend.web___/js/vendor/prettify/prettify.js",
+ "___path.framework.frontend.web___/js/vendor/prettyphoto/js/jquery.prettyphoto.js",
+ "___path.framework.frontend.web___/js/vendor/parsley/parsley.js",
+ "___path.framework.frontend.web___/js/vendor/parsley/i18n/messages.ru.js",
/* Core */
- "___path.static.framework___/js/core/main.js",
- "___path.static.framework___/js/core/hook.js",
+ "___path.framework.frontend.web___/js/core/main.js",
+ "___path.framework.frontend.web___/js/core/hook.js",
/* User Interface */
- "___path.static.framework___/js/ui/popup.js",
- "___path.static.framework___/js/ui/dropdown.js",
- "___path.static.framework___/js/ui/tooltip.js",
- "___path.static.framework___/js/ui/popover.js",
- "___path.static.framework___/js/ui/tab.js",
- "___path.static.framework___/js/ui/modal.js",
- "___path.static.framework___/js/ui/toolbar.js",
+ "___path.framework.frontend.web___/js/ui/popup.js",
+ "___path.framework.frontend.web___/js/ui/dropdown.js",
+ "___path.framework.frontend.web___/js/ui/tooltip.js",
+ "___path.framework.frontend.web___/js/ui/popover.js",
+ "___path.framework.frontend.web___/js/ui/tab.js",
+ "___path.framework.frontend.web___/js/ui/modal.js",
+ "___path.framework.frontend.web___/js/ui/toolbar.js",
/* LiveStreet */
- "___path.root.web___/application/frontend/common/js/favourite.js",
- "___path.root.web___/application/frontend/common/js/blocks.js",
- "___path.root.web___/application/frontend/common/js/pagination.js",
- "___path.root.web___/application/frontend/common/js/editor.js",
- "___path.root.web___/application/frontend/common/js/talk.js",
- "___path.root.web___/application/frontend/common/js/vote.js",
- "___path.root.web___/application/frontend/common/js/poll.js",
- "___path.root.web___/application/frontend/common/js/subscribe.js",
- "___path.root.web___/application/frontend/common/js/geo.js",
- "___path.root.web___/application/frontend/common/js/wall.js",
- "___path.root.web___/application/frontend/common/js/usernote.js",
- "___path.root.web___/application/frontend/common/js/comments.js",
- "___path.root.web___/application/frontend/common/js/blog.js",
- "___path.root.web___/application/frontend/common/js/user.js",
- "___path.root.web___/application/frontend/common/js/userfeed.js",
- "___path.root.web___/application/frontend/common/js/stream.js",
- "___path.root.web___/application/frontend/common/js/photoset.js",
- "___path.root.web___/application/frontend/common/js/toolbar.js",
- "___path.root.web___/application/frontend/common/js/settings.js",
- "___path.root.web___/application/frontend/common/js/topic.js",
- "___path.root.web___/application/frontend/common/js/admin.js",
- "___path.root.web___/application/frontend/common/js/admin.userfield.js",
- "___path.root.web___/application/frontend/common/js/captcha.js",
- "___path.root.web___/application/frontend/common/js/init.js",
+ "___path.application.web___/frontend/common/js/favourite.js",
+ "___path.application.web___/frontend/common/js/blocks.js",
+ "___path.application.web___/frontend/common/js/pagination.js",
+ "___path.application.web___/frontend/common/js/editor.js",
+ "___path.application.web___/frontend/common/js/talk.js",
+ "___path.application.web___/frontend/common/js/vote.js",
+ "___path.application.web___/frontend/common/js/poll.js",
+ "___path.application.web___/frontend/common/js/subscribe.js",
+ "___path.application.web___/frontend/common/js/geo.js",
+ "___path.application.web___/frontend/common/js/wall.js",
+ "___path.application.web___/frontend/common/js/usernote.js",
+ "___path.application.web___/frontend/common/js/comments.js",
+ "___path.application.web___/frontend/common/js/blog.js",
+ "___path.application.web___/frontend/common/js/user.js",
+ "___path.application.web___/frontend/common/js/userfeed.js",
+ "___path.application.web___/frontend/common/js/stream.js",
+ "___path.application.web___/frontend/common/js/photoset.js",
+ "___path.application.web___/frontend/common/js/toolbar.js",
+ "___path.application.web___/frontend/common/js/settings.js",
+ "___path.application.web___/frontend/common/js/topic.js",
+ "___path.application.web___/frontend/common/js/admin.js",
+ "___path.application.web___/frontend/common/js/admin.userfield.js",
+ "___path.application.web___/frontend/common/js/captcha.js",
+ "___path.application.web___/frontend/common/js/init.js",
"http://yandex.st/share/share.js" => array('merge'=>false),
);
$config['head']['default']['css'] = array(
// Framework styles
- "___path.static.framework___/css/reset.css",
- "___path.static.framework___/css/helpers.css",
- "___path.static.framework___/css/text.css",
- "___path.static.framework___/css/dropdowns.css",
- "___path.static.framework___/css/buttons.css",
- "___path.static.framework___/css/forms.css",
- "___path.static.framework___/css/navs.css",
- "___path.static.framework___/css/modals.css",
- "___path.static.framework___/css/tooltip.css",
- "___path.static.framework___/css/popover.css",
- "___path.static.framework___/css/alerts.css",
- "___path.static.framework___/css/toolbar.css"
+ "___path.framework.frontend.web___/css/reset.css",
+ "___path.framework.frontend.web___/css/helpers.css",
+ "___path.framework.frontend.web___/css/text.css",
+ "___path.framework.frontend.web___/css/dropdowns.css",
+ "___path.framework.frontend.web___/css/buttons.css",
+ "___path.framework.frontend.web___/css/forms.css",
+ "___path.framework.frontend.web___/css/navs.css",
+ "___path.framework.frontend.web___/css/modals.css",
+ "___path.framework.frontend.web___/css/tooltip.css",
+ "___path.framework.frontend.web___/css/popover.css",
+ "___path.framework.frontend.web___/css/alerts.css",
+ "___path.framework.frontend.web___/css/toolbar.css"
);
/**
diff --git a/application/frontend/common/js/captcha.js b/application/frontend/common/js/captcha.js
index a51a8e99..f4ded8c2 100644
--- a/application/frontend/common/js/captcha.js
+++ b/application/frontend/common/js/captcha.js
@@ -41,7 +41,7 @@ ls.captcha = (function ($) {
* @return {String} URL каптчи
*/
this.getCaptchaUrl = function () {
- return DIR_ENGINE_LIBS + '/vendor/kcaptcha/index.php?' + SESSION_NAME + '=' + SESSION_ID + '&n=' + Math.random();
+ return PATH_FRAMEWORK_LIBS_VENDOR + '/kcaptcha/index.php?' + SESSION_NAME + '=' + SESSION_ID + '&n=' + Math.random();
};
/**
diff --git a/application/frontend/skin/developer/actions/ActionSearch/opensearch.tpl b/application/frontend/skin/developer/actions/ActionSearch/opensearch.tpl
index c722b3e3..efedf0b4 100644
--- a/application/frontend/skin/developer/actions/ActionSearch/opensearch.tpl
+++ b/application/frontend/skin/developer/actions/ActionSearch/opensearch.tpl
@@ -4,8 +4,8 @@
{$sAdminMail}
{$sHtmlDescription}
- {cfg name='path.static.assets'}/images/favicons/logo.png
- {cfg name='path.static.assets'}/images/favicons/favicon.ico
+ {cfg name='path.skin.assets.web'}/images/favicons/logo.png
+ {cfg name='path.skin.assets.web'}/images/favicons/favicon.ico
{cfg name='view.name'} ({cfg name='path.root.web'})
© «{cfg name='view.name'}»
diff --git a/application/frontend/skin/developer/emails/email.base.tpl b/application/frontend/skin/developer/emails/email.base.tpl
index 1f16e32d..6f6c14dd 100644
--- a/application/frontend/skin/developer/emails/email.base.tpl
+++ b/application/frontend/skin/developer/emails/email.base.tpl
@@ -19,7 +19,7 @@
{$sFooterLinkColor = '949fa3'} {* Цвет ссылки в футере *}
{* Путь до папки с изображенями *}
-{$sImagesDir = "{cfg name='path.static.assets'}/images/emails"}
+{$sImagesDir = "{cfg name='path.skin.assets.web'}/images/emails"}
{* Фон *}
diff --git a/application/frontend/skin/developer/forms/editor.init.tpl b/application/frontend/skin/developer/forms/editor.init.tpl
index 4e839fbd..7e62303f 100644
--- a/application/frontend/skin/developer/forms/editor.init.tpl
+++ b/application/frontend/skin/developer/forms/editor.init.tpl
@@ -35,7 +35,7 @@
{/if}
{/if}
-
+
+
+
+