4.10

imagecms · May 26, 2016 · f4b02bb · f4b02bb
1 parent de45b75
commit f4b02bb
Show file tree

Hide file tree

Showing 544 changed files with 97,413 additions and 1,238 deletions.
diff --git a/application/config/cms.php b/application/config/cms.php
@@ -61,7 +61,7 @@
   |
  */
 $config['tpl_compile_path'] = PUBPATH . 'system/cache/templates_c/';
-$config['tpl_force_compile'] = TRUE;
+$config['tpl_force_compile'] = FALSE;
 $config['tpl_compiled_ttl'] = 84600;
 $config['tpl_compress_output'] = TRUE;
 $config['tpl_use_filemtime'] = TRUE;

diff --git a/application/libraries/Permitions.php b/application/libraries/Permitions.php
@@ -1003,4 +1003,33 @@ public function makeRolesArray($controller_types, $locale) {
         return $result;
     }
 
+    private function filterShopPrivileges() {
+        $privilegesPOST = $this->input->post('Privileges');
+        $skipPrivileges = $this->db->like('name', 'Shop')->get('shop_rbac_privileges');
+        if ($skipPrivileges) {
+            $skipPrivileges = $skipPrivileges->result_array();
+            $skipPrivilegesIds = [];
+            array_map(
+                function ($privilege) use (&$skipPrivilegesIds) {
+                    $skipPrivilegesIds[$privilege['id']] = $privilege;
+                },
+                $skipPrivileges
+            );
+        }
+
+        $privilegesPOSTIds = array_filter(
+            $privilegesPOST,
+            function ($id) use (&$skipPrivilegesIds, &$privilegesPOST) {
+                return !$skipPrivilegesIds[$id] ? true : false;
+            }
+        );
+        return $privilegesPOSTIds;
+    }
+
+    private function error404($message) {
+        $this->template->assign('message', $message);
+        $this->template->show('404');
+        exit;
+    }
+
 }
diff --git a/application/libraries/lib_init.php b/application/libraries/lib_init.php
@@ -86,7 +86,7 @@ public function __construct() {
 
         } catch (Exception $ex) {
             log_message('error', $ex->getMessage());
-            show_error('Init error', 500);
+            show_error('Init error - ' . $ex->getMessage(), 500);
         }
     }
 

diff --git a/application/modules/admin/language/ru_RU/LC_MESSAGES/admin.po b/application/modules/admin/language/ru_RU/LC_MESSAGES/admin.po
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-12 04:28+0300\n"
-"PO-Revision-Date: 2016-05-12 04:28+0300\n"
+"POT-Creation-Date: 2016-05-16 03:54+0300\n"
+"PO-Revision-Date: 2016-05-16 03:54+0300\n"
 "Last-Translator:  <>\n"
 "Language-Team:  <>\n"
 "Language: \n"
@@ -28,7 +28,7 @@ msgstr ""
 
 #: templates/administrator/dashboard.tpl:124
 msgid "Check version update"
-msgstr ""
+msgstr "Обновление системы"
 
 #: templates/administrator/login_page.tpl:71
 msgid "Update the code"

diff --git a/application/modules/admin/language/ru_RU/LC_MESSAGES/admin_1463403281.mo b/application/modules/admin/language/ru_RU/LC_MESSAGES/admin_1463403281.mo
diff --git a/application/modules/admin/rbac.php b/application/modules/admin/rbac.php
@@ -38,27 +38,4 @@ public function index() {
 
     }
 
-    public function filterShopPrivileges() {
-        $privilegesPOST = $this->input->post('Privileges');
-        $skipPrivileges = $this->db->like('name', 'Shop')->get('shop_rbac_privileges');
-        if ($skipPrivileges) {
-            $skipPrivileges = $skipPrivileges->result_array();
-            $skipPrivilegesIds = [];
-            array_map(
-                function ($privilege) use (&$skipPrivilegesIds) {
-                    $skipPrivilegesIds[$privilege['id']] = $privilege;
-                },
-                $skipPrivileges
-            );
-        }
-
-        $privilegesPOSTIds = array_filter(
-            $privilegesPOST,
-            function ($id) use (&$skipPrivilegesIds, &$privilegesPOST) {
-                return !$skipPrivilegesIds[$id] ? true : false;
-            }
-        );
-        return $privilegesPOSTIds;
-    }
-
 }
diff --git a/application/modules/admin/sys_update.php b/application/modules/admin/sys_update.php
@@ -70,8 +70,9 @@ public function index() {
      * initiate update process
      */
     public function do_update() {
-        chmod(DOCUMENT_ROOT . '/backup.sql', 777);
-        unlink(DOCUMENT_ROOT . '/backup.sql');
+
+        chmod(DOCUMENT_ROOT . DIRECTORY_SEPARATOR . 'backup.sql', 777);
+        unlink(DOCUMENT_ROOT . DIRECTORY_SEPARATOR . 'backup.sql');
 
         set_time_limit(99999999999999);
 
@@ -162,7 +163,7 @@ public function update($sort_by = 'create_date', $order = 'asc') {
     }
 
     /**
-     *
+     * @return void
      */
     public function restore() {
 
@@ -176,7 +177,7 @@ public function restore() {
     }
 
     /**
-     *
+     * @return void
      */
     public function renderFile() {
 
@@ -189,7 +190,7 @@ public function renderFile() {
     }
 
     /**
-     *
+     * @return void
      */
     public function properties() {
 
@@ -212,7 +213,7 @@ public function properties() {
     }
 
     /**
-     *
+     * @return void
      */
     public function get_license() {
 
@@ -229,7 +230,7 @@ public function get_license() {
     }
 
     /**
-     *
+     * @return void
      */
     public function backup() {
 

diff --git a/application/modules/cmsemail/classes/ParentEmail.php b/application/modules/cmsemail/classes/ParentEmail.php
@@ -29,18 +29,18 @@ class ParentEmail extends MY_Controller
      * @var array
      */
     public $accepted_params = [
-                               'name',
-                               'from',
-                               'from_email',
-                               'theme',
-                               'type',
-                               'user_message',
-                               'user_message_active',
-                               'admin_message',
-                               'admin_message_active',
-                               'admin_email',
-                               'description',
-                              ];
+        'name',
+        'from',
+        'from_email',
+        'theme',
+        'type',
+        'user_message',
+        'user_message_active',
+        'admin_message',
+        'admin_message_active',
+        'admin_email',
+        'description',
+    ];
 
     /**
      * Attachment file
@@ -373,12 +373,12 @@ public function sendEmail($send_to, $pattern_name, $variables, $attachment = FAL
                 //Registering event is success
                 Events::create()->registerEvent(
                     [
-                     'from'       => $this->from,
-                     'from_email' => $this->from_email,
-                     'send_to'    => $this->send_to,
-                     'theme'      => $this->theme,
-                     'message'    => $this->message,
-                    ],
+                    'from' => $this->from,
+                    'from_email' => $this->from_email,
+                    'send_to' => $this->send_to,
+                    'theme' => $this->theme,
+                    'message' => $this->message
+                        ],
                     'ParentEmail:userSend'
                 );
                 Events::runFactory();
@@ -405,12 +405,12 @@ public function sendEmail($send_to, $pattern_name, $variables, $attachment = FAL
                 //Registering event is success
                 Events::create()->registerEvent(
                     [
-                     'from'       => $this->from,
-                     'from_email' => $this->from_email,
-                     'send_to'    => $this->send_to,
-                     'theme'      => $this->theme,
-                     'message'    => $this->message,
-                    ],
+                    'from' => $this->from,
+                    'from_email' => $this->from_email,
+                    'send_to' => $this->send_to,
+                    'theme' => $this->theme,
+                    'message' => $this->message
+                        ],
                     'ParentEmail:adminSend'
                 );
                 Events::runFactory();

diff --git a/application/modules/comments/models/base.php b/application/modules/comments/models/base.php
@@ -4,6 +4,10 @@
     exit('No direct script access allowed');
 }
 
+/**
+ * @property CI_DB_active_record $db
+ * Class Base
+ */
 class Base extends CI_Model
 {
 
@@ -170,20 +174,29 @@ public function setVoutesAfterDelete() {
                 ->where('rate >', 0)
                 ->get();
 
-            $rate = 0;
-            $votes = 0;
-            /** Если значений больше 0 вставляем их в rate и votes */
-            if ($query->num_rows() > 0) {
-                list($rate, $votes) = array_values($query->row_array());
+            $mod_shop = $this->db->get_where('comments', ['item_id' => $item, 'module' => 'shop']);
+
+            /* Если коментарии относятся к shop  тогда записываем рейтинг */
+            if ($mod_shop->num_rows() > 0) {
+
+                $rate = 0;
+                $votes = 0;
+
+                /** Если значений больше 0 вставляем их в rate и votes */
+                if ($query->num_rows() > 0) {
+                    list($rate, $votes) = array_values($query->row_array());
+
+                }
 
-            }
                 $products = SProductsRatingQuery::create()
                     ->findOneByProductId($item);
                 $products->setVotes($votes);
                 $products->setRating($rate);
                 $products->save();
 
+            }
         }
+
     }
 
     /**

diff --git a/application/modules/exchange/classes/ExchangeBase.php b/application/modules/exchange/classes/ExchangeBase.php
@@ -110,10 +110,10 @@ protected function insertBatch($tableName, $data) {
         }
         // gathering statistics
         ExchangeBase::$stats[] = [
-                                  'query type'    => 'insert',
-                                  'table name'    => $tableName,
-                                  'affected rows' => count($data),
-                                 ];
+            'query type' => 'insert',
+            'table name' => $tableName,
+            'affected rows' => count($data)
+        ];
     }
 
     public function setXml(SimpleXMLElement $xml) {
@@ -140,10 +140,10 @@ protected function updateBatch($tableName, array $data, $keyToComare) {
 
         // gathering statistics
         ExchangeBase::$stats[] = [
-                                  'query type'    => 'update',
-                                  'table name'    => $tableName,
-                                  'affected rows' => count($data),
-                                 ];
+            'query type' => 'update',
+            'table name' => $tableName,
+            'affected rows' => count($data)
+        ];
     }
 
     /**