merge with ATS

BurgeSystems · Dec 18, 2016 · d285122 · d285122
1 parent bbbb520
commit d285122
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 10 deletions.
diff --git a/ATS/CMF/Web/.htaccess b/ATS/CMF/Web/.htaccess
@@ -1,4 +1,25 @@
+ExpiresActive On
+ExpiresByType image/gif "access plus 1 months"
+ExpiresByType image/jpg "access plus 1 months"
+ExpiresByType image/jpeg "access plus 1 months"
+ExpiresByType image/png "access plus 1 months"
+ExpiresByType image/x-icon "access plus 1 months"
+ExpiresByType image/ico "access plus 1 months"
+ExpiresByType application/javascript "now plus 1 months"
+ExpiresByType application/x-javascript "now plus 1 months"
+ExpiresByType text/javascript "now plus 1 months"
+ExpiresByType text/css "now plus 1 months"
+ExpiresByType audio/mpeg "access plus 1 months"
+ExpiresByType audio/wav "access plus 1 months"
+ExpiresByType audio/wave "access plus 1 months"
+ExpiresByType audio/x-wav "access plus 1 months"
+ExpiresByType audio/x-pn-wav "access plus 1 months"
+ExpiresByType video/mp4 "access plus 1 months"
+
+#ExpiresDefault "access plus 1 days"
+
 Options -Indexes 
+
 RewriteEngine on
 RewriteCond $1 !^(index\.php|images|scripts|styles|upload|robots\.txt)
 RewriteRule ^(.*)$ index.php/$1 [L]
diff --git a/ATS/CMF/Web/application/controllers/AE_Contact_Us.php b/ATS/CMF/Web/application/controllers/AE_Contact_Us.php
@@ -183,7 +183,7 @@ public function send_new()
  {
  $receivers=$this->input->post("receivers");
  $subject=$this->input->post("subject");
- $content=$this->input->post("content");
+ $content=nl2br($this->input->post("content"));
  $lang=$this->input->post("language");
 
  if($receivers && $subject && $content)

diff --git a/ATS/CMF/Web/application/models/login/Facebook_login_model.php b/ATS/CMF/Web/application/models/login/Facebook_login_model.php
@@ -1,8 +1,8 @@
 <?php
 class Facebook_login_model extends CI_Model
 {
- var $client_id = '103221530032359';
- var $client_secret = 'f77f15e07e76f81d08ba3ec2384358e8';
+ var $client_id = '';
+ var $client_secret = '';
  var $redirect_uri;
 
  public function __construct()

diff --git a/ATS/CMF/Web/application/models/login/Google_login_model.php b/ATS/CMF/Web/application/models/login/Google_login_model.php
@@ -11,7 +11,7 @@ public function __construct()
 
  require_once "google/autoload.php";
 
- $this->redirect_uri = get_link("google_login_page");
+ $this->redirect_uri = get_link("customer_login_google");
  }
 
 

diff --git a/ATS/CMF/Web/application/views/en/admin/category_details.php b/ATS/CMF/Web/application/views/en/admin/category_details.php
@@ -374,10 +374,10 @@ function addSubCategory()
  +"Verdana=verdana,geneva;"
  +"Webdings=webdings;"
  +"Wingdings=wingdings,zapf dingbats";
- var tinyMCEPlugins="directionality textcolor link image hr emoticons2 lineheight colorpicker media";
+ var tinyMCEPlugins="directionality textcolor link image hr emoticons2 lineheight colorpicker media table";
  var tinyMCEToolbar=[
  "link image media hr bold italic underline strikethrough alignleft aligncenter alignright alignjustify styleselect formatselect fontselect fontsizeselect emoticons2",
- "cut copy paste bullist numlist outdent indent forecolor backcolor removeformat ltr rtl lineheightselect "
+ "cut copy paste bullist numlist outdent indent forecolor backcolor removeformat ltr rtl lineheightselect table"
  ];
 
 

diff --git a/ATS/CMF/Web/application/views/en/admin/post_details.php b/ATS/CMF/Web/application/views/en/admin/post_details.php
@@ -481,10 +481,10 @@ function deleteImage(lang)
  +"Verdana=verdana,geneva;"
  +"Webdings=webdings;"
  +"Wingdings=wingdings,zapf dingbats";
- var tinyMCEPlugins="directionality textcolor link image hr emoticons2 lineheight colorpicker media";
+ var tinyMCEPlugins="directionality textcolor link image hr emoticons2 lineheight colorpicker media table";
  var tinyMCEToolbar=[
  "link image media hr bold italic underline strikethrough alignleft aligncenter alignright alignjustify styleselect formatselect fontselect fontsizeselect emoticons2",
- "cut copy paste bullist numlist outdent indent forecolor backcolor removeformat ltr rtl lineheightselect "
+ "cut copy paste bullist numlist outdent indent forecolor backcolor removeformat ltr rtl lineheightselect table"
  ];
 
  function formSubmit()

diff --git a/ATS/CMF/Web/application/views/en/customer/class_post_edit.php b/ATS/CMF/Web/application/views/en/customer/class_post_edit.php
@@ -312,10 +312,10 @@ function addGalleryRow(lang,el)
  +"Verdana=verdana,geneva;"
  +"Webdings=webdings;"
  +"Wingdings=wingdings,zapf dingbats";
- var tinyMCEPlugins="directionality textcolor link image hr emoticons2 lineheight colorpicker media code";
+ var tinyMCEPlugins="directionality textcolor link image hr emoticons2 lineheight colorpicker media code table";
  var tinyMCEToolbar=[
  "link image media hr bold italic underline strikethrough alignleft aligncenter alignright alignjustify styleselect formatselect fontselect fontsizeselect emoticons2",
- "cut copy paste bullist numlist outdent indent forecolor backcolor removeformat ltr rtl lineheightselect code "
+ "cut copy paste bullist numlist outdent indent forecolor backcolor removeformat ltr rtl lineheightselect code table"
  ];
 
  function formSubmit()