comments fin

privatecore · Feb 13, 2013 · a9de287 · a9de287
1 parent 3efe089
commit a9de287
Show file tree

Hide file tree

Showing 2,802 changed files with 262 additions and 94 deletions.
diff --git a/application/config/api.php b/application/config/api.php
diff --git a/application/config/auth.php b/application/config/auth.php
diff --git a/application/config/autoload.php b/application/config/autoload.php
diff --git a/application/config/constants.php b/application/config/constants.php
diff --git a/application/config/forms.php b/application/config/forms.php
diff --git a/application/config/hooks.php b/application/config/hooks.php
diff --git a/application/config/index.html b/application/config/index.html
diff --git a/application/config/mimes.php b/application/config/mimes.php
diff --git a/application/config/routes.php b/application/config/routes.php
diff --git a/application/config/smileys.php b/application/config/smileys.php
diff --git a/application/config/user_agents.php b/application/config/user_agents.php
diff --git a/application/controllers/index.html b/application/controllers/index.html
diff --git a/application/controllers/welcome.php b/application/controllers/welcome.php
diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php
diff --git a/application/core/MY_Input.php b/application/core/MY_Input.php
diff --git a/application/core/MY_Loader.php b/application/core/MY_Loader.php
diff --git a/application/core/MY_Router.php b/application/core/MY_Router.php
diff --git a/application/core/MY_URI.php b/application/core/MY_URI.php
diff --git a/application/errors/error_404.php b/application/errors/error_404.php
diff --git a/application/errors/error_db.php b/application/errors/error_db.php
diff --git a/application/errors/error_general.php b/application/errors/error_general.php
diff --git a/application/errors/error_php.php b/application/errors/error_php.php
diff --git a/application/errors/index.html b/application/errors/index.html
diff --git a/application/helpers/admin_helper.php b/application/helpers/admin_helper.php
diff --git a/application/helpers/array_helper.php b/application/helpers/array_helper.php
diff --git a/application/helpers/cache_helper.php b/application/helpers/cache_helper.php
diff --git a/application/helpers/category_helper.php b/application/helpers/category_helper.php
diff --git a/application/helpers/component_helper.php b/application/helpers/component_helper.php
diff --git a/application/helpers/dx_captcha_helper.php b/application/helpers/dx_captcha_helper.php
diff --git a/application/helpers/form_csrf_helper.php b/application/helpers/form_csrf_helper.php
diff --git a/application/helpers/html_helper.php b/application/helpers/html_helper.php
diff --git a/application/helpers/index.html b/application/helpers/index.html
diff --git a/application/helpers/javascript_helper.php b/application/helpers/javascript_helper.php
diff --git a/application/helpers/my_url_helper.php b/application/helpers/my_url_helper.php
diff --git a/application/helpers/page_helper.php b/application/helpers/page_helper.php
diff --git a/application/helpers/recaptcha_helper.php b/application/helpers/recaptcha_helper.php
diff --git a/application/helpers/rules_helper.php b/application/helpers/rules_helper.php
diff --git a/application/helpers/translit_helper.php b/application/helpers/translit_helper.php
diff --git a/application/helpers/widget_helper.php b/application/helpers/widget_helper.php
diff --git a/application/index.html b/application/index.html
diff --git a/application/language/admin/admin_lang.php b/application/language/admin/admin_lang.php
diff --git a/application/language/admin/admin_lang_en.php b/application/language/admin/admin_lang_en.php
diff --git a/application/language/admin/english_lang/admin_lang.php b/application/language/admin/english_lang/admin_lang.php
diff --git a/application/language/admin/english_lang/admin_shop_lang.php b/application/language/admin/english_lang/admin_shop_lang.php
diff --git a/application/language/admin/english_lang/basemodules_lang.php b/application/language/admin/english_lang/basemodules_lang.php
diff --git a/application/language/admin/english_lang/controller_lang.php b/application/language/admin/english_lang/controller_lang.php
diff --git a/application/language/admin/russian_lang/admin_lang.php b/application/language/admin/russian_lang/admin_lang.php
diff --git a/application/language/admin/russian_lang/admin_shop_lang.php b/application/language/admin/russian_lang/admin_shop_lang.php
diff --git a/application/language/admin/russian_lang/basemodules_lang.php b/application/language/admin/russian_lang/basemodules_lang.php
diff --git a/application/language/admin/russian_lang/controller_lang.php b/application/language/admin/russian_lang/controller_lang.php
diff --git a/application/language/english/calendar_lang.php b/application/language/english/calendar_lang.php
diff --git a/application/language/english/date_lang.php b/application/language/english/date_lang.php
diff --git a/application/language/english/db_lang.php b/application/language/english/db_lang.php
diff --git a/application/language/english/dx_auth_lang.php b/application/language/english/dx_auth_lang.php
diff --git a/application/language/english/email_lang.php b/application/language/english/email_lang.php
diff --git a/application/language/english/form_validation_lang.php b/application/language/english/form_validation_lang.php
diff --git a/application/language/english/ftp_lang.php b/application/language/english/ftp_lang.php
diff --git a/application/language/english/imglib_lang.php b/application/language/english/imglib_lang.php
diff --git a/application/language/english/index.html b/application/language/english/index.html
diff --git a/application/language/english/main_lang.php b/application/language/english/main_lang.php
diff --git a/application/language/english/number_lang.php b/application/language/english/number_lang.php
diff --git a/application/language/english/profiler_lang.php b/application/language/english/profiler_lang.php
diff --git a/application/language/english/scaffolding_lang.php b/application/language/english/scaffolding_lang.php
diff --git a/application/language/english/unit_test_lang.php b/application/language/english/unit_test_lang.php
diff --git a/application/language/english/upload_lang.php b/application/language/english/upload_lang.php
diff --git a/application/language/english/validation_lang.php b/application/language/english/validation_lang.php
diff --git a/application/language/index.html b/application/language/index.html
diff --git a/application/language/russian/calendar_lang.php b/application/language/russian/calendar_lang.php
diff --git a/application/language/russian/date_lang.php b/application/language/russian/date_lang.php
diff --git a/application/language/russian/db_lang.php b/application/language/russian/db_lang.php
diff --git a/application/language/russian/dx_auth_lang.php b/application/language/russian/dx_auth_lang.php
diff --git a/application/language/russian/email_lang.php b/application/language/russian/email_lang.php
diff --git a/application/language/russian/form_validation_lang.php b/application/language/russian/form_validation_lang.php
diff --git a/application/language/russian/ftp_lang.php b/application/language/russian/ftp_lang.php
diff --git a/application/language/russian/imglib_lang.php b/application/language/russian/imglib_lang.php
diff --git a/application/language/russian/index.html b/application/language/russian/index.html
diff --git a/application/language/russian/main_lang.php b/application/language/russian/main_lang.php
diff --git a/application/language/russian/number_lang.php b/application/language/russian/number_lang.php
diff --git a/application/language/russian/profiler_lang.php b/application/language/russian/profiler_lang.php
diff --git a/application/language/russian/scaffolding_lang.php b/application/language/russian/scaffolding_lang.php
diff --git a/application/language/russian/unit_test_lang.php b/application/language/russian/unit_test_lang.php
diff --git a/application/language/russian/upload_lang.php b/application/language/russian/upload_lang.php
diff --git a/application/language/russian/validation_lang.php b/application/language/russian/validation_lang.php
diff --git a/application/libraries/BaseAdminController.php b/application/libraries/BaseAdminController.php
diff --git a/application/libraries/Console.php b/application/libraries/Console.php
diff --git a/application/libraries/DX_Auth.php b/application/libraries/DX_Auth.php
diff --git a/application/libraries/DX_Auth_Event.php b/application/libraries/DX_Auth_Event.php
diff --git a/application/libraries/Elfinder_lib.php b/application/libraries/Elfinder_lib.php
diff --git a/application/libraries/MCAPI.php b/application/libraries/MCAPI.php
diff --git a/application/libraries/MY_Email.php b/application/libraries/MY_Email.php
diff --git a/application/libraries/MY_Form_validation.php b/application/libraries/MY_Form_validation.php
diff --git a/application/libraries/MY_Pagination.php b/application/libraries/MY_Pagination.php
diff --git a/application/libraries/Permitions.php b/application/libraries/Permitions.php
diff --git a/application/libraries/Profiler.php b/application/libraries/Profiler.php
diff --git a/application/libraries/cache.php b/application/libraries/cache.php
diff --git a/application/libraries/cms_hooks.php b/application/libraries/cms_hooks.php
diff --git a/application/libraries/elfinder/MySQLStorage.sql b/application/libraries/elfinder/MySQLStorage.sql
diff --git a/application/libraries/elfinder/connector.php b/application/libraries/elfinder/connector.php
diff --git a/application/libraries/elfinder/elFinder.class.php b/application/libraries/elfinder/elFinder.class.php
diff --git a/application/libraries/elfinder/elFinderConnector.class.php b/application/libraries/elfinder/elFinderConnector.class.php
diff --git a/application/libraries/elfinder/elFinderVolumeDriver.class.php b/application/libraries/elfinder/elFinderVolumeDriver.class.php
diff --git a/application/libraries/elfinder/elFinderVolumeLocalFileSystem.class.php b/application/libraries/elfinder/elFinderVolumeLocalFileSystem.class.php
diff --git a/application/libraries/elfinder/elFinderVolumeMySQL.class.php b/application/libraries/elfinder/elFinderVolumeMySQL.class.php
diff --git a/application/libraries/elfinder/mime.types b/application/libraries/elfinder/mime.types
diff --git a/application/libraries/index.html b/application/libraries/index.html
diff --git a/application/libraries/lib_admin.php b/application/libraries/lib_admin.php
diff --git a/application/libraries/lib_category.php b/application/libraries/lib_category.php
diff --git a/application/libraries/lib_csrf.php b/application/libraries/lib_csrf.php
diff --git a/application/libraries/lib_init.php b/application/libraries/lib_init.php
diff --git a/application/libraries/lib_seo.php b/application/libraries/lib_seo.php
diff --git a/application/libraries/lib_xml.php b/application/libraries/lib_xml.php
diff --git a/application/libraries/mabilis/Config.class.php b/application/libraries/mabilis/Config.class.php
diff --git a/application/libraries/mabilis/Mabilis.class.php b/application/libraries/mabilis/Mabilis.class.php
diff --git a/application/libraries/mabilis/Mabilis.compiler.php b/application/libraries/mabilis/Mabilis.compiler.php
diff --git a/application/libraries/mabilis/functions/func.counter.php b/application/libraries/mabilis/functions/func.counter.php
diff --git a/application/libraries/mabilis/functions/func.truncate.php b/application/libraries/mabilis/functions/func.truncate.php
diff --git a/application/libraries/mabilis/functions/index.html b/application/libraries/mabilis/functions/index.html
diff --git a/application/libraries/mabilis/index.html b/application/libraries/mabilis/index.html
diff --git a/application/libraries/mem_cache.php b/application/libraries/mem_cache.php
diff --git a/application/libraries/native_session.php b/application/libraries/native_session.php
diff --git a/application/libraries/pclzip.php b/application/libraries/pclzip.php
diff --git a/application/libraries/template.php b/application/libraries/template.php
diff --git a/application/models/cms_admin.php b/application/models/cms_admin.php
diff --git a/application/models/cms_base.php b/application/models/cms_base.php
diff --git a/application/models/dx_auth/index.html b/application/models/dx_auth/index.html
diff --git a/application/models/dx_auth/login_attempts.php b/application/models/dx_auth/login_attempts.php
diff --git a/application/models/dx_auth/permissions.php b/application/models/dx_auth/permissions.php
diff --git a/application/models/dx_auth/roles.php b/application/models/dx_auth/roles.php
diff --git a/application/models/dx_auth/user_autologin.php b/application/models/dx_auth/user_autologin.php
diff --git a/application/models/dx_auth/user_profile.php b/application/models/dx_auth/user_profile.php
diff --git a/application/models/dx_auth/user_temp.php b/application/models/dx_auth/user_temp.php
diff --git a/application/models/dx_auth/users.php b/application/models/dx_auth/users.php
diff --git a/application/models/email_model.php b/application/models/email_model.php
diff --git a/application/models/index.html b/application/models/index.html
diff --git a/application/modules/CMSFactory/BaseEvents.php b/application/modules/CMSFactory/BaseEvents.php
diff --git a/application/modules/CMSFactory/CMSFactory.php b/application/modules/CMSFactory/CMSFactory.php
diff --git a/application/modules/CMSFactory/Events.php b/application/modules/CMSFactory/Events.php
diff --git a/application/modules/CMSFactory/_module_info.php b/application/modules/CMSFactory/_module_info.php
diff --git a/application/modules/CMSFactory/admin.php b/application/modules/CMSFactory/admin.php
diff --git a/application/modules/CMSFactory/assetManager.php b/application/modules/CMSFactory/assetManager.php
diff --git a/application/modules/CMSFactory/assets/admin/index.tpl b/application/modules/CMSFactory/assets/admin/index.tpl
diff --git a/application/modules/admin/admin.php b/application/modules/admin/admin.php
diff --git a/application/modules/admin/admin_logs.php b/application/modules/admin/admin_logs.php
diff --git a/application/modules/admin/admin_search.php b/application/modules/admin/admin_search.php
diff --git a/application/modules/admin/backup.php b/application/modules/admin/backup.php
diff --git a/application/modules/admin/cache_all.php b/application/modules/admin/cache_all.php
diff --git a/application/modules/admin/categories.php b/application/modules/admin/categories.php
diff --git a/application/modules/admin/components.php b/application/modules/admin/components.php
diff --git a/application/modules/admin/dashboard.php b/application/modules/admin/dashboard.php
diff --git a/application/modules/admin/index.html b/application/modules/admin/index.html
diff --git a/application/modules/admin/languages.php b/application/modules/admin/languages.php
diff --git a/application/modules/admin/login.php b/application/modules/admin/login.php
diff --git a/application/modules/admin/mod_search.php b/application/modules/admin/mod_search.php
diff --git a/application/modules/admin/pages.php b/application/modules/admin/pages.php
diff --git a/application/modules/admin/rbac.php b/application/modules/admin/rbac.php
diff --git a/application/modules/admin/settings.php b/application/modules/admin/settings.php
diff --git a/application/modules/admin/sys_info.php b/application/modules/admin/sys_info.php
diff --git a/application/modules/admin/sys_upgrade.php b/application/modules/admin/sys_upgrade.php
diff --git a/application/modules/admin/widgets_manager.php b/application/modules/admin/widgets_manager.php
diff --git a/application/modules/auth/auth.php b/application/modules/auth/auth.php
diff --git a/application/modules/auth/index.html b/application/modules/auth/index.html
diff --git a/application/modules/auth/module_info.php b/application/modules/auth/module_info.php
diff --git a/application/modules/cfcm/admin.php b/application/modules/cfcm/admin.php
diff --git a/application/modules/cfcm/cfcm.php b/application/modules/cfcm/cfcm.php
diff --git a/application/modules/cfcm/cfcm_forms.php b/application/modules/cfcm/cfcm_forms.php
diff --git a/application/modules/cfcm/hooks.xml b/application/modules/cfcm/hooks.xml
diff --git a/application/modules/cfcm/module_info.php b/application/modules/cfcm/module_info.php
diff --git a/application/modules/cfcm/templates/admin/_form.tpl b/application/modules/cfcm/templates/admin/_form.tpl
diff --git a/application/modules/cfcm/templates/admin/_onpage_form.tpl b/application/modules/cfcm/templates/admin/_onpage_form.tpl
diff --git a/application/modules/cfcm/templates/admin/fields_tab.tpl b/application/modules/cfcm/templates/admin/fields_tab.tpl
diff --git a/application/modules/cfcm/templates/admin/group_list.tpl b/application/modules/cfcm/templates/admin/group_list.tpl
diff --git a/application/modules/cfcm/templates/admin/index.html b/application/modules/cfcm/templates/admin/index.html
diff --git a/application/modules/cfcm/templates/admin/index.tpl b/application/modules/cfcm/templates/admin/index.tpl
diff --git a/application/modules/cfcm/templates/admin/top_navigation.tpl b/application/modules/cfcm/templates/admin/top_navigation.tpl
diff --git a/application/modules/cfcm/templates/index.html b/application/modules/cfcm/templates/index.html
diff --git a/application/modules/cfcm/templates/public/index.html b/application/modules/cfcm/templates/public/index.html
diff --git a/application/modules/comments/admin.php b/application/modules/comments/admin.php
diff --git a/application/modules/comments/api.php b/application/modules/comments/api.php
@@ -5,6 +5,14 @@
 class Api extends Comments {
 
     public $tpl_name = 'comments_api';
+    public $period = 5;      // Post comment period in minutes. If user is unregistered, check will be made by ip address. 0 - To disable this method.
+    public $can_comment = 0;      // Possible values: 0 - all, 1 - registered only.
+    public $max_comment_length = 500;    // Max. comments text lenght.
+    public $use_captcha = FALSE;  // Possible values TRUE/FALSE;
+    public $cache_ttl = 86400;
+    public $comment_controller = 'comments/add';
+    public $use_moderation = TRUE;
+    public $validation_errors;
 
     public function __construct() {
         parent::__construct();
@@ -27,7 +35,6 @@ private function init_settings() {
     }
 
     public function renderPosts() {
-//        var_dump($_POST);
         $comments = array();
         ($hook = get_hook('comments_on_build_comments')) ? eval($hook) : NULL;
 
@@ -38,17 +45,23 @@ public function renderPosts() {
 //            ($hook = get_hook('comments_fetch_cache_ok')) ? eval($hook) : NULL;
 //            // Comments fetched from cahce file
 //        } else {
-        $this->db->where('module', 'shop');
-        $comments = $this->base->get($this->input->post(item_id));
+//        $this->db->where('module', 'shop');
+        $comments = $this->base->get($this->parsUrl($_SERVER['HTTP_REFERER']));
 
         // Read comments template
         // Set page id for comments form
         if ($comments != FALSE) {
             ($hook = get_hook('comments_store_cache')) ? eval($hook) : NULL;
-            $this->cache->store('comments_' . $this->input->post(item_id) . $this->module, $comments, $this->cache_ttl, 'comments');
+            $this->cache->store('comments_' . $this->parsUrl($_SERVER['HTTP_REFERER']) . $this->module, $comments, $this->cache_ttl, 'comments');
         }
         //}
 
+        if ($comments != null) {
+            $comments_count = count($comments);
+        } else {
+            $comments_count = 0;
+        }
+
         if (is_array($comments)) {
             $i = 0;
             foreach ($comments as $comment) {
@@ -69,11 +82,6 @@ public function renderPosts() {
 //
 //        echo $this->pagination->create_links();
 
-        if ($comments != null) {
-            $comments_count = count($comments);
-        } else {
-            $comments_count = 0;
-        }
 
         $data = array(
             'comments_arr' => $comments,
@@ -82,7 +90,7 @@ public function renderPosts() {
             'total_comments' => lang('lang_total_comments') . count($comments),
             'can_comment' => $this->can_comment,
             'use_captcha' => $this->use_captcha,
-            'item_id' => $this->input->post(item_id)
+//            'item_id' => $this->input->post(item_id)
         );
 
         if ($this->use_captcha == TRUE) {
@@ -97,7 +105,11 @@ public function renderPosts() {
         ($hook = get_hook('comments_assign_tpl_data')) ? eval($hook) : NULL;
         //$this->render('comments_list', array('comments'=>$comments));
 
-        echo json_encode(array('comments' => $comments));
+        echo json_encode(array(
+            'comments' => $comments,
+            'total_comments' => $comments_count,
+            'validation_errors' => $this->validation_errors
+        ));
     }
 
     /**
@@ -106,32 +118,142 @@ public function renderPosts() {
      * if product - return id
      */
     public function parsUrl($url) {
-        if (strstr($url, 'product')) {
+        if (strstr($url, '/product/')) {
             $url = parse_url($url);
             $search = array('shop', 'product', '/');
             $replace = array('', '', '');
             $url = str_replace($search, $replace, $url['path']);
-            $id = $this->db->select('id')->where('url', $url)->get('shop_products')->row();
+            $id = $this->db->select('id')
+                    ->where('url', $url)
+                    ->get('shop_products')
+                    ->row();
+            return $id->id;
+        }
+
+        if (strstr($url, '/bloh/')) {
+            $url = parse_url($url);
+            $search = array('bloh', '/');
+            $replace = array('', '');
+            $url = str_replace($search, $replace, $url['path']);
+            $id = $this->db->select('id')
+                    ->where('url', $url)
+                    ->get('content')
+                    ->row();
             return $id->id;
         }
     }
 
+    public function getModule($url) {
+        if (strstr($url, '/shop/')) {
+            return 'shop';
+        }
+
+        if (strstr($url, '/bloh/')) {
+            return 'core';
+        }
+    }
+
     public function newPost() {
+        ($hook = get_hook('comments_on_add')) ? eval($hook) : NULL;
+
         $this->load->library('user_agent');
+        $this->load->library('form_validation');
+        $this->load->model('base');
+
+
+        $item_id = $this->parsUrl($_SERVER['HTTP_REFERER']);
+
+        // Check if page comments status.
+        if ($this->module == 'core') {
+            if ($this->base->get_item_comments_status($item_id) == FALSE) {
+                ($hook = get_hook('comments_page_comments_disabled')) ? eval($hook) : NULL;
+                $this->core->error(lang('error_comments_diabled'));
+            }
+        }
+
+        if ($this->period > 0)
+            if ($this->check_comment_period() == FALSE) {
+                ($hook = get_hook('comments_period_error')) ? eval($hook) : NULL;
+                $this->core->error(sprintf(lang('error_comments_period'), $this->period));
+            }
+
+        // Validate email and nickname from unregistered users.
+        if ($this->dx_auth->is_logged_in() == FALSE) {
+            ($hook = get_hook('comments_set_val_rules')) ? eval($hook) : NULL;
+
+            $this->form_validation->set_rules('comment_email', 'lang:lang_comment_email', 'trim|required|xss_clean|valid_email');
+            $this->form_validation->set_rules('comment_author', 'lang:lang_comment_author', 'trim|required|xss_clean|max_length[50]');
+            $this->form_validation->set_rules('comment_site', 'lang:lang_comment_site', 'trim|xss_clean|max_length[250]');
+        }
+
+        // Check captcha code if captcha_check enabled and user in not admin.
+        if ($this->use_captcha == TRUE AND $this->dx_auth->is_admin() == FALSE) {
+            ($hook = get_hook('comments_set_captcha')) ? eval($hook) : NULL;
+            if ($this->dx_auth->use_recaptcha)
+                $this->form_validation->set_rules('recaptcha_response_field', lang('lang_captcha'), 'trim|required|xss_clean|callback_captcha_check');
+            else
+                $this->form_validation->set_rules('captcha', lang('lang_captcha'), 'trim|required|xss_clean|callback_captcha_check');
+        }
+
+        $this->form_validation->set_rules('comment_text', 'lang:lang_comment_text', 'trim|required|xss_clean|max_length[' . $this->max_comment_length . ']');
+
+        if ($this->form_validation->run($this) == FALSE) {
+            ($hook = get_hook('comments_validation_failed')) ? eval($hook) : NULL;
+            //$this->core->error( validation_errors() );
+//            $this->template->assign('comment_errors', validation_errors());
+        } else {
+            if ($this->dx_auth->is_logged_in() == FALSE) {
+                ($hook = get_hook('comments_author_not_logged')) ? eval($hook) : NULL;
+
+                $comment_author = trim(htmlspecialchars($this->input->post('comment_author')));
+                $comment_email = trim(htmlspecialchars($this->input->post('comment_email')));
+
+                // Write on cookie nickname and email
+                $this->_write_cookie($comment_author, $comment_email, $this->input->post('comment_site'));
+            } else {
+                ($hook = get_hook('comments_author_logged')) ? eval($hook) : NULL;
+
+                $user = $this->db->get_where('users', array('id' => $this->dx_auth->get_user_id()))->row_array();
+                $comment_author = $user['username'];
+                $comment_email = $user['email'];
+            }
+
+            $comment_text = trim(htmlspecialchars($this->input->post('comment_text')));
+            $comment_text = str_replace("\n", '<br/>', $comment_text);
+            $comment_text_plus = trim(htmlspecialchars($this->input->post('comment_text_plus')));
+            $comment_text_plus = str_replace("\n", '<br/>', $comment_text_plus);
+            $comment_text_minus = trim(htmlspecialchars($this->input->post('comment_text_minus')));
+            $comment_text_minus = str_replace("\n", '<br/>', $comment_text_minus);
+            $rate = $this->input->post('ratec');
+            if ($this->input->post('ratec')) {
+                if (SProductsQuery::create()->findPk($item_id) !== null) {
+                    $model = SProductsRatingQuery::create()->findPk($item_id);
+                    if ($model === null) {
+                        $model = new SProductsRating;
+                        $model->setProductId($item_id);
+                    }
+                    $model->setVotes($model->getVotes() + 1);
+                    $model->setRating($model->getRating() + $rate);
+                    $model->save();
+                }
+            }
+        }
 
         if ($this->input->post('action') == 'newPost') {
-            $email = $this->db->select('email')->get_where('users', array('username' => $this->dx_auth->get_username()), 1)->row();
+            $email = $this->db->select('email')
+                    ->get_where('users', array('username' => $this->dx_auth->get_username()), 1)
+                    ->row();
 
-            if ($this->dx_auth->is_logged_in())
+            if (!validation_errors()) {
                 $comment_data = array(
-                    'module' => 'shop',//$this->module,
+                    'module' => $this->getModule($_SERVER['HTTP_REFERER']),
                     'user_id' => $this->dx_auth->get_user_id(), // 0 if unregistered
                     'user_name' => $this->dx_auth->get_username(),
                     'user_mail' => $email->email,
                     'user_site' => htmlspecialchars($this->input->post(comment_site)),
-                    'text' => $this->input->post('comment_text'),
-                    'text_plus' => $this->input->post('comment_text_plus'),
-                    'text_minus' => $this->input->post('comment_text_minus'),
+                    'text' => $comment_text,
+                    'text_plus' => $comment_text_plus,
+                    'text_minus' => $comment_text_minus,
                     'item_id' => $this->parsUrl($_SERVER['HTTP_REFERER']),
                     'status' => $this->_comment_status(),
                     'agent' => $this->agent->agent_string(),
@@ -140,16 +262,27 @@ public function newPost() {
                     'rate' => $this->input->post('ratec'),
                     'parent' => $this->input->post('parent')
                 );
-//            else 
 
-            $this->db->insert('comments', $comment_data);
-            //return JSON
-            echo json_encode(array('answer' => 'sucesfull'));
+                $this->db->insert('comments', $comment_data);
+                $this->validation_errors = '';
 
-//            echo 'debugAPI';
+                //return sucesfull JSON answer
+                echo json_encode(
+                        array(
+                            'answer' => 'sucesfull'
+                        )
+                );
+            } else {
+                echo json_encode(
+                        array(
+                            'answer' => 'error',
+                            'validation_errors' => validation_errors()
+                        )
+                );
+            }
         }
-        else
-            parent::test();
+//        else
+//            parent::add();
     }
 
     /**
@@ -216,5 +349,85 @@ public function setno() {
         }
     }
 
+    private function check_comment_period() {
+        ($hook = get_hook('comments_on_check_period')) ? eval($hook) : NULL;
+
+        if ($this->dx_auth->is_admin() == TRUE) {
+            return TRUE;
+        }
+
+        $this->db->select('id, date');
+        $this->db->order_by('date', 'desc');
+
+        if ($this->dx_auth->is_logged_in() == TRUE) {
+            $this->db->where('user_id', $this->dx_auth->get_user_id());
+        } else {
+            $this->db->where('user_ip', $this->input->ip_address());
+        }
+
+        $query = $this->db->get('comments', 1);
+
+        if ($query->num_rows() == 1) {
+            $query = $query->row_array();
+
+            $latest_comment = $query['date'];
+            $allow_time = $latest_comment + ($this->period * 60);
+
+            if ($allow_time > time()) {
+                return FALSE;
+            } else {
+                return TRUE;
+            }
+        } else {
+            return TRUE;
+        }
+    }
+
+    public function captcha_check($code) {
+        ($hook = get_hook('comments_captcha_check')) ? eval($hook) : NULL;
+
+        if (!$this->dx_auth->captcha_check($code))
+            return FALSE;
+        else
+            return TRUE;
+    }
+
+    function get_comments_number($id) {
+        $this->where('item_id', $id);
+        $query = $this->db->get('comments')->result_array();
+        return count($query);
+    }
+
+    private function _write_cookie($name, $email, $site) {
+        $this->load->helper('cookie');
+
+        ($hook = get_hook('comments_write_cookie')) ? eval($hook) : NULL;
+
+        $cookie_name = array(
+            'name' => 'comment_author',
+            'value' => $name,
+            'expire' => '30000000',
+        );
+
+        $cookie_email = array(
+            'name' => 'comment_email',
+            'value' => $email,
+            'expire' => '30000000',
+        );
+
+        $cookie_site = array(
+            'name' => 'comment_site',
+            'value' => $site,
+            'expire' => '30000000',
+        );
+
+
+        set_cookie($cookie_name);
+        set_cookie($cookie_email);
+        set_cookie($cookie_site);
+
+        return TRUE;
+    }
+
 }
 
diff --git a/application/modules/comments/comments.php b/application/modules/comments/comments.php
@@ -342,7 +342,7 @@ private function _write_cookie($name, $email, $site) {
             'value' => $site,
             'expire' => '30000000',
         );
-
+        
 
         set_cookie($cookie_name);
         set_cookie($cookie_email);

diff --git a/application/modules/comments/comments_widgets.php b/application/modules/comments/comments_widgets.php
diff --git a/application/modules/comments/hooks.xml b/application/modules/comments/hooks.xml
diff --git a/application/modules/comments/index.html b/application/modules/comments/index.html
diff --git a/application/modules/comments/language/english/comments_lang.php b/application/modules/comments/language/english/comments_lang.php
diff --git a/application/modules/comments/language/index.html b/application/modules/comments/language/index.html
diff --git a/application/modules/comments/language/russian/comments_lang.php b/application/modules/comments/language/russian/comments_lang.php
diff --git a/application/modules/comments/models/base.php b/application/modules/comments/models/base.php
diff --git a/application/modules/comments/models/index.html b/application/modules/comments/models/index.html
diff --git a/application/modules/comments/module_info.php b/application/modules/comments/module_info.php
diff --git a/application/modules/comments/templates/comments_list.tpl b/application/modules/comments/templates/comments_list.tpl
diff --git a/application/modules/comments/templates/edit.tpl b/application/modules/comments/templates/edit.tpl
diff --git a/application/modules/comments/templates/index.html b/application/modules/comments/templates/index.html
diff --git a/application/modules/comments/templates/recent_comments.tpl b/application/modules/comments/templates/recent_comments.tpl
diff --git a/application/modules/comments/templates/recent_comments_form.tpl b/application/modules/comments/templates/recent_comments_form.tpl
diff --git a/application/modules/comments/templates/recent_product_comments.tpl b/application/modules/comments/templates/recent_product_comments.tpl
diff --git a/application/modules/comments/templates/recent_product_comments_form.tpl b/application/modules/comments/templates/recent_product_comments_form.tpl
diff --git a/application/modules/comments/templates/settings.tpl b/application/modules/comments/templates/settings.tpl
diff --git a/application/modules/comments/widgets.xml b/application/modules/comments/widgets.xml
diff --git a/application/modules/core/core.php b/application/modules/core/core.php
diff --git a/application/modules/core/core_widgets.php b/application/modules/core/core_widgets.php
diff --git a/application/modules/core/hooks.xml b/application/modules/core/hooks.xml
diff --git a/application/modules/core/index.html b/application/modules/core/index.html
diff --git a/application/modules/core/templates/index.html b/application/modules/core/templates/index.html
diff --git a/application/modules/core/templates/recent_news.tpl b/application/modules/core/templates/recent_news.tpl
diff --git a/application/modules/core/templates/recent_news_form.tpl b/application/modules/core/templates/recent_news_form.tpl
diff --git a/application/modules/core/templates/similar_posts.tpl b/application/modules/core/templates/similar_posts.tpl
diff --git a/application/modules/core/widgets.xml b/application/modules/core/widgets.xml
diff --git a/application/modules/exchange/admin.php b/application/modules/exchange/admin.php
diff --git a/application/modules/exchange/exchange.php b/application/modules/exchange/exchange.php
diff --git a/application/modules/exchange/module_info.php b/application/modules/exchange/module_info.php
diff --git a/application/modules/exchange/templates/admin/settings.tpl b/application/modules/exchange/templates/admin/settings.tpl
diff --git a/application/modules/feedback/admin.php b/application/modules/feedback/admin.php
diff --git a/application/modules/feedback/feedback.php b/application/modules/feedback/feedback.php
diff --git a/application/modules/feedback/index.html b/application/modules/feedback/index.html
diff --git a/application/modules/feedback/module_info.php b/application/modules/feedback/module_info.php
diff --git a/application/modules/feedback/templates/admin/settings.tpl b/application/modules/feedback/templates/admin/settings.tpl
diff --git a/application/modules/feedback/templates/feedback.tpl b/application/modules/feedback/templates/feedback.tpl
diff --git a/application/modules/feedback/templates/index.html b/application/modules/feedback/templates/index.html
diff --git a/application/modules/filter/_admin.php b/application/modules/filter/_admin.php
diff --git a/application/modules/filter/filter.php b/application/modules/filter/filter.php
diff --git a/application/modules/filter/module_info.php b/application/modules/filter/module_info.php
diff --git a/application/modules/forms/elements/CForm_Checkbox.php b/application/modules/forms/elements/CForm_Checkbox.php
diff --git a/application/modules/forms/elements/CForm_Checkgroup.php b/application/modules/forms/elements/CForm_Checkgroup.php
diff --git a/application/modules/forms/elements/CForm_Hidden.php b/application/modules/forms/elements/CForm_Hidden.php
diff --git a/application/modules/forms/elements/CForm_Html.php b/application/modules/forms/elements/CForm_Html.php
diff --git a/application/modules/forms/elements/CForm_Password.php b/application/modules/forms/elements/CForm_Password.php
diff --git a/application/modules/forms/elements/CForm_Radiogroup.php b/application/modules/forms/elements/CForm_Radiogroup.php
diff --git a/application/modules/forms/elements/CForm_Select.php b/application/modules/forms/elements/CForm_Select.php
diff --git a/application/modules/forms/elements/CForm_Text.php b/application/modules/forms/elements/CForm_Text.php
diff --git a/application/modules/forms/elements/CForm_Textarea.php b/application/modules/forms/elements/CForm_Textarea.php
diff --git a/application/modules/forms/forms.php b/application/modules/forms/forms.php
diff --git a/application/modules/gallery/admin.php b/application/modules/gallery/admin.php
diff --git a/application/modules/gallery/gallery.php b/application/modules/gallery/gallery.php
diff --git a/application/modules/gallery/gallery_widgets.php b/application/modules/gallery/gallery_widgets.php
diff --git a/application/modules/gallery/helpers/gallery_helper.php b/application/modules/gallery/helpers/gallery_helper.php
diff --git a/application/modules/gallery/index.html b/application/modules/gallery/index.html
diff --git a/application/modules/gallery/models/gallery_m.php b/application/modules/gallery/models/gallery_m.php
diff --git a/application/modules/gallery/models/index.html b/application/modules/gallery/models/index.html
diff --git a/application/modules/gallery/models/install.php b/application/modules/gallery/models/install.php
diff --git a/application/modules/gallery/module_info.php b/application/modules/gallery/module_info.php
diff --git a/application/modules/gallery/templates/admin/album_list.tpl b/application/modules/gallery/templates/admin/album_list.tpl
diff --git a/application/modules/gallery/templates/admin/album_params.tpl b/application/modules/gallery/templates/admin/album_params.tpl
diff --git a/application/modules/gallery/templates/admin/categories.tpl b/application/modules/gallery/templates/admin/categories.tpl
diff --git a/application/modules/gallery/templates/admin/create_album.tpl b/application/modules/gallery/templates/admin/create_album.tpl
diff --git a/application/modules/gallery/templates/admin/create_category.tpl b/application/modules/gallery/templates/admin/create_category.tpl
diff --git a/application/modules/gallery/templates/admin/edit_album.tpl b/application/modules/gallery/templates/admin/edit_album.tpl
diff --git a/application/modules/gallery/templates/admin/edit_category.tpl b/application/modules/gallery/templates/admin/edit_category.tpl
diff --git a/application/modules/gallery/templates/admin/edit_image.tpl b/application/modules/gallery/templates/admin/edit_image.tpl
diff --git a/application/modules/gallery/templates/admin/error.tpl b/application/modules/gallery/templates/admin/error.tpl
diff --git a/application/modules/gallery/templates/admin/index.html b/application/modules/gallery/templates/admin/index.html
diff --git a/application/modules/gallery/templates/admin/settings.tpl b/application/modules/gallery/templates/admin/settings.tpl
diff --git a/application/modules/gallery/templates/index.html b/application/modules/gallery/templates/index.html
diff --git a/application/modules/gallery/templates/latest_fotos.tpl b/application/modules/gallery/templates/latest_fotos.tpl
diff --git a/application/modules/gallery/templates/latest_fotos_form.tpl b/application/modules/gallery/templates/latest_fotos_form.tpl
diff --git a/application/modules/gallery/templates/public/album.tpl b/application/modules/gallery/templates/public/album.tpl
diff --git a/application/modules/gallery/templates/public/albums.tpl b/application/modules/gallery/templates/public/albums.tpl
diff --git a/application/modules/gallery/templates/public/index.html b/application/modules/gallery/templates/public/index.html
diff --git a/application/modules/gallery/templates/public/main_backup.tpl b/application/modules/gallery/templates/public/main_backup.tpl
diff --git a/application/modules/gallery/templates/public/thumbnails.tpl b/application/modules/gallery/templates/public/thumbnails.tpl
diff --git a/application/modules/gallery/widgets.xml b/application/modules/gallery/widgets.xml
diff --git a/application/modules/group_mailer/admin.php b/application/modules/group_mailer/admin.php
diff --git a/application/modules/group_mailer/group_mailer.php b/application/modules/group_mailer/group_mailer.php
diff --git a/application/modules/group_mailer/module_info.php b/application/modules/group_mailer/module_info.php
diff --git a/application/modules/group_mailer/templates/admin/form.tpl b/application/modules/group_mailer/templates/admin/form.tpl
diff --git a/application/modules/group_mailer/templates/admin/index.html b/application/modules/group_mailer/templates/admin/index.html
diff --git a/application/modules/group_mailer/templates/index.html b/application/modules/group_mailer/templates/index.html
diff --git a/application/modules/install/_install.php b/application/modules/install/_install.php
diff --git a/application/modules/install/config.php b/application/modules/install/config.php
diff --git a/application/modules/install/config/routes.php b/application/modules/install/config/routes.php
diff --git a/application/modules/install/sqlShop.sql b/application/modules/install/sqlShop.sql
diff --git a/application/modules/install/sqlShopClean.sql b/application/modules/install/sqlShopClean.sql
diff --git a/application/modules/install/sqlSite.sql b/application/modules/install/sqlSite.sql
diff --git a/application/modules/install/templates/images/bg.png b/application/modules/install/templates/images/bg.png
diff --git a/application/modules/install/templates/images/btn1_130.png b/application/modules/install/templates/images/btn1_130.png
diff --git a/application/modules/install/templates/images/error.png b/application/modules/install/templates/images/error.png
diff --git a/application/modules/install/templates/images/logo.png b/application/modules/install/templates/images/logo.png
diff --git a/application/modules/install/templates/images/okay.png b/application/modules/install/templates/images/okay.png
diff --git a/application/modules/install/templates/images/warning.png b/application/modules/install/templates/images/warning.png
diff --git a/application/modules/install/views/done.php b/application/modules/install/views/done.php
diff --git a/application/modules/install/views/index.html b/application/modules/install/views/index.html
diff --git a/application/modules/install/views/license.php b/application/modules/install/views/license.php
diff --git a/application/modules/install/views/license_shop.php b/application/modules/install/views/license_shop.php
diff --git a/application/modules/install/views/main.php b/application/modules/install/views/main.php
diff --git a/application/modules/install/views/step_1.php b/application/modules/install/views/step_1.php
diff --git a/application/modules/install/views/step_2.php b/application/modules/install/views/step_2.php
diff --git a/application/modules/language_switch/_admin.php b/application/modules/language_switch/_admin.php
diff --git a/application/modules/language_switch/language_switch.gif b/application/modules/language_switch/language_switch.gif
diff --git a/application/modules/language_switch/language_switch.php b/application/modules/language_switch/language_switch.php
diff --git a/application/modules/language_switch/language_switch.png b/application/modules/language_switch/language_switch.png
diff --git a/application/modules/language_switch/language_switch_widgets.php b/application/modules/language_switch/language_switch_widgets.php
diff --git a/application/modules/language_switch/module_info.php b/application/modules/language_switch/module_info.php
diff --git a/application/modules/language_switch/templates/admin.tpl b/application/modules/language_switch/templates/admin.tpl
diff --git a/application/modules/language_switch/templates/i/ar.gif b/application/modules/language_switch/templates/i/ar.gif
diff --git a/application/modules/language_switch/templates/i/by.gif b/application/modules/language_switch/templates/i/by.gif
diff --git a/application/modules/language_switch/templates/i/cz.gif b/application/modules/language_switch/templates/i/cz.gif
diff --git a/application/modules/language_switch/templates/i/de.gif b/application/modules/language_switch/templates/i/de.gif
diff --git a/application/modules/language_switch/templates/i/en.gif b/application/modules/language_switch/templates/i/en.gif
diff --git a/application/modules/language_switch/templates/i/fr.gif b/application/modules/language_switch/templates/i/fr.gif
diff --git a/application/modules/language_switch/templates/i/kz.gif b/application/modules/language_switch/templates/i/kz.gif
diff --git a/application/modules/language_switch/templates/i/lt.gif b/application/modules/language_switch/templates/i/lt.gif
diff --git a/application/modules/language_switch/templates/i/lv.gif b/application/modules/language_switch/templates/i/lv.gif