Merge 24c8b8c3f2 into fbb8c4696e

.gitignore

@@ -0,0 +1,3 @@
+/nbproject/private/
+nbproject/project.properties
+nbproject/project.xml

cms/config/definitions.conf.php

@@ -8,6 +8,8 @@ define('JQUERY_UI_HANDLER', STATIC_URL.'js/jquery_ui_handler.js');
 define('BOOTSTRAP', '//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js');
 define('BOOTSTRAP_CSS', '//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css');
 
+define('RECAPTCHA_SCRIPT', '//www.google.com/recaptcha/api.js');
+
 define('WYSIWYG_EDITOR', '//tinymce.cachefly.net/4.0/tinymce.min.js');
 define('WYSIWYG_EDITOR_INIT', BASE_URL . 'static/js/wysiwyg_init.js');
 

cms/includes/classes/Comment.class.php

@@ -10,6 +10,8 @@ class Comment
   public $prevent_repeated_posts_minutes = 2;
   public $akismet_key = '';
   public $akismet_entry_check = 0;
+  public $recaptcha_secret_key = '';
+  public $recaptcha_entry_check = 0;
   public $remove_blank_lines = 1;
   public $auto_link = 1;
   public $smilies = 1;
@@ -461,6 +463,13 @@ class Comment
              }
            }
          }
+         
+         // reCAPTCHA check
+        if(!$this->admin_mode && $this->recaptcha_secret_key!='' && $this->recaptcha_entry_check==1)
+         {
+          if(!check_captcha($this->recaptcha_secret_key))
+            $this->errors[] = 'wrong_captcha';
+         }
        } // end if($save)
      }
    }

cms/includes/functions.inc.php

@@ -25,6 +25,29 @@ function showme($what)
   exit;
  }
 
+ /**
+  * check if the entered captcha is right
+  * NOTE: you need PHP5 for this specific function to work,
+  *       if you wan't to support other versions do a workaround yourself.
+  */
+function check_captcha($secret) {
+  $post_data = array(
+    'secret' => htmlspecialchars($secret), // have to pass it, since here $settings is not initalized 
+    'response' => $_POST["g-recaptcha-response"],
+  );
+    
+  $options = array(
+    'http' => array(
+      'method' => 'POST',
+      'content' => http_build_query($post_data),
+    ),
+  );
+  $context = stream_context_create($options);
+  $response = file_get_contents("https://www.google.com/recaptcha/api/siteverify", false, $context);
+
+  return json_decode($response)->success;
+ }
+
 /**
  * fetches settings from database
  */

cms/includes/google_analytics.inc.php

@@ -0,0 +1,44 @@
+<?php
+
+if (!defined('IN_INDEX'))
+    exit;
+
+if (isset($_SESSION[$settings['session_prefix'] . 'user_id']) && $_SESSION[$settings['session_prefix'] . 'user_type'] == 1) {
+    if (isset($_POST['google_analytics_submit'])) {
+        $google_analytics_id = !empty($_POST['google_analytics_id']) ? $_POST['google_analytics_id'] : '';
+        $google_analytics_check = isset($_POST['google_analytics_check']) ? 1 : 0;
+
+        if ($google_analytics_check && empty($google_analytics_id))
+            $errors[] = 'error_google_analytics_id';
+
+        if (empty($errors)) {
+            Database::$content->beginTransaction();
+            $dbr = Database::$content->prepare("UPDATE " . Database::$db_settings['settings_table'] . " SET value=:value WHERE name=:name");
+            $dbr->bindValue(':name', 'google_analytics_id', PDO::PARAM_STR);
+            $dbr->bindParam(':value', $google_analytics_id, PDO::PARAM_STR);
+            $dbr->execute();
+            $dbr->bindValue(':name', 'google_analytics_check', PDO::PARAM_STR);
+            $dbr->bindParam(':value', $google_analytics_check, PDO::PARAM_STR);
+            $dbr->execute();
+            Database::$content->commit();
+
+            header('Location: ' . BASE_URL . ADMIN_DIR . 'index.php?mode=google_analytics&saved=true');
+            exit;
+        }
+
+        if (isset($errors)) {
+            $template->assign('errors',$errors);
+            if(isset($_POST['google_analytics_id'])) $template->assign('google_analytics_id',htmlspecialchars(stripslashes($_POST['google_analytics_id'])));
+            if(isset($_POST['google_analytics_check'])) $template->assign('google_analytics_check',intval($_POST['google_analytics_check']));
+        }
+    } else {
+        $template->assign('google_analytics_id', htmlspecialchars(stripslashes($settings['google_analytics_id'])));
+        $template->assign('google_analytics_check',intval($settings['google_analytics_check']));
+    }
+    
+    if (isset($_GET['saved'])) {
+        $template->assign('saved', true);
+    }
+    $template->assign('subtitle', Localization::$lang['google_analytics']);
+    $template->assign('subtemplate', 'google_analytics.inc.tpl');
+}

cms/includes/login.inc.php

@@ -10,28 +10,35 @@ elseif(empty($_SESSION[$settings['session_prefix'].'user_id']) && isset($_POST['
  {
   $username = $_POST['username'];
   $userpw = $_POST['userpw'];
-  if(isset($_POST['username']) && trim($_POST['username']) != '' && isset($_POST['userpw']) && trim($_POST['userpw']) != '')
+  if (!$settings['recaptcha_login_check'] || check_captcha($settings['recaptcha_secret_key']))
    {
-    $dbr = Database::$userdata->prepare('SELECT id, name, pw, type, wysiwyg FROM '.Database::$db_settings['userdata_table'].' WHERE lower(name)=lower(:name) LIMIT 1');
-    #$dbr->bindValue(':name',mb_strtolower($_POST['username'],CHARSET), PDO::PARAM_STR);
-    $dbr->bindValue(':name',$_POST['username'], PDO::PARAM_STR);
-    $dbr->execute();
-    $row = $dbr->fetch();
-    if(isset($row['id']))
+    if(isset($_POST['username']) && trim($_POST['username']) != '' && isset($_POST['userpw']) && trim($_POST['userpw']) != '')
      {
-      if(is_pw_correct($_POST['userpw'],$row['pw']))
+      $dbr = Database::$userdata->prepare('SELECT id, name, pw, type, wysiwyg FROM '.Database::$db_settings['userdata_table'].' WHERE lower(name)=lower(:name) LIMIT 1');
+      #$dbr->bindValue(':name',mb_strtolower($_POST['username'],CHARSET), PDO::PARAM_STR);
+      $dbr->bindValue(':name',$_POST['username'], PDO::PARAM_STR);
+      $dbr->execute();
+      $row = $dbr->fetch();
+      if(isset($row['id']))
        {
-        $_SESSION[$settings['session_prefix'].'user_id'] = $row['id'];
-        $_SESSION[$settings['session_prefix'].'user_name'] = $row['name'];
-        $_SESSION[$settings['session_prefix'].'user_type'] = $row['type'];
-        $_SESSION[$settings['session_prefix'].'wysiwyg'] = $row['wysiwyg'];
-        
-        $dbr = Database::$userdata->prepare('UPDATE '.Database::$db_settings['userdata_table'].' SET last_login=:now WHERE id=:id');
-        $dbr->bindValue(':now', time(), PDO::PARAM_INT);
-        $dbr->bindValue(':id', $row['id'], PDO::PARAM_INT);
-        $dbr->execute();
-        header('Location: ../');
-        exit;
+        if(is_pw_correct($_POST['userpw'],$row['pw']))
+         {
+          $_SESSION[$settings['session_prefix'].'user_id'] = $row['id'];
+          $_SESSION[$settings['session_prefix'].'user_name'] = $row['name'];
+          $_SESSION[$settings['session_prefix'].'user_type'] = $row['type'];
+          $_SESSION[$settings['session_prefix'].'wysiwyg'] = $row['wysiwyg'];
+          
+          $dbr = Database::$userdata->prepare('UPDATE '.Database::$db_settings['userdata_table'].' SET last_login=:now WHERE id=:id');
+          $dbr->bindValue(':now', time(), PDO::PARAM_INT);
+          $dbr->bindValue(':id', $row['id'], PDO::PARAM_INT);
+          $dbr->execute();
+          header('Location: ../');
+          exit;
+         }
+        else
+         {
+          $login_failed = true;
+         }
        }
       else
        {
@@ -45,7 +52,8 @@ elseif(empty($_SESSION[$settings['session_prefix'].'user_id']) && isset($_POST['
    }
   else
    {
-    $login_failed = true;
+      header('Location: index.php?msg=wrong_captcha');
+      exit;  
    }
   if(isset($login_failed))
    {

cms/includes/page_types/commentable_page.php

@@ -15,6 +15,8 @@ $comment->comment_maxlength = $settings['comment_maxlength'];
 $comment->prevent_repeated_posts_minutes = $settings['prevent_repeated_posts_minutes'];
 $comment->akismet_key = $settings['akismet_key'];
 $comment->akismet_entry_check = $settings['akismet_entry_check'];
+$comment->recaptcha_secret_key = $settings['recaptcha_secret_key'];
+$comment->recaptcha_entry_check = $settings['recaptcha_entry_check'];
 $comment->remove_blank_lines = $settings['comment_remove_blank_lines'];
 $comment->auto_link = $settings['comment_auto_link'];
 $comment->smilies = $settings['comment_smilies'];

cms/includes/page_types/formmailer.php

@@ -34,6 +34,10 @@ if(isset($_POST['send']))
    {
     $errors[] = 'formmail_error_subj_too_long';
    }
+  if ($settings['recaptcha_mail_check'] && !isset($_SESSION[$settings['session_prefix'].'user_id']) && !check_captcha($settings['recaptcha_secret_key']))
+   {
+    $errors[] = 'wrong_captcha';
+   }
   if(empty($errors))
    {
         // Akismet spam check:

cms/includes/spam_protection.inc.php

@@ -47,6 +47,15 @@ if(isset($_SESSION[$settings['session_prefix'].'user_id']) && $_SESSION[$setting
     $akismet_key = !empty($_POST['akismet_key']) ? $_POST['akismet_key'] : '';
     $akismet_entry_check = isset($_POST['akismet_entry_check']) ? 1 : 0;
     $akismet_mail_check = isset($_POST['akismet_mail_check']) ? 1 : 0;
+    
+    $recaptcha_public_key = !empty($_POST['recaptcha_public_key']) ? $_POST['recaptcha_public_key'] : '';
+    $recaptcha_secret_key = !empty($_POST['recaptcha_secret_key']) ? $_POST['recaptcha_secret_key'] : '';
+    $recaptcha_login_check = isset($_POST['recaptcha_login_check']) ? 1 : 0;
+    $recaptcha_entry_check = isset($_POST['recaptcha_entry_check']) ? 1 : 0;
+    $recaptcha_mail_check = isset($_POST['recaptcha_mail_check']) ? 1 : 0;
+    
+    if(($recaptcha_login_check || $recaptcha_entry_check || $recaptcha_mail_check) && (empty($recaptcha_public_key)) || empty($recaptcha_secret_key))
+      $errors[] = 'error_recaptcha_keys';
 
     if(trim($banned_ips=='') && trim($banned_user_agents=='')) $check_access_permission = 0;
     else $check_access_permission = 1;
@@ -77,6 +86,21 @@ if(isset($_SESSION[$settings['session_prefix'].'user_id']) && $_SESSION[$setting
       $dbr->bindValue(':name', 'akismet_mail_check', PDO::PARAM_STR);
       $dbr->bindParam(':value', $akismet_mail_check, PDO::PARAM_STR);
       $dbr->execute();
+      $dbr->bindValue(':name', 'recaptcha_public_key', PDO::PARAM_STR);
+      $dbr->bindParam(':value', $recaptcha_public_key, PDO::PARAM_STR);
+      $dbr->execute();
+      $dbr->bindValue(':name', 'recaptcha_secret_key', PDO::PARAM_STR);
+      $dbr->bindParam(':value', $recaptcha_secret_key, PDO::PARAM_STR);
+      $dbr->execute();
+      $dbr->bindValue(':name', 'recaptcha_login_check', PDO::PARAM_STR);
+      $dbr->bindParam(':value', $recaptcha_login_check, PDO::PARAM_STR);
+      $dbr->execute();
+      $dbr->bindValue(':name', 'recaptcha_entry_check', PDO::PARAM_STR);
+      $dbr->bindParam(':value', $recaptcha_entry_check, PDO::PARAM_STR);
+      $dbr->execute();
+      $dbr->bindValue(':name', 'recaptcha_mail_check', PDO::PARAM_STR);
+      $dbr->bindParam(':value', $recaptcha_mail_check, PDO::PARAM_STR);
+      $dbr->execute();
       $dbr->bindValue(':name', 'check_access_permission', PDO::PARAM_STR);
       $dbr->bindParam(':value', $check_access_permission, PDO::PARAM_STR);
       $dbr->execute();
@@ -95,6 +119,11 @@ if(isset($_SESSION[$settings['session_prefix'].'user_id']) && $_SESSION[$setting
       if(isset($_POST['akismet_key'])) $template->assign('akismet_key',htmlspecialchars(stripslashes($_POST['akismet_key'])));
       if(isset($_POST['akismet_entry_check'])) $template->assign('akismet_entry_check',intval($_POST['akismet_entry_check']));
       if(isset($_POST['akismet_mail_check'])) $template->assign('akismet_mail_check',intval($_POST['akismet_mail_check']));
+      if(isset($_POST['recaptcha_public_key'])) $template->assign('recaptcha_public_key', htmlspecialchars(stripslashes($_POST['recaptcha_public_key'])));
+      if(isset($_POST['recaptcha_secret_key']))$template->assign('recaptcha_secret_key', htmlspecialchars(stripslashes($_POST['recaptcha_secret_key'])));
+      if(isset($_POST['recaptcha_login_check'])) $template->assign('recaptcha_login_check',intval($_POST['recaptcha_login_check']));
+      if(isset($_POST['recaptcha_entry_check'])) $template->assign('recaptcha_entry_check',intval($_POST['recaptcha_entry_check']));
+      if(isset($_POST['recaptcha_mail_check'])) $template->assign('recaptcha_mail_check',intval($_POST['recaptcha_mail_check']));
 
      }
 
@@ -120,6 +149,13 @@ if(isset($_SESSION[$settings['session_prefix'].'user_id']) && $_SESSION[$setting
     $template->assign('akismet_key',htmlspecialchars(stripslashes($settings['akismet_key'])));
     $template->assign('akismet_entry_check',intval($settings['akismet_entry_check']));
     $template->assign('akismet_mail_check',intval($settings['akismet_mail_check']));
+    
+    // reCAPTCHA
+    $template->assign('recaptcha_public_key', htmlspecialchars(stripslashes($settings['recaptcha_public_key'])));
+    $template->assign('recaptcha_secret_key', htmlspecialchars(stripslashes($settings['recaptcha_secret_key'])));
+    $template->assign('recaptcha_login_check',intval($settings['recaptcha_login_check']));
+    $template->assign('recaptcha_entry_check',intval($settings['recaptcha_entry_check']));
+    $template->assign('recaptcha_mail_check',intval($settings['recaptcha_mail_check']));
    }
   if(isset($_GET['saved']))
    {

cms/index.php

@@ -115,6 +115,7 @@ try
     case 'pages': include('./includes/pages.inc.php'); break;
     case 'galleries': include('./includes/galleries.inc.php'); break;
     case 'gcb': include('./includes/gcb.inc.php'); break;
+    case 'google_analytics': include('./includes/google_analytics.inc.php'); break;
     case 'notes': include('./includes/notes.inc.php'); break;
     case 'comments': include('./includes/comments.inc.php'); break;
     case 'filemanager': include('./includes/filemanager.inc.php'); break;

cms/lang/bulgarian.admin.lang.php

@@ -45,6 +45,7 @@ $lang['admin_menu_edit_gcb'] =           'Глобални блокове';
 $lang['admin_menu_edit_comments'] =      'Коментари';
 $lang['admin_menu_filemanager'] =        'Файл мениджър';
 $lang['admin_menu_spam_protection'] =    'Спам защита';
+$lang['admin_menu_ganalytics'] =         'Google Analytics';
 $lang['admin_menu_user_administr'] =     'Потребители';
 $lang['admin_menu_clear_cache'] =        'Изчистване на кеша';
 $lang['admin_menu_edit_userdata'] =      'Смяна на парола';
@@ -463,6 +464,26 @@ $lang['spam_protection_saved'] =         'Настройките на спам
 $lang['error_own_ip_banned'] =           'Опитвате се да забраните Вашия IP адрес!';
 $lang['error_own_user_agent_banned'] =   'Опитвате се да забраните Вашия браузър (user agent)!';
 
+# reCAPTCHA
+$lang['recaptcha'] =                     'reCAPTCHA';
+$lang['recaptcha_desc'] =                'reCAPTCHA bot protection';
+$lang['recaptcha_login_check'] =         'enable for users login';
+$lang['recaptcha_entry_check'] =         'enable for comments';
+$lang['recaptcha_mail_check'] =          'enable for formmailer';
+$lang['recaptcha_public_key'] =          'Site Key';
+$lang['recaptcha_secret_key'] =          'Secret Key';
+$lang['error_recaptcha_keys'] =          'You forgot to setup your reCAPTCHA keys!';
+$lang['wrong_captcha'] =                 'You entered a wrong captcha, try again!';
+
+# Google Analytics
+$lang['google_analytics'] =              'Google Analytics';
+$lang['google_analytics_desc'] =         'Google Analytics is a service offered by Google to help web-masters knowing who is visiting their site.';
+$lang['google_analytics_id'] =           'Tracking ID:';
+$lang['google_analytics_check'] =        'enable Google Analytics <small><em>(in every page except in administration\'s ones)</em></small>';
+$lang['google_analytics_submit'] =       'OK - Control them all';
+$lang['google_analytics_saved'] =        'Data saved successfully, 1984 is now.';
+$lang['error_google_analytics_id'] =     'You can\'t enable Google Analytics without entering your personal tracking id!';
+
 # insert_image
 $lang['insert_image'] =                  'Вмъкване на снимка';
 $lang['select_image_title'] =            'Вмъкване на снимка';

cms/lang/bulgarian.page.lang.php

@@ -147,4 +147,7 @@ $lang['search_no_results'] =             'Не са намерени стран
 $lang['akismet_error_api_key'] =         'Невалиден Akismet API ключ!';
 $lang['akismet_error_connection'] =      'Грешка при свързването със сървъра - моля, опитайте по-късно!';
 $lang['akismet_spam_suspicion'] =        'Съмнение за Спам!';
+
+// reCAPTCHA:
+$lang['wrong_captcha'] =				 'You entered a wrong captcha, please try again!';
 ?>

cms/lang/chinese_zh-CN.admin.lang.php

@@ -40,6 +40,7 @@ $lang['admin_menu_edit_gcb'] =           '全局内容区块';
 $lang['admin_menu_edit_comments'] =      '评论';
 $lang['admin_menu_filemanager'] =        '文件管理器';
 $lang['admin_menu_spam_protection'] =    'Spam 保护';
+$lang['admin_menu_ganalytics'] =         'Google Analytics';
 $lang['admin_menu_user_administr'] =     '管理员';
 $lang['admin_menu_clear_cache'] =        '清除缓存';
 $lang['admin_menu_edit_userdata'] =      '编辑用户';
@@ -458,6 +459,26 @@ $lang['spam_protection_saved'] =         '已保存';
 $lang['error_own_ip_banned'] =           '你禁止了自己的IP!';
 $lang['error_own_user_agent_banned'] =   '你禁止了自己的浏览器标志!';
 
+# reCAPTCHA
+$lang['recaptcha'] =                     'reCAPTCHA';
+$lang['recaptcha_desc'] =                'reCAPTCHA bot protection';
+$lang['recaptcha_login_check'] =         'enable for users login';
+$lang['recaptcha_entry_check'] =         'enable for comments';
+$lang['recaptcha_mail_check'] =          'enable for formmailer';
+$lang['recaptcha_public_key'] =          'Site Key';
+$lang['recaptcha_secret_key'] =          'Secret Key';
+$lang['error_recaptcha_keys'] =          'You forgot to setup your reCAPTCHA keys!';
+$lang['wrong_captcha'] =                 'You entered a wrong captcha, try again!';
+
+# Google Analytics
+$lang['google_analytics'] =              'Google Analytics';
+$lang['google_analytics_desc'] =         'Google Analytics is a service offered by Google to help web-masters knowing who is visiting their site.';
+$lang['google_analytics_id'] =           'Tracking ID:';
+$lang['google_analytics_check'] =        'enable Google Analytics <small><em>(in every page except in administration\'s ones)</em></small>';
+$lang['google_analytics_submit'] =       'OK - Control them all';
+$lang['google_analytics_saved'] =        'Data saved successfully, 1984 is now.';
+$lang['error_google_analytics_id'] =     'You can\'t enable Google Analytics without entering your personal tracking id!';
+
 # insert_image
 $lang['insert_image'] =                  '插入图片';
 $lang['select_image_title'] =            '插入图片';

cms/lang/chinese_zh-CN.page.lang.php

@@ -143,5 +143,8 @@ $lang['search_no_results'] =             '页面未找到';
 $lang['akismet_error_api_key'] =         'Invalid akismet api key';
 $lang['akismet_error_connection'] =      'Server connection error - please try again later';
 $lang['akismet_spam_suspicion'] =        'Spam suspicion!';
+
+// reCAPTCHA:
+$lang['wrong_captcha'] =				 'You entered a wrong captcha, please try again!';
 ?>
 

cms/lang/english.admin.lang.php

@@ -40,6 +40,7 @@ $lang['admin_menu_edit_gcb'] =           'Global content blocks';
 $lang['admin_menu_edit_comments'] =      'Comments';
 $lang['admin_menu_filemanager'] =        'Filemanager';
 $lang['admin_menu_spam_protection'] =    'Spam protection';
+$lang['admin_menu_ganalytics'] =         'Google Analytics';
 $lang['admin_menu_user_administr'] =     'User administration';
 $lang['admin_menu_clear_cache'] =        'clear cache';
 $lang['admin_menu_edit_userdata'] =      'Edit user data';
@@ -458,6 +459,26 @@ $lang['spam_protection_saved'] =         'Saved';
 $lang['error_own_ip_banned'] =           'You banned your own IP!';
 $lang['error_own_user_agent_banned'] =   'You banned your own User Agent!';
 
+# reCAPTCHA
+$lang['recaptcha'] =                     'reCAPTCHA';
+$lang['recaptcha_desc'] =                'reCAPTCHA bot protection';
+$lang['recaptcha_login_check'] =         'enable for users login';
+$lang['recaptcha_entry_check'] =         'enable for comments';
+$lang['recaptcha_mail_check'] =          'enable for formmailer';
+$lang['recaptcha_public_key'] =          'Site Key';
+$lang['recaptcha_secret_key'] =          'Secret Key';
+$lang['error_recaptcha_keys'] =          'You forgot to setup your reCAPTCHA keys!';
+$lang['wrong_captcha'] =                 'You entered a wrong captcha, try again!';
+
+# Google Analytics
+$lang['google_analytics'] =              'Google Analytics';
+$lang['google_analytics_desc'] =         'Google Analytics is a service offered by Google to help web-masters knowing who is visiting their site.';
+$lang['google_analytics_id'] =           'Tracking ID:';
+$lang['google_analytics_check'] =        'enable Google Analytics <small><em>(in every page except in administration\'s ones)</em></small>';
+$lang['google_analytics_submit'] =       'OK - Control them all';
+$lang['google_analytics_saved'] =        'Data saved successfully, 1984 is now.';
+$lang['error_google_analytics_id'] =     'You can\'t enable Google Analytics without entering your personal tracking id!';
+
 # insert_image
 $lang['insert_image'] =                  'Insert image';
 $lang['select_image_title'] =            'Insert image';

cms/lang/english.page.lang.php

@@ -143,4 +143,7 @@ $lang['search_no_results'] =             'No pages found';
 $lang['akismet_error_api_key'] =         'Invalid akismet api key';
 $lang['akismet_error_connection'] =      'Server connection error - please try again later';
 $lang['akismet_spam_suspicion'] =        'Spam suspicion!';
+
+// reCAPTCHA:
+$lang['wrong_captcha'] =				 'You entered a wrong captcha, please try again!';
 ?>

cms/lang/german.admin.lang.php

@@ -40,6 +40,7 @@ $lang['admin_menu_edit_gcb'] =           'Globale Inhaltsblöcke';
 $lang['admin_menu_edit_comments'] =      'Kommentare';
 $lang['admin_menu_filemanager'] =        'Dateimanager';
 $lang['admin_menu_spam_protection'] =    'Spamschutz';
+$lang['admin_menu_ganalytics'] =         'Google Analytics';
 $lang['admin_menu_user_administr'] =     'Benutzerverwaltung';
 $lang['admin_menu_clear_cache'] =        'Chache löschen';
 $lang['admin_menu_edit_userdata'] =      'Benitzerdaten bearbeiten';
@@ -458,6 +459,26 @@ $lang['spam_protection_saved'] =         'Gespeichert';
 $lang['error_own_ip_banned'] =           'Sie haben Ihre eigene IP gebannt!';
 $lang['error_own_user_agent_banned'] =   'Sie haben Ihren eigenen User-Agent gebannt!';
 
+# reCAPTCHA
+$lang['recaptcha'] =                     'reCAPTCHA';
+$lang['recaptcha_desc'] =                'reCAPTCHA bot protection';
+$lang['recaptcha_login_check'] =         'enable for users login';
+$lang['recaptcha_entry_check'] =         'enable for comments';
+$lang['recaptcha_mail_check'] =          'enable for formmailer';
+$lang['recaptcha_public_key'] =          'Site Key';
+$lang['recaptcha_secret_key'] =          'Secret Key';
+$lang['error_recaptcha_keys'] =          'You forgot to setup your reCAPTCHA keys!';
+$lang['wrong_captcha'] =                 'You entered a wrong captcha, try again!';
+
+# Google Analytics
+$lang['google_analytics'] =              'Google Analytics';
+$lang['google_analytics_desc'] =         'Google Analytics is a service offered by Google to help web-masters knowing who is visiting their site.';
+$lang['google_analytics_id'] =           'Tracking ID:';
+$lang['google_analytics_check'] =        'enable Google Analytics <small><em>(in every page except in administration\'s ones)</em></small>';
+$lang['google_analytics_submit'] =       'OK - Control them all';
+$lang['google_analytics_saved'] =        'Data saved successfully, 1984 is now.';
+$lang['error_google_analytics_id'] =     'You can\'t enable Google Analytics without entering your personal tracking id!';
+
 # insert_image
 $lang['insert_image'] =                  'Bild einfügen';
 $lang['select_image_title'] =            'Bild einfügen';

cms/lang/german.page.lang.php

@@ -146,4 +146,7 @@ $lang['search_no_results'] =             'Keine Seiten gefunden';
 $lang['akismet_error_api_key'] =         'Ungültiger Akismet-API-Key';
 $lang['akismet_error_connection'] =      'Fehler bei der Serververbindung - bitte versuchen Sie es später noch einmal';
 $lang['akismet_spam_suspicion'] =        'Spam-Verdacht!';
+
+// reCAPTCHA:
+$lang['wrong_captcha'] =				 'You entered a wrong captcha, please try again!';
 ?>

cms/lang/polish.admin.lang.php

@@ -45,6 +45,7 @@ $lang['admin_menu_edit_gcb'] =           'Bloki globalne';
 $lang['admin_menu_edit_comments'] =      'Komentarze';
 $lang['admin_menu_filemanager'] =        'Menadżer plików';
 $lang['admin_menu_spam_protection'] =    'Ochrona przed spamem';
+$lang['admin_menu_ganalytics'] =         'Google Analytics';
 $lang['admin_menu_user_administr'] =     'Zarządzanie użytkownikami';
 $lang['admin_menu_clear_cache'] =        'wyczysć cache';
 $lang['admin_menu_edit_userdata'] =      'Edytuj dane użytkownika';
@@ -463,6 +464,26 @@ $lang['spam_protection_saved'] =         'Zapisane';
 $lang['error_own_ip_banned'] =           'Zabanowałeś swój IP!';
 $lang['error_own_user_agent_banned'] =   'Zabanowałeś swojego User Agenta!';
 
+# reCAPTCHA
+$lang['recaptcha'] =                     'reCAPTCHA';
+$lang['recaptcha_desc'] =                'reCAPTCHA bot protection';
+$lang['recaptcha_login_check'] =         'enable for users login';
+$lang['recaptcha_entry_check'] =         'enable for comments';
+$lang['recaptcha_mail_check'] =          'enable for formmailer';
+$lang['recaptcha_public_key'] =          'Site Key';
+$lang['recaptcha_secret_key'] =          'Secret Key';
+$lang['error_recaptcha_keys'] =          'You forgot to setup your reCAPTCHA keys!';
+$lang['wrong_captcha'] =                 'You entered a wrong captcha, try again!';
+
+# Google Analytics
+$lang['google_analytics'] =              'Google Analytics';
+$lang['google_analytics_desc'] =         'Google Analytics is a service offered by Google to help web-masters knowing who is visiting their site.';
+$lang['google_analytics_id'] =           'Tracking ID:';
+$lang['google_analytics_check'] =        'enable Google Analytics <small><em>(in every page except in administration\'s ones)</em></small>';
+$lang['google_analytics_submit'] =       'OK - Control them all';
+$lang['google_analytics_saved'] =        'Data saved successfully, 1984 is now.';
+$lang['error_google_analytics_id'] =     'You can\'t enable Google Analytics without entering your personal tracking id!';
+
 # insert_image
 $lang['insert_image'] =                  'Wstaw obrazek';
 $lang['select_image_title'] =            'Wstaw obrazek';

cms/lang/polish.page.lang.php

@@ -152,4 +152,7 @@ $lang['search_no_results'] =             'Nie znaleziono stron';
 $lang['akismet_error_api_key'] =         'Błędny klucz api akismet (api key)';
 $lang['akismet_error_connection'] =      'Błąd połączenia z serwerem akismet - proszę spróbować później';
 $lang['akismet_spam_suspicion'] =        'Podejrzenie spamu!';
+
+// reCAPTCHA:
+$lang['wrong_captcha'] =				 'You entered a wrong captcha, please try again!';
 ?>

cms/lang/russian.admin.lang.php

@@ -44,6 +44,7 @@ $lang['admin_menu_edit_gcb'] =           'Блоки';
 $lang['admin_menu_edit_comments'] =      'Комментарии';
 $lang['admin_menu_filemanager'] =        'Файлы';
 $lang['admin_menu_spam_protection'] =    'Анти-Спам';
+$lang['admin_menu_ganalytics'] =         'Google Analytics';
 $lang['admin_menu_user_administr'] =     'Пользователи';
 $lang['admin_menu_clear_cache'] =        'Очистить кэш';
 $lang['admin_menu_edit_userdata'] =      'Изменить данные юзера';
@@ -462,6 +463,26 @@ $lang['spam_protection_saved'] =         'Настройки Анти-Спам
 $lang['error_own_ip_banned'] =           'Вы пытаетесь заблокировать свой собственный IP!';
 $lang['error_own_user_agent_banned'] =   'Вы пытаетесь заблокировать свой собственный браузер (User Agent)!';
 
+# reCAPTCHA
+$lang['recaptcha'] =                     'reCAPTCHA';
+$lang['recaptcha_desc'] =                'reCAPTCHA bot protection';
+$lang['recaptcha_login_check'] =         'enable for users login';
+$lang['recaptcha_entry_check'] =         'enable for comments';
+$lang['recaptcha_mail_check'] =          'enable for formmailer';
+$lang['recaptcha_public_key'] =          'Site Key';
+$lang['recaptcha_secret_key'] =          'Secret Key';
+$lang['error_recaptcha_keys'] =          'You forgot to setup your reCAPTCHA keys!';
+$lang['wrong_captcha'] =                 'You entered a wrong captcha, try again!';
+
+# Google Analytics
+$lang['google_analytics'] =              'Google Analytics';
+$lang['google_analytics_desc'] =         'Google Analytics is a service offered by Google to help web-masters knowing who is visiting their site.';
+$lang['google_analytics_id'] =           'Tracking ID:';
+$lang['google_analytics_check'] =        'enable Google Analytics <small><em>(in every page except in administration\'s ones)</em></small>';
+$lang['google_analytics_submit'] =       'OK - Control them all';
+$lang['google_analytics_saved'] =        'Data saved successfully, 1984 is now.';
+$lang['error_google_analytics_id'] =     'You can\'t enable Google Analytics without entering your personal tracking id!';
+
 # insert_image
 $lang['insert_image'] =                  'Вставить изображение';
 $lang['select_image_title'] =            'Вставить изображение';

cms/lang/russian.page.lang.php

@@ -147,3 +147,5 @@ $lang['akismet_error_api_key'] =         'Недопустимый ключ akis
 $lang['akismet_error_connection'] =      'Ошибка подключения к серверу akismet - попробуйте повторить позже';
 $lang['akismet_spam_suspicion'] =        'Похоже на спам!';
 
+// reCAPTCHA:
+$lang['wrong_captcha'] =				 'You entered a wrong captcha, please try again!';

cms/lang/spanish.admin.lang.php

@@ -42,6 +42,7 @@ $lang['admin_menu_edit_gcb'] =           'Bloques de contenido global';
 $lang['admin_menu_edit_comments'] =      'Comentarios';
 $lang['admin_menu_filemanager'] =        'Gestor de archivos';
 $lang['admin_menu_spam_protection'] =    'Protección contra el spam';
+$lang['admin_menu_ganalytics'] =         'Google Analytics';
 $lang['admin_menu_user_administr'] =     'Administración de usuarios';
 $lang['admin_menu_clear_cache'] =        'Borrar la caché';
 $lang['admin_menu_edit_userdata'] =      'Editar datos de usuario';
@@ -461,6 +462,26 @@ $lang['spam_protection_saved'] =         'Configuración guardada';
 $lang['error_own_ip_banned'] =           '¡Ha bloqueado su propia dirección IP!';
 $lang['error_own_user_agent_banned'] =   '¡Ha bloqueado su propio navegador!';
 
+# reCAPTCHA
+$lang['recaptcha'] =                     'reCAPTCHA';
+$lang['recaptcha_desc'] =                'reCAPTCHA bot protection';
+$lang['recaptcha_login_check'] =         'enable for users login';
+$lang['recaptcha_entry_check'] =         'enable for comments';
+$lang['recaptcha_mail_check'] =          'enable for formmailer';
+$lang['recaptcha_public_key'] =          'Site Key';
+$lang['recaptcha_secret_key'] =          'Secret Key';
+$lang['error_recaptcha_keys'] =          'You forgot to setup your reCAPTCHA keys!';
+$lang['wrong_captcha'] =                 'You entered a wrong captcha, try again!';
+
+# Google Analytics
+$lang['google_analytics'] =              'Google Analytics';
+$lang['google_analytics_desc'] =         'Google Analytics is a service offered by Google to help web-masters knowing who is visiting their site.';
+$lang['google_analytics_id'] =           'Tracking ID:';
+$lang['google_analytics_check'] =        'enable Google Analytics <small><em>(in every page except in administration\'s ones)</em></small>';
+$lang['google_analytics_submit'] =       'OK - Control them all';
+$lang['google_analytics_saved'] =        'Data saved successfully, 1984 is now.';
+$lang['error_google_analytics_id'] =     'You can\'t enable Google Analytics without entering your personal tracking id!';
+
 # insert_image
 $lang['insert_image'] =                  'Insertar una imagen';
 $lang['select_image_title'] =            'Insertar una imagen';

cms/lang/spanish.page.lang.php

@@ -143,4 +143,7 @@ $lang['search_no_results'] =             'No se ha encontrado ninguna página';
 $lang['akismet_error_api_key'] =         'La clave del API Akismet es incorrecta';
 $lang['akismet_error_connection'] =      'Error de conexión al servidor - por favor, inténtelo de nuevo más tarde';
 $lang['akismet_spam_suspicion'] =        '¡Sospecha de Spam!';
+
+// reCAPTCHA:
+$lang['wrong_captcha'] =				 'You entered a wrong captcha, please try again!';
 ?>

cms/lang/ukrainian.admin.lang.php

@@ -42,6 +42,7 @@ $lang['admin_menu_edit_gcb'] =           'Блоки';
 $lang['admin_menu_edit_comments'] =      'Комментарі';
 $lang['admin_menu_filemanager'] =        'Файли';
 $lang['admin_menu_spam_protection'] =    'Анти-Спам';
+$lang['admin_menu_ganalytics'] =         'Google Analytics';
 $lang['admin_menu_user_administr'] =     'Користувачі';
 $lang['admin_menu_clear_cache'] =        'Очистити кеш';
 $lang['admin_menu_edit_userdata'] =      'Змінити данні користувача';
@@ -460,6 +461,26 @@ $lang['spam_protection_saved'] =         'Налаштування Анти-Сп
 $lang['error_own_ip_banned'] =           'Ви намагаєтесь заблокувати власний IP!';
 $lang['error_own_user_agent_banned'] =   'Ви намагаєтесь заблокувати власний браузер (User Agent)!';
 
+# reCAPTCHA
+$lang['recaptcha'] =                     'reCAPTCHA';
+$lang['recaptcha_desc'] =                'reCAPTCHA bot protection';
+$lang['recaptcha_login_check'] =         'enable for users login';
+$lang['recaptcha_entry_check'] =         'enable for comments';
+$lang['recaptcha_mail_check'] =          'enable for formmailer';
+$lang['recaptcha_public_key'] =          'Site Key';
+$lang['recaptcha_secret_key'] =          'Secret Key';
+$lang['error_recaptcha_keys'] =          'You forgot to setup your reCAPTCHA keys!';
+$lang['wrong_captcha'] =                 'You entered a wrong captcha, try again!';
+
+# Google Analytics
+$lang['google_analytics'] =              'Google Analytics';
+$lang['google_analytics_desc'] =         'Google Analytics is a service offered by Google to help web-masters knowing who is visiting their site.';
+$lang['google_analytics_id'] =           'Tracking ID:';
+$lang['google_analytics_check'] =        'enable Google Analytics <small><em>(in every page except in administration\'s ones)</em></small>';
+$lang['google_analytics_submit'] =       'OK - Control them all';
+$lang['google_analytics_saved'] =        'Data saved successfully, 1984 is now.';
+$lang['error_google_analytics_id'] =     'You can\'t enable Google Analytics without entering your personal tracking id!';
+
 # insert_image
 $lang['insert_image'] =                  'Додати зображення';
 $lang['select_image_title'] =            'Додати зображення';

cms/lang/ukrainian.page.lang.php

@@ -145,3 +145,5 @@ $lang['akismet_error_api_key'] =         'Неприпустимий ключ ak
 $lang['akismet_error_connection'] =      'Помилка підключення до серверу akismet - спопробуйте пізніше';
 $lang['akismet_spam_suspicion'] =        'Схоже на спам!';
 
+// reCAPTCHA:
+$lang['wrong_captcha'] =				 'You entered a wrong captcha, please try again!';

cms/templates/admin/main.tpl

@@ -5,10 +5,6 @@
     <title><?php echo $settings['website_title']; ?> - <?php echo $lang['administration'];
         if (isset($subtitle)) echo ' - ' . $subtitle; ?></title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-    <link href="<?php echo BOOTSTRAP_CSS; ?>" rel="stylesheet">
-    <link href="<?php echo STATIC_URL; ?>css/style_admin.css" rel="stylesheet">
-
     <link rel="shortcut icon" href="<?php echo STATIC_URL; ?>img/favicon.png">
 </head>
 
@@ -46,16 +42,21 @@
 
 </div>
 
-<script src="<?php echo JQUERY; ?>"></script>
-<script src="<?php echo JQUERY_UI; ?>"></script>
-<script src="<?php echo BOOTSTRAP; ?>"></script>
+<script async src="<?php echo JQUERY; ?>"></script>
+<script async src="<?php echo JQUERY_UI; ?>"></script>
+<script async src="<?php echo BOOTSTRAP; ?>"></script>
 <?php if (isset($wysiwyg)): ?>
-    <script src="<?php echo WYSIWYG_EDITOR; ?>"></script>
-    <script src="<?php echo WYSIWYG_EDITOR_INIT; ?>"></script>
+<script async src="<?php echo WYSIWYG_EDITOR; ?>"></script>
+<script async src="<?php echo WYSIWYG_EDITOR_INIT; ?>"></script>
 <?php endif; ?>
-<script src="<?php echo STATIC_URL; ?>js/admin_backend.js"></script>
+<script async src="<?php echo STATIC_URL; ?>js/admin_backend.js"></script>
 <?php if ($mode == 'galleries'): ?>
-    <script src="<?php echo STATIC_URL; ?>js/mylightbox.js" type="text/javascript"></script>
+<script async src="<?php echo STATIC_URL; ?>js/mylightbox.js" type="text/javascript"></script>
+<?php endif; ?>
+<?php if ($settings['recaptcha_login_check']): ?>
+<script async src='<?php echo RECAPTCHA_SCRIPT; ?>'></script>
 <?php endif; ?>
+<link href="<?php echo BOOTSTRAP_CSS; ?>" rel="stylesheet">
+<link href="<?php echo STATIC_URL; ?>css/style_admin.css" rel="stylesheet">
 </body>
 </html>

cms/templates/admin/subtemplates/admin_index.inc.tpl

@@ -33,6 +33,11 @@
         <li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=spam_protection"><span
                 class="glyphicon glyphicon-ban-circle"></span> <?php echo $lang['admin_menu_spam_protection']; ?></a>
         </li><?php endif; ?>
+    <?php if ($user_type == 1): ?>
+    <li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=google_analytics"><span
+            class="glyphicon glyphicon-stats"></span> <?php echo $lang['admin_menu_ganalytics']; ?></a>
+    </li>
+    <?php endif; ?>
     <li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=users"><span
                 class="glyphicon glyphicon-user"></span> <?php if ($user_type == 1) echo $lang['admin_menu_user_administr']; else echo $lang['admin_menu_edit_userdata']; ?>
         </a></li>

cms/templates/admin/subtemplates/admin_menu.inc.tpl

@@ -50,6 +50,11 @@
                                 <li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=spam_protection"><span
                                         class="glyphicon glyphicon-ban-circle"></span> <?php echo $lang['admin_menu_spam_protection']; ?>
                                 </a></li><?php endif; ?>
+                        <?php if ($user_type == 1): ?>
+                            <li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=google_analytics"><span
+                                    class="glyphicon glyphicon-stats"></span> <?php echo $lang['admin_menu_ganalytics']; ?>
+                                </a></li>
+                            <?php endif; ?>
                             <li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=users"><span
                                         class="glyphicon glyphicon-user"></span> <?php if ($user_type == 1) echo $lang['admin_menu_user_administr']; else echo $lang['admin_menu_edit_userdata']; ?>
                                 </a></li>

cms/templates/admin/subtemplates/google_analytics.inc.tpl

@@ -0,0 +1,35 @@
+<h1><?php echo $lang['google_analytics']; ?></h1>
+
+<?php include('errors.inc.tpl'); ?>
+
+<?php if (isset($saved)): ?>
+<div class="alert alert-success">
+    <button type="button" class="close" data-dismiss="alert">&times;</button>
+    <span class="glyphicon glyphicon-ok"></span> <?php echo $lang['google_analytics_saved']; ?>
+</div>
+<?php endif; ?>
+
+<form action="index.php" method="post" class="form-horizontal">
+    <div>
+        <input type="hidden" name="mode" value="google_analytics"/>
+        <input type="hidden" name="google_analytics_submit" value="true"/>
+
+        <div class="form-group">
+            <span class="help-block"><?php echo $lang['google_analytics_desc']; ?></span>
+            <input type="text" class="form-control" id="google_analytics_id" name="google_analytics_id"
+                   placeholder="<?php echo $lang['google_analytics_id']; ?>"
+                   value="<?php echo htmlspecialchars($google_analytics_id); ?>">
+        </div>
+
+        <div class="form-group">
+            <div class="checkbox">
+                <label>
+                    <input id="google_analytics_check" type="checkbox"
+                           name="google_analytics_check"<?php if (isset($google_analytics_check) && $google_analytics_check == 1): ?> checked<?php endif; ?>> <?php echo $lang['google_analytics_check']; ?>
+                </label><br/>
+            </div>
+        </div>
+
+    <button class="btn btn-primary" type="submit"><?php echo $lang['google_analytics_submit']; ?></button>
+</div>
+</form>

cms/templates/admin/subtemplates/login.inc.tpl

@@ -1,8 +1,8 @@
 <h1><?php echo $lang['login']; ?></h1>
 
-<?php if (isset($_GET['msg'])): ?>
+<?php if (isset($_GET['msg']) && ($_GET['msg']=='login_failed' || $_GET['msg']=='wrong_captcha')): ?>
     <div class="alert alert-danger">
-        <strong><?php echo $lang['login_failed']; ?></strong>
+        <strong><?php echo $lang[$_GET['msg']]; ?></strong>
     </div>
 <?php endif; ?>
 
@@ -17,7 +17,13 @@
             <label for="pw"><?php echo $lang['login_password']; ?></label>
             <input id="pw" type="password" name="userpw" class="form-control"/>
         </div>
-
+        
+        <?php if($settings['recaptcha_login_check']): ?>
+        <div class="form-group login-form">
+            <div class="g-recaptcha" data-sitekey="<?php echo htmlspecialchars($settings['recaptcha_public_key']); ?>"></div>
+        </div>
+        <?php endif; ?>
+        
         <input type="submit" class="btn btn-lg btn-primary" value="<?php echo $lang['login_submit']; ?>"/>
 
     </fieldset>

cms/templates/admin/subtemplates/spam_protection.inc.tpl

@@ -52,6 +52,36 @@
                        name="akismet_mail_check"<?php if (isset($akismet_mail_check) && $akismet_mail_check == 1): ?> checked<?php endif; ?>> <?php echo $lang['akismet_mail_check']; ?>
             </label>
         </div>
+        <div class="form-group">
+            <label for="recaptcha"><?php echo $lang['recaptcha']; ?></label>
+            <span class="help-block"><?php echo $lang['recaptcha_desc']; ?></span>
+        </div>
+        <div class="form-group">
+            <input type="text" class="form-control" id="recaptcha_public_key" name="recaptcha_public_key"
+                    placeholder="<?php echo $lang['recaptcha_public_key']; ?>"
+                    value="<?php echo htmlspecialchars($recaptcha_public_key); ?>">
+        </div>
+        <div class="form-group">
+            <input type="text" class="form-control" id="recaptcha_secret_key" name="recaptcha_secret_key"
+                   placeholder="<?php echo $lang['recaptcha_secret_key']; ?>"
+                   value="<?php echo htmlspecialchars($recaptcha_secret_key); ?>">
+        </div>
+        <div class="form-group">
+            <div class="checkbox">
+                <label>
+                    <input id="recaptcha_login_check" type="checkbox"
+                           name="recaptcha_login_check"<?php if (isset($recaptcha_login_check) && $recaptcha_login_check == 1): ?> checked<?php endif; ?>> <?php echo $lang['recaptcha_login_check']; ?>
+                </label><br/>
+                <label>
+                    <input id="recaptcha_entry_check" type="checkbox"
+                           name="recaptcha_entry_check"<?php if (isset($recaptcha_entry_check) && $recaptcha_entry_check == 1): ?> checked<?php endif; ?>> <?php echo $lang['recaptcha_entry_check']; ?>
+                </label><br/>
+                <label>
+                    <input id="recaptcha_mail_check" type="checkbox"
+                           name="recaptcha_mail_check"<?php if (isset($recaptcha_mail_check) && $recaptcha_mail_check == 1): ?> checked<?php endif; ?>> <?php echo $lang['recaptcha_mail_check']; ?>
+                </label>
+            </div>
+        </div>
 
         <button class="btn btn-primary" type="submit"><?php echo $lang['spam_protection_submit']; ?></button>
 

cms/templates/default.tpl

@@ -7,9 +7,6 @@
     <meta name="description" content="<?php if ($description) echo $description; else echo $settings['default_description']; ?>">
     <meta name="keywords" content="<?php if ($keywords) echo $keywords; else echo $settings['default_keywords']; ?>">
     <meta name="generator" content="phpSQLiteCMS <?php echo $settings['version']; ?>">
-    <link href="<?php echo BOOTSTRAP_CSS; ?>" rel="stylesheet">
-    <link href='http://fonts.googleapis.com/css?family=Patua+One' rel='stylesheet' type='text/css'>
-    <link href="<?php echo STATIC_URL; ?>css/style.css" rel="stylesheet">
     <link rel="shortcut icon" href="<?php echo STATIC_URL; ?>img/favicon.png">
 </head>
 
@@ -102,15 +99,33 @@
 
 </div>
 
-<script src="<?php echo JQUERY; ?>"></script>
-<script src="<?php echo BOOTSTRAP; ?>"></script>
-<script src="<?php echo STATIC_URL; ?>js/main.js"></script>
+<script async src="<?php echo JQUERY; ?>"></script>
+<script async src="<?php echo BOOTSTRAP; ?>"></script>
+<script async src="<?php echo STATIC_URL; ?>js/main.js"></script>
 <?php if ($admin): ?>
-    <script src="<?php echo STATIC_URL; ?>js/admin_frontend.js"></script>
+<script async src="<?php echo STATIC_URL; ?>js/admin_frontend.js"></script>
 <?php endif; ?>
 <?php if (isset($contains_thumbnails)): ?>
-    <script src="<?php echo STATIC_URL; ?>js/mylightbox.js" type="text/javascript"></script>
+<script async src="<?php echo STATIC_URL; ?>js/mylightbox.js" type="text/javascript"></script>
 <?php endif; ?>
+<?php if ($settings['recaptcha_entry_check'] || $settings['recaptcha_mail_check']): ?>
+<script async src='<?php echo RECAPTCHA_SCRIPT; ?>'></script>
+<?php endif; ?>
+<?php if ($settings['google_analytics_check']): ?>
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+  ga('create', '<?php echo htmlspecialchars($settings['google_analytics_id']);?>', 'auto');
+  ga('send', 'pageview');
+
+</script>
+<?php endif; ?>
+<link href="<?php echo BOOTSTRAP_CSS; ?>" rel="stylesheet">
+<link href="<?php echo STATIC_URL; ?>css/style.css" rel="stylesheet">
+<link href='//fonts.googleapis.com/css?family=Patua+One' rel='stylesheet' type='text/css'>
 </body>
 </html>
 

cms/templates/subtemplates/comments.inc.tpl

@@ -176,6 +176,12 @@
                                            value="<?php echo $form_values['email_hp']; ?>"
                                            placeholder="<?php echo $lang['comment_input_email_hp']; ?>"/>
                                 </div>
+                                
+                                <?php if($settings['recaptcha_entry_check'] && $form_session && !$admin): ?>
+                                <div class="form-group login-form">
+                                    <div class="g-recaptcha" data-sitekey="<?php echo htmlspecialchars($settings['recaptcha_public_key']); ?>"></div>
+                                </div>
+                                <?php endif; ?>
 
                                 <div class="form-group">
                                     <input type="submit" class="btn btn-primary" name="save"

cms/templates/subtemplates/formmailer.inc.tpl

@@ -36,7 +36,13 @@
                 <textarea id="message" class="form-control" name="message"
                           rows="12"><?php if (isset($message)) echo $message; ?></textarea>
             </div>
-
+            
+            <?php if($settings['recaptcha_mail_check'] && !isset($_SESSION[$settings['session_prefix'].'user_id'])): ?>
+            <div class="form-group">
+                <div class="g-recaptcha" data-sitekey="<?php echo htmlspecialchars($settings['recaptcha_public_key']); ?>"></div>
+            </div>
+            <?php endif; ?>
+            
             <p>
                 <button class="btn btn-primary btn-lg" type="submit"><span
                         class="glyphicon glyphicon-envelope"></span> <?php echo $lang['formmailer_button_send']; ?>