MDL-15860 - add global portfolio enabled switch

diff --git a/lang/en_utf8/portfolio.php b/lang/en_utf8/portfolio.php
index ca086c5570690d56f6fcccd43b79df08a5ce16d3..f2e90c32159904bc814042059a2b69844cbf3865 100644 (file)
--- a/lang/en_utf8/portfolio.php
+++ b/lang/en_utf8/portfolio.php
@@ -13,6 +13,7 @@ $string['confirmsummary'] = 'Summary of your export';
 $string['configure'] = 'Configure';
 $string['continuetoportfolio'] = 'Continue to your portfolio';
 $string['deleteportfolio'] = 'Delete portfolio instance';
+$string['disabled'] = 'Sorry, but portfolio exports are not enabled in this site';
 $string['dontwait'] = 'Don\'t wait';
 $string['err_uniquename'] = 'Portfolio name must be unique (per plugin)';
 $string['enabled'] = 'Enable portfolios';

diff --git a/lib/portfoliolib.php b/lib/portfoliolib.php
index 87ecce917ebe28f90a5eba73dcccc71bdbf864a1..84863c1fb16b7bde9ee05f887617ee05ee993286 100644 (file)
--- a/lib/portfoliolib.php
+++ b/lib/portfoliolib.php
@@ -141,6 +141,10 @@ function portfolio_add_button($callbackclass, $callbackargs, $callbackfile=null,
 
     global $SESSION, $CFG, $COURSE, $USER;
 
+    if (empty($CFG->portfolioenabled)) {
+        return;
+    }
+
     if (!$instances = portfolio_instances()) {
         return;
     }

diff --git a/portfolio/add.php b/portfolio/add.php
index 0f9edae5c294d8d684d0277775df9cf780a05f4c..ddab920108097e301e84321492ea6822510f5cee 100644 (file)
--- a/portfolio/add.php
+++ b/portfolio/add.php
@@ -1,5 +1,10 @@
 <?php
 require_once(dirname(dirname(__FILE__)) . '/config.php');
+
+if (empty($CFG->portfolioenabled)) {
+    print_error('disabled', 'portfolio');
+}
+
 require_once($CFG->libdir . '/portfoliolib.php');
 
 $exporter = null;

diff --git a/user/portfolio.php b/user/portfolio.php
index 16d0e298e52716b9e46dbf4e5e57b26c0fce9ceb..5cf114b3a6ff64ccfffddbe3b6ad670bb62c476c 100644 (file)
--- a/user/portfolio.php
+++ b/user/portfolio.php
@@ -1,6 +1,11 @@
 <?php
 
 require_once(dirname(dirname(__FILE__)) . '/config.php');
+
+if (empty($CFG->portfolioenabled)) {
+    print_error('disabled', 'portfolio');
+}
+
 require_once($CFG->libdir . '/portfoliolib.php');
 
 $config = optional_param('config', 0, PARAM_INT);

diff --git a/user/tabs.php b/user/tabs.php
index 531665925ec41f6444b10914067e39cf3beb4ce7..b905bf4104f9ed2b2c2b6c5f8d780340fbcdf9e4 100644 (file)
--- a/user/tabs.php
+++ b/user/tabs.php
@@ -239,7 +239,7 @@
         }
     }
 
-    if (empty($userindexpage) && $user->id == $USER->id) {
+    if (empty($userindexpage) && $user->id == $USER->id && !empty($CFG->portfolioenabled)) {
 
         /// Portfolio tab
         require_once($CFG->libdir . '/portfoliolib.php');