Update French translations

LICENSE

@@ -1,8 +1,16 @@
-Commercial License
+MIT License
 
-Copyright (c) 2016 Matthew Smith
+Copyright (c) 2019 Matthew Smith
 
-Licensed for personal and/or commercial with a valid license purchased from respondcms.com.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

app/Http/Controllers/CodeController.php

@@ -13,7 +13,7 @@
 use App\Respond\Models\Page;
 
 // DOM parser
-use Sunra\PhpSimple\HtmlDomParser;
+use KubAT\PhpSimple\HtmlDomParser;
 
 class CodeController extends Controller
 {
@@ -389,8 +389,15 @@ public function save(Request $request)
           // save to file
           file_put_contents($path, $value);
 
+          // combine css
           Publish::combineCSS($site);
 
+           // re-publish the templates to update date/time stamp
+          Publish::publishTemplates($user, $site);
+
+          // re-publish plugins
+          Publish::publishPlugins($user, $site);
+
           // return 200
           return response('Ok', 200);
         }
@@ -410,6 +417,12 @@ public function save(Request $request)
           // combine JS to site.all.js
           Publish::combineJS($site);
 
+          // re-publish the templates to update date/time stamp
+          Publish::publishTemplates($user, $site);
+
+          // re-publish plugins
+          Publish::publishPlugins($user, $site);
+
           // return 200
           return response('Ok', 200);
         }

app/Http/Controllers/EditController.php

@@ -12,7 +12,7 @@
 use App\Respond\Models\Setting;
 
 // DOM parser
-use Sunra\PhpSimple\HtmlDomParser;
+use KubAT\PhpSimple\HtmlDomParser;
 
 class EditController extends Controller
 {
@@ -188,7 +188,7 @@ public function edit(Request $request)
 
               // set block elements
               if($blocks === NULL) {
-                $blocks = '.row';
+                $blocks = '.block';
               }
 
               // find body element
@@ -301,4 +301,4 @@ public function edit(Request $request)
 
     }
 
-}
+}

app/Http/Controllers/SiteController.php

@@ -293,7 +293,7 @@ public function reload(Request $request)
     // publish plugins
     Publish::publishPlugins($user, $site);
 
-    return response('Ok', 200);
+    return response()->json(array());
 
   }
 
@@ -327,7 +327,7 @@ public function republishTemplates(Request $request)
     // re-publish the settings
     Publish::publishSettings($user, $site);
 
-    return response('Ok', 200);
+    return response()->json(array());
 
   }
 
@@ -354,7 +354,7 @@ public function updatePlugins(Request $request)
     // re-publish plugins
     Publish::publishPlugins($user, $site);
 
-    return response('Ok', 200);
+    return response()->json(array());
 
   }
 
@@ -379,7 +379,7 @@ public function generateSitemap(Request $request)
     // publish site map
     Publish::publishSiteMap($user, $site);
 
-    return response('Ok', 200);
+    return response()->json(array());
 
   }
 
@@ -407,7 +407,7 @@ public function reindexPages(Request $request)
     // publish site map
     Publish::publishSiteMap($user, $site);
 
-    return response('Ok', 200);
+    return response()->json(array());
 
   }
 

app/Http/Controllers/ThemeController.php

@@ -63,6 +63,9 @@ public function edit(Request $request)
       // re-publish the templates
       Publish::publishTemplates($user, $site);
 
+      // re-publish plugins
+      Publish::publishPlugins($user, $site);
+
       return response('Ok', 200);
 
     }

app/Respond/Libraries/Publish.php

@@ -16,7 +16,7 @@
 use App\Respond\Models\Theme;
 
 // DOM parser
-use Sunra\PhpSimple\HtmlDomParser;
+use KubAT\PhpSimple\HtmlDomParser;
 
 // Twig Extensions
 use App\Respond\Extensions\BetterSortTwigExtension;
@@ -839,7 +839,7 @@ public static function publishPluginsForPage($page, $user, $site, $pages = null)
 
         $html = file_get_contents($location);
 
-        // setup current page
+        // setup meta info
         $meta = array(
           'url' => $page->url,
           'firstName' => $page->firstName,
@@ -849,7 +849,7 @@ public static function publishPluginsForPage($page, $user, $site, $pages = null)
         );
 
         // inject plugin HTML to the page
-        $dom = Publish::injectPluginHTML($html, $user, $site, $meta, $pages);
+        $dom = Publish::injectPluginHTML($html, $user, $site, $meta, $pages, $page);
 
         // put html back
         file_put_contents($location, $dom);
@@ -870,7 +870,7 @@ public static function publishPluginsForPage($page, $user, $site, $pages = null)
      * @param {User} $user
      * @param {Site} $site
      */
-    public static function injectPluginHTML($html, $user, $site, $meta, $pages = null) {
+    public static function injectPluginHTML($html, $user, $site, $meta, $pages = null, $page = null) {
 
       // caches the values of these variables across the request to improve performance
       static $forms = array();
@@ -924,8 +924,32 @@ public static function injectPluginHTML($html, $user, $site, $meta, $pages = nul
         'timeZone' => $site->timeZone,
       );
 
+      // If page data is provided
+      if($page) {
+
+        // setup current page
+        $current_page = array(
+          'title' => $page->title,
+          'description' => $page->description,
+          'keywords' => $page->keywords,
+          'callout' => $page->callout,
+          'url' => $page->url,
+          'photo' => $page->photo,
+          'thumb' => $page->thumb,
+          'language' => $page->language,
+          'direction' => $page->direction,
+          'firstName' => $page->firstName,
+          'lastName' => $page->lastName,
+          'lastModifiedBy' => $page->lastModifiedBy,
+          'lastModifiedDate' => $page->lastModifiedDate
+        );
+
+      } else {
+        $current_page = array();
+      }
+
       // get plugins for the site
-      $dir = app()->basePath().'/public/sites/'.$site->id.'/plugins/';
+      $dir = app()->basePath().'/public/sites/'.$site->id.'/plugins';
       $exts = array('html', 'php');
 
       if(!$files) {
@@ -985,7 +1009,7 @@ public static function injectPluginHTML($html, $user, $site, $meta, $pages = nul
             if(array_search($el->type, $plugins) !== FALSE) {
 
               // render array
-              $render_arr = array('page' => $meta,
+              $render_arr = array('page' => $current_page,
                                   'meta' => $meta,
                                   'site' => $current_site,
                                   'pages' => $pages,

app/Respond/Libraries/Utilities.php

@@ -5,6 +5,8 @@
 use \Firebase\JWT\JWT;
 
 use App\Respond\Models\Setting;
+use PHPMailer\PHPMailer\PHPMailer;
+use PHPMailer\PHPMailer\Exception;
 
 class Utilities
 {
@@ -364,7 +366,9 @@ public static function sendEmailFromFile($to, $from, $fromName, $subject, $repla
     public static function sendEmail($to, $from, $fromName, $subject, $content, $site = NULL)
     {
 
-        $mail = new \PHPMailer\PHPMailer\PHPMailer;
+        set_time_limit(30);
+
+        $mail = new PHPMailer(true);
 
         // if null, grab settings from env()
         if($site == NULL) {
@@ -470,13 +474,15 @@ public static function sendEmail($to, $from, $fromName, $subject, $content, $sit
 
         $mail->Subject = $subject;
         $mail->Body = html_entity_decode($content, ENT_COMPAT, 'UTF-8');
+        $mail->Timeout = 10;
 
-        if (!$mail->send()) {
-            return true;
+        try {
+          $mail->send();
+          return true;
+        } catch (Exception $e) {
+          return false;
         }
 
-        return false;
-
     }
 
     /**

app/Respond/Models/Component.php

@@ -9,7 +9,7 @@
 use App\Respond\Models\User;
 
 // DOM parser
-use Sunra\PhpSimple\HtmlDomParser;
+use KubAT\PhpSimple\HtmlDomParser;
 
 /**
  * Models a component

app/Respond/Models/Page.php

@@ -14,7 +14,7 @@
 use Lullabot\AMP\Validate\Scope;
 
 // DOM parser
-use Sunra\PhpSimple\HtmlDomParser;
+use KubAT\PhpSimple\HtmlDomParser;
 
 /**
  * Models a page
@@ -235,13 +235,10 @@ public static function add($data, $site, $user, $replace = NULL){
    */
   public static function edit($url, $changes, $site, $user){
 
-    // get a reference to the page object
-    $page = Page::GetByUrl($url, $site->id);
-
     // get page
     $location = app()->basePath().'/public/sites/'.$site->id.'/'.$url.'.html';
 
-    if($page != NULL && file_exists($location)) {
+    if(file_exists($location)) {
 
       // get html
       $html = file_get_contents($location);
@@ -255,6 +252,9 @@ public static function edit($url, $changes, $site, $user){
       // determine if it is a component
       if(isset($el)) {
 
+        // get a reference to the page object
+        $page = Page::GetByUrl($url, $site->id);
+
         // content placeholder
         $main_content = '';
 
@@ -289,6 +289,9 @@ public static function edit($url, $changes, $site, $user){
         // set text to main_content
         $page->text = $text;
 
+        // saves the page
+        $page->save($site, $user);
+
       }
       else {
 
@@ -303,8 +306,6 @@ public static function edit($url, $changes, $site, $user){
 
       }
 
-      // saves the page
-      $page->save($site, $user);
 
       return TRUE;
 
@@ -388,7 +389,7 @@ public function remove($user, $site){
       $json_arr = array_values($pages);
 
       // re-encode json
-      $json_text = json_encode($json_arr);
+      $json_text = json_encode($json_arr, JSON_PRETTY_PRINT);
 
       file_put_contents($json_file, $json_text);
 
@@ -449,9 +450,6 @@ public function injectTemplate($page_html, $site, $user) {
 
       }
 
-      // get font
-      $font_script = Publish::getFontScripts($site->id);
-
       // replace name and description
       $template_html = str_replace('{{page.title}}', $this->title, $template_html);
       $template_html = str_replace('{{page.description}}', $this->description, $template_html);
@@ -1091,4 +1089,4 @@ public static function refreshJSON($user, $site) {
   }
 
 
-}
+}

app/Respond/Models/Setting.php

@@ -9,7 +9,7 @@
 use App\Respond\Models\User;
 
 // DOM parser
-use Sunra\PhpSimple\HtmlDomParser;
+use KubAT\PhpSimple\HtmlDomParser;
 
 // Encrypt/Decrypt
 use Illuminate\Support\Facades\Crypt;

composer.json

@@ -11,7 +11,7 @@
     "vlucas/phpdotenv": "~2.2",
     "firebase/php-jwt": "dev-master",
     "phpmailer/phpmailer": "~6.0",
-    "sunra/php-simple-html-dom-parser": "1.5.1",
+    "kub-at/php-simple-html-dom-parser": "^1.7",
     "symfony/yaml": "3.0.3",
     "alchemy/zippy": "^0.4.9",
     "guzzlehttp/guzzle": "^6.2.3",