Commit cb4edd44 authored by Côme Bernigaud's avatar Côme Bernigaud Committed by Benoit Mortier
Browse files

Fixes: #2697 moving smarty var from variables_common.inc to variables.inc

Showing with 9 additions and 5 deletions
+9 -5
...@@ -34,6 +34,7 @@ my %vars = ( ...@@ -34,6 +34,7 @@ my %vars = (
fd_home => "/var/www/fusiondirectory", fd_home => "/var/www/fusiondirectory",
fd_cache => "/var/cache/fusiondirectory", fd_cache => "/var/cache/fusiondirectory",
fd_config_dir => "/etc/fusiondirectory", fd_config_dir => "/etc/fusiondirectory",
fd_smarty_dir => "/usr/share/php/smarty3/Smarty.class.php",
fd_spool_dir => "/var/spool/fusiondirectory", fd_spool_dir => "/var/spool/fusiondirectory",
config_file => "fusiondirectory.conf", config_file => "fusiondirectory.conf",
secrets_file => "fusiondirectory.secrets", secrets_file => "fusiondirectory.secrets",
...@@ -456,6 +457,9 @@ if (!defined("CONFIG_FILE")) { ...@@ -456,6 +457,9 @@ if (!defined("CONFIG_FILE")) {
define ("CONFIG_FILE", "$vars{config_file}"); /* FusionDirectory filename */ define ("CONFIG_FILE", "$vars{config_file}"); /* FusionDirectory filename */
} }
/* Path for smarty3 libraries */
define("SMARTY", "$vars{fd_smarty_dir}");
/* Smarty compile dir */ /* Smarty compile dir */
define ("SPOOL_DIR", "$vars{fd_spool_dir}/"); /* FusionDirectory spool directory */ define ("SPOOL_DIR", "$vars{fd_spool_dir}/"); /* FusionDirectory spool directory */
......
...@@ -39,6 +39,11 @@ if (!defined("CONFIG_FILE")) { ...@@ -39,6 +39,11 @@ if (!defined("CONFIG_FILE")) {
define ("CONFIG_FILE", "fusiondirectory.conf"); /* FusionDirectory filename */ define ("CONFIG_FILE", "fusiondirectory.conf"); /* FusionDirectory filename */
} }
/*!
* \brief Path for smarty3 libraries
*/
define("SMARTY", "/usr/share/php/smarty3/Smarty.class.php");
/*! /*!
* \brief Smarty compile dir * \brief Smarty compile dir
*/ */
......
...@@ -60,11 +60,6 @@ define("FPDF", "/usr/share/php/fpdf/fpdf.php"); /*! Define fpdf library path */ ...@@ -60,11 +60,6 @@ define("FPDF", "/usr/share/php/fpdf/fpdf.php"); /*! Define fpdf library path */
*/ */
define("FPDF_FONTPATH", "/usr/share/php/fpdf/font/"); /*! Define fpdf font path */ define("FPDF_FONTPATH", "/usr/share/php/fpdf/font/"); /*! Define fpdf font path */
/*!
* \brief Path for smarty3 libraries
*/
define("SMARTY", "/usr/share/php/smarty3/Smarty.class.php"); /*! Define smarty3 library path */
/*! /*!
* \brief FusionDirectory Version * \brief FusionDirectory Version
*/ */
......
  • bmortier @bmortier

    mentioned in issue #925

    By bmortier on 2017-09-02T15:04:30 (imported from GitLab)

    ·

    mentioned in issue #925

    By bmortier on 2017-09-02T15:04:30 (imported from GitLab)

    Toggle commit list
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment