Also move plugins.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

diff --git a/core/classes/plpage.php b/core/classes/plpage.php
index cc4eccd..7b0161e 100644 (file)
--- a/core/classes/plpage.php
+++ b/core/classes/plpage.php
@@ -40,10 +40,12 @@ abstract class PlPage extends Smarty
         $this->caching       = false;
         $this->config_overwrite = false;
         $this->use_sub_dirs  = false;
-        $this->template_dir  = $globals->spoolroot."/templates/";
-        $this->compile_dir   = $globals->spoolroot."/spool/templates_c/";
-        array_unshift($this->plugins_dir, $globals->spoolroot."/plugins/");
-        $this->config_dir    = $globals->spoolroot."/configs/";
+        $this->template_dir  = $globals->spoolroot . '/templates/';
+        $this->compile_dir   = $globals->spoolroot . '/spool/templates_c/';
+        array_unshift($this->plugins_dir,
+                      $globals->spoolroot . '/core/plugins/',
+                      $globals->spoolroot . '/plugins/');
+        $this->config_dir    = $globals->spoolroot . '/configs/';
 
         $this->compile_check = !empty($globals->debug);
 

diff --git a/plugins/block.tidy.php b/core/plugins/block.tidy.php
similarity index 100%
rename from plugins/block.tidy.php
rename to core/plugins/block.tidy.php

diff --git a/plugins/compiler.checkpasswd.php b/core/plugins/compiler.checkpasswd.php
similarity index 98%
rename from plugins/compiler.checkpasswd.php
rename to core/plugins/compiler.checkpasswd.php
index 5c10a2a..2ad19ff 100644 (file)
--- a/plugins/compiler.checkpasswd.php
+++ b/core/plugins/compiler.checkpasswd.php
@@ -18,7 +18,6 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
-require_once 'platal.inc.php';
 
 function smarty_compiler_checkpasswd($tag_attrs, &$compiler)
 {

diff --git a/plugins/compiler.iterate.php b/core/plugins/compiler.iterate.php
similarity index 100%
rename from plugins/compiler.iterate.php
rename to core/plugins/compiler.iterate.php

diff --git a/plugins/compiler.javascript.php b/core/plugins/compiler.javascript.php
similarity index 98%
rename from plugins/compiler.javascript.php
rename to core/plugins/compiler.javascript.php
index b17d370..e2d3e0f 100644 (file)
--- a/plugins/compiler.javascript.php
+++ b/core/plugins/compiler.javascript.php
@@ -18,7 +18,6 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
-require_once 'platal.inc.php';
 
 function smarty_compiler_javascript($tag_attrs, &$compiler)
 {

diff --git a/plugins/function.select_db_table.php b/core/plugins/function.select_db_table.php
similarity index 99%
rename from plugins/function.select_db_table.php
rename to core/plugins/function.select_db_table.php
index 41d1bae..2bb73f7 100644 (file)
--- a/plugins/function.select_db_table.php
+++ b/core/plugins/function.select_db_table.php
@@ -19,8 +19,6 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-require_once 'platal.inc.php';
-
 function select_options($table,$valeur,$champ="text",$pad=false,
                         $where="",$join="",$group="")
 {

diff --git a/plugins/function.valid_date.php b/core/plugins/function.valid_date.php
similarity index 98%
rename from plugins/function.valid_date.php
rename to core/plugins/function.valid_date.php
index 8613c3a..fbda218 100644 (file)
--- a/plugins/function.valid_date.php
+++ b/core/plugins/function.valid_date.php
@@ -18,7 +18,6 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
-require_once 'platal.inc.php';
 
 function smarty_function_valid_date($params, &$smarty)
 {

diff --git a/plugins/function.xsrf_token.php b/core/plugins/function.xsrf_token.php
similarity index 100%
rename from plugins/function.xsrf_token.php
rename to core/plugins/function.xsrf_token.php

diff --git a/plugins/function.xsrf_token_field.php b/core/plugins/function.xsrf_token_field.php
similarity index 100%
rename from plugins/function.xsrf_token_field.php
rename to core/plugins/function.xsrf_token_field.php

diff --git a/plugins/modifier.date_format.php b/core/plugins/modifier.date_format.php
similarity index 100%
rename from plugins/modifier.date_format.php
rename to core/plugins/modifier.date_format.php

diff --git a/plugins/modifier.htmlentities.php b/core/plugins/modifier.htmlentities.php
similarity index 98%
rename from plugins/modifier.htmlentities.php
rename to core/plugins/modifier.htmlentities.php
index 01dae76..a81af32 100644 (file)
--- a/plugins/modifier.htmlentities.php
+++ b/core/plugins/modifier.htmlentities.php
@@ -19,8 +19,6 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-require_once 'platal.inc.php';
-
 function smarty_modifier_htmlentities($string, $format = ENT_COMPAT)
 {
     return pl_entities($string, $format);

diff --git a/plugins/modifier.miniwiki.php b/core/plugins/modifier.miniwiki.php
similarity index 98%
rename from plugins/modifier.miniwiki.php
rename to core/plugins/modifier.miniwiki.php
index aef58da..9b7418e 100644 (file)
--- a/plugins/modifier.miniwiki.php
+++ b/core/plugins/modifier.miniwiki.php
@@ -19,8 +19,6 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-require_once 'platal.inc.php';
-
 function smarty_modifier_miniwiki($string, $format = 'no_title')
 {
     return MiniWiki::wikiToHTML($string, $format == 'title');

diff --git a/plugins/modifier.number_format.php b/core/plugins/modifier.number_format.php
similarity index 100%
rename from plugins/modifier.number_format.php
rename to core/plugins/modifier.number_format.php

diff --git a/plugins/modifier.uint_to_ip.php b/core/plugins/modifier.uint_to_ip.php
similarity index 100%
rename from plugins/modifier.uint_to_ip.php
rename to core/plugins/modifier.uint_to_ip.php

diff --git a/plugins/compiler.icon.php b/plugins/compiler.icon.php
index c675903..d464900 100644 (file)
--- a/plugins/compiler.icon.php
+++ b/plugins/compiler.icon.php
@@ -18,7 +18,6 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
-require_once 'platal.inc.php';
 
 function smarty_compiler_icon($tag_attrs, &$compiler)
 {

diff --git a/plugins/function.make_forlife.php b/plugins/function.make_forlife.php
index a9c94e7..faa8684 100644 (file)
--- a/plugins/function.make_forlife.php
+++ b/plugins/function.make_forlife.php
@@ -18,7 +18,6 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
-require_once 'platal.inc.php';
 
 function smarty_function_make_forlife($params, &$smarty)
 {