Merge pull request #4375 from MrPetovan/task/3878-move-friendica_smarty-to-src

 Move include/friendica_smarty to src/

diff --git a/include/friendica_smarty.php b/include/friendica_smarty.php
deleted file mode 100644 (file)
index a7d153e..0000000
--- a/include/friendica_smarty.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-use Friendica\Core\Addon;
-use Friendica\Render\ITemplateEngine;
-
-define('SMARTY3_TEMPLATE_FOLDER', 'templates');
-
-class FriendicaSmarty extends Smarty
-{
-       public $filename;
-
-       function __construct()
-       {
-               parent::__construct();
-
-               $a = get_app();
-               $theme = current_theme();
-
-               // setTemplateDir can be set to an array, which Smarty will parse in order.
-               // The order is thus very important here
-               $template_dirs = ['theme' => "view/theme/$theme/" . SMARTY3_TEMPLATE_FOLDER . "/"];
-               if (x($a->theme_info, "extends"))
-                       $template_dirs = $template_dirs + ['extends' => "view/theme/" . $a->theme_info["extends"] . "/" . SMARTY3_TEMPLATE_FOLDER . "/"];
-               $template_dirs = $template_dirs + ['base' => "view/" . SMARTY3_TEMPLATE_FOLDER . "/"];
-               $this->setTemplateDir($template_dirs);
-
-               $this->setCompileDir('view/smarty3/compiled/');
-               $this->setConfigDir('view/smarty3/config/');
-               $this->setCacheDir('view/smarty3/cache/');
-
-               $this->left_delimiter = $a->get_template_ldelim('smarty3');
-               $this->right_delimiter = $a->get_template_rdelim('smarty3');
-
-               // Don't report errors so verbosely
-               $this->error_reporting = E_ALL & ~E_NOTICE;
-       }
-
-       function parsed($template = '')
-       {
-               if ($template) {
-                       return $this->fetch('string:' . $template);
-               }
-               return $this->fetch('file:' . $this->filename);
-       }
-
-}
-
-class FriendicaSmartyEngine implements ITemplateEngine
-{
-       static $name = "smarty3";
-
-       public function __construct()
-       {
-               if (!is_writable('view/smarty3/')) {
-                       echo "<b>ERROR:</b> folder <tt>view/smarty3/</tt> must be writable by webserver.";
-                       killme();
-               }
-       }
-
-       // ITemplateEngine interface
-       public function replaceMacros($s, $r)
-       {
-               $template = '';
-               if (gettype($s) === 'string') {
-                       $template = $s;
-                       $s = new FriendicaSmarty();
-               }
-
-               $r['$APP'] = get_app();
-
-               // "middleware": inject variables into templates
-               $arr = [
-                       "template" => basename($s->filename),
-                       "vars" => $r
-               ];
-               Addon::callHooks("template_vars", $arr);
-               $r = $arr['vars'];
-
-               foreach ($r as $key => $value) {
-                       if ($key[0] === '$') {
-                               $key = substr($key, 1);
-                       }
-                       $s->assign($key, $value);
-               }
-               return $s->parsed($template);
-       }
-
-       public function getTemplateFile($file, $root = '')
-       {
-               $a = get_app();
-               $template_file = get_template_file($a, SMARTY3_TEMPLATE_FOLDER . '/' . $file, $root);
-               $template = new FriendicaSmarty();
-               $template->filename = $template_file;
-               return $template;
-       }
-}

diff --git a/include/text.php b/include/text.php
index ffa0ad0ed66c2c3f797897147637a3feb1a233cf..3244d7bb9744a52d1c5cb9ad4373eec6add5620d 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -16,7 +16,6 @@ use Friendica\Model\Profile;
 use Friendica\Model\Term;
 use Friendica\Util\Map;
 
-require_once "include/friendica_smarty.php";
 require_once "mod/proxy.php";
 require_once "include/conversation.php";
 

diff --git a/src/App.php b/src/App.php
index 7c87130b35d4e1d0197d2453f2e57bf33ca9d3f8..6eff22f5494378dc5d892b83893f4ac14cb382f5 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -288,12 +288,7 @@ class App
                $this->is_friendica_app = ($_SERVER['HTTP_USER_AGENT'] == 'Apache-HttpClient/UNAVAILABLE (java 1.4)');
 
                // Register template engines
-               $dc = get_declared_classes();
-               foreach ($dc as $k) {
-                       if (in_array('Friendica\Render\ITemplateEngine', class_implements($k))) {
-                               $this->register_template_engine($k);
-                       }
-               }
+               $this->register_template_engine('Friendica\Render\FriendicaSmartyEngine');
 
                self::$a = $this;
        }
@@ -602,7 +597,7 @@ class App
                        $this->template_engines[$name] = $class;
                } else {
                        echo "template engine <tt>$class</tt> cannot be registered without a name.\n";
-                       killme();
+                       die();
                }
        }
 

diff --git a/src/Render/FriendicaSmarty.php b/src/Render/FriendicaSmarty.php
new file mode 100644 (file)
index 0000000..b147d7e
--- /dev/null
+++ b/src/Render/FriendicaSmarty.php
@@ -0,0 +1,56 @@
+<?php\r
+/**\r
+ * @file src/Render/FriendicaSmarty.php\r
+ */\r
+namespace Friendica\Render;\r
+\r
+use Smarty;\r
+\r
+define('SMARTY3_TEMPLATE_FOLDER', 'templates');\r
+\r
+/**\r
+ * Description of FriendicaSmarty\r
+ *\r
+ * @author benlo\r
+ */\r
+class FriendicaSmarty extends Smarty\r
+{\r
+       public $filename;\r
+\r
+       function __construct()\r
+       {\r
+               parent::__construct();\r
+\r
+               $a = get_app();\r
+               $theme = current_theme();\r
+\r
+               // setTemplateDir can be set to an array, which Smarty will parse in order.\r
+               // The order is thus very important here\r
+               $template_dirs = ['theme' => "view/theme/$theme/" . SMARTY3_TEMPLATE_FOLDER . "/"];\r
+               if (x($a->theme_info, "extends")) {\r
+                       $template_dirs = $template_dirs + ['extends' => "view/theme/" . $a->theme_info["extends"] . "/" . SMARTY3_TEMPLATE_FOLDER . "/"];\r
+               }\r
+\r
+               $template_dirs = $template_dirs + ['base' => "view/" . SMARTY3_TEMPLATE_FOLDER . "/"];\r
+               $this->setTemplateDir($template_dirs);\r
+\r
+               $this->setCompileDir('view/smarty3/compiled/');\r
+               $this->setConfigDir('view/smarty3/config/');\r
+               $this->setCacheDir('view/smarty3/cache/');\r
+\r
+               $this->left_delimiter = $a->get_template_ldelim('smarty3');\r
+               $this->right_delimiter = $a->get_template_rdelim('smarty3');\r
+\r
+               // Don't report errors so verbosely\r
+               $this->error_reporting = E_ALL & ~E_NOTICE;\r
+       }\r
+\r
+       function parsed($template = '')\r
+       {\r
+               if ($template) {\r
+                       return $this->fetch('string:' . $template);\r
+               }\r
+               return $this->fetch('file:' . $this->filename);\r
+       }\r
+\r
+}
\ No newline at end of file

diff --git a/src/Render/FriendicaSmartyEngine.php b/src/Render/FriendicaSmartyEngine.php
new file mode 100644 (file)
index 0000000..2cfce76
--- /dev/null
+++ b/src/Render/FriendicaSmartyEngine.php
@@ -0,0 +1,59 @@
+<?php\r
+/**\r
+ * @file src/Render/FriendicaSmartyEngine.php\r
+ */\r
+namespace Friendica\Render;\r
+\r
+use Friendica\Core\Addon;\r
+\r
+class FriendicaSmartyEngine implements ITemplateEngine\r
+{\r
+       static $name = "smarty3";\r
+\r
+       public function __construct()\r
+       {\r
+               if (!is_writable('view/smarty3/')) {\r
+                       echo "<b>ERROR:</b> folder <tt>view/smarty3/</tt> must be writable by webserver.";\r
+                       killme();\r
+               }\r
+       }\r
+\r
+       // ITemplateEngine interface\r
+       public function replaceMacros($s, $r)\r
+       {\r
+               $template = '';\r
+               if (gettype($s) === 'string') {\r
+                       $template = $s;\r
+                       $s = new FriendicaSmarty();\r
+               }\r
+\r
+               $r['$APP'] = get_app();\r
+\r
+               // "middleware": inject variables into templates\r
+               $arr = [\r
+                       "template" => basename($s->filename),\r
+                       "vars" => $r\r
+               ];\r
+               Addon::callHooks("template_vars", $arr);\r
+               $r = $arr['vars'];\r
+\r
+               foreach ($r as $key => $value) {\r
+                       if ($key[0] === '$') {\r
+                               $key = substr($key, 1);\r
+                       }\r
+\r
+                       $s->assign($key, $value);\r
+               }\r
+               return $s->parsed($template);\r
+       }\r
+\r
+       public function getTemplateFile($file, $root = '')\r
+       {\r
+               $a = get_app();\r
+               $template_file = get_template_file($a, SMARTY3_TEMPLATE_FOLDER . '/' . $file, $root);\r
+               $template = new FriendicaSmarty();\r
+               $template->filename = $template_file;\r
+\r
+               return $template;\r
+       }\r
+}\r