From c4f0955dd0563bd3aec6ac80754cc2dba195c0c6 Mon Sep 17 00:00:00 2001
From: Mzhelskiy Maxim <rus.engine@gmail.com>
Date: Wed, 7 Aug 2013 22:04:23 +0700
Subject: [PATCH] fix

---
 .gitignore                          | 15 +++++----
 application/config/config.local.php | 49 -----------------------------
 application/tmp/.htaccess           |  7 ++++-
 framework/config/config.php         |  2 +-
 framework/include/function.php      |  8 ++---
 5 files changed, 17 insertions(+), 64 deletions(-)
 delete mode 100644 application/config/config.local.php

diff --git a/.gitignore b/.gitignore
index d277ae83..80941ea9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,7 @@
-config/config.local.php
-config/config.test.php
-logs/*
-plugins/*
-templates/cache/*
-templates/compiled/*
-tmp/*
-uploads/*
+/application/config/config.local.php
+/application/config/config.test.php
+/application/logs/*
+/application/plugins/*
+/application/tmp/*
+/uploads/*
+/.idea/
diff --git a/application/config/config.local.php b/application/config/config.local.php
deleted file mode 100644
index 247dac6c..00000000
--- a/application/config/config.local.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/*-------------------------------------------------------
-*
-*   LiveStreet Engine Social Networking
-*   Copyright © 2008 Mzhelskiy Maxim
-*
-*--------------------------------------------------------
-*
-*   Official site: www.livestreet.ru
-*   Contact e-mail: rus.engine@gmail.com
-*
-*   GNU General Public License, version 2:
-*   http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
-*
----------------------------------------------------------
-*/
-/**
- * Настройки для локального сервера.
- * Для использования - переименовать файл в config.local.php
- */
-
-/**
- * Настройка базы данных
- */
-$config['db']['params']['host'] = 'localhost';
-$config['db']['params']['port'] = '3306';
-$config['db']['params']['user'] = 'root';
-$config['db']['params']['pass'] = '';
-$config['db']['params']['type']   = 'mysql';
-$config['db']['params']['dbname'] = 'social_newstruct';
-$config['db']['table']['prefix'] = 'prefix_';
-
-$config['path']['root']['web'] = 'http://localhost/livestreet-b-new-struct';
-$config['path']['root']['server'] = '/Users/ort/Develop/php/livestreet-b-new-struct';
-$config['path']['offset_request_url'] = '1';
-$config['db']['tables']['engine'] = 'InnoDB';
-$config['view']['name'] = 'Your Site3';
-$config['view']['description'] = 'Description your site';
-$config['view']['keywords'] = 'site, google, internet';
-$config['view']['skin'] = 'developer';
-$config['sys']['mail']['from_email'] = 'admin@admin.adm';
-$config['sys']['mail']['from_name'] = 'Почтовик Your Site';
-$config['general']['close'] = false;
-$config['general']['reg']['activation'] = false;
-$config['general']['reg']['invite'] = false;
-$config['lang']['current'] = 'ru';
-$config['lang']['default'] = 'ru';
-return $config;
-?>
\ No newline at end of file
diff --git a/application/tmp/.htaccess b/application/tmp/.htaccess
index 2859d7f4..87106cbd 100644
--- a/application/tmp/.htaccess
+++ b/application/tmp/.htaccess
@@ -1,2 +1,7 @@
 Order Deny,Allow
-Deny from all
\ No newline at end of file
+Deny from all
+<FilesMatch "\.(css|js)$">
+    	Order Deny,Allow
+        Deny from all
+        Allow from all
+</FilesMatch>
\ No newline at end of file
diff --git a/framework/config/config.php b/framework/config/config.php
index 9875d4e1..80317577 100644
--- a/framework/config/config.php
+++ b/framework/config/config.php
@@ -60,7 +60,7 @@ $config['path']['root']['framework']		= '___path.root.engine___';
 $config['path']['static']['root']           = '___path.root.web___';                                   // чтоб можно было статику засунуть на отдельный сервер
 $config['path']['static']['skin']           = '___path.static.root___/application/frontend/skin/___view.skin___';
 $config['path']['static']['assets']         = '___path.static.skin___/assets';                         // Папка с ассетами (js, css, images)
-$config['path']['static']['framework']      = "___path.root.framework___/frontend/framework";            // Front-end framework
+$config['path']['static']['framework']      = "___path.static.root___/framework/frontend/framework";   // Front-end framework todo: need fix path
 $config['path']['uploads']['root']          = '/uploads';                                              // директория для загрузки файлов
 $config['path']['uploads']['images']        ='___path.uploads.root___/images';
 $config['path']['offset_request_url']       = 0;                                                       // иногда помогает если сервер использует внутренние реврайты
diff --git a/framework/include/function.php b/framework/include/function.php
index c211661c..c4609742 100644
--- a/framework/include/function.php
+++ b/framework/include/function.php
@@ -56,7 +56,7 @@ function isAjaxRequest() {
 function dump($msg) {
 	if (Config::Get('sys.logs.hacker_console') && !isAjaxRequest()) {
 		if (!class_exists('Debug_HackerConsole_Main')) {
-			require_once Config::Get('path.root.server')."/engine/lib/external/HackerConsole/Main.php";
+			require_once Config::Get('path.root.framework')."/libs/vendor/HackerConsole/Main.php";
 			new Debug_HackerConsole_Main(true);
 		}
 		call_user_func(array('Debug_HackerConsole_Main', 'out'), $msg);
@@ -429,7 +429,7 @@ function func_camelize($sStr) {
 
 
 function func_list_plugins($bAll = false){
-	$sPluginsDir = Config::Get('path.root.server').'/plugins';
+	$sPluginsDir = Config::Get('path.root.application').'/plugins';
 	$sPluginsListFile = $sPluginsDir.'/'.Config::Get('sys.plugins.activation_file');
 	$aPlugin = array();
 	if($bAll){
@@ -469,6 +469,4 @@ function func_convert_entity_to_array(Entity $oEntity, $aMethods = null, $sPrefi
 		$aEntity[$sPrefix.$sProp]=$mValue;
 	}
 	return $aEntity;
-}
-
-?>
\ No newline at end of file
+}
\ No newline at end of file