Add flag to disable teammaker (#771)

Author: gondek

app/app_controller.php

@@ -35,6 +35,7 @@ class AppController extends Controller
     public $breadcrumb;
     public $validTZ;
     public $emailInterfaceEnabled = true;
+    public $teamMakerEnabled = true;
 
     /**
      * if this request has session transfer data
@@ -176,6 +177,14 @@ public function beforeFilter()
         );
         $this->set('emailInterfaceEnabled', $this->emailInterfaceEnabled);
 
+        // check if TeamMaker is enabled. Set here rather than per-controller
+        // because the footer, which renders on every layout, needs it.
+        $this->teamMakerEnabled = in_array(
+            $this->SysParameter->get('system.teammaker_enabled', 'true'),
+            array('1', 'true', 'yes')
+        );
+        $this->set('teamMakerEnabled', $this->teamMakerEnabled);
+
         // for setting up google analytics
         $trackingId = $this->SysParameter->findByParameterCode('google_analytics.tracking_id');
         $domain = $this->SysParameter->findByParameterCode('google_analytics.domain');

app/views/courses/home.ctp

@@ -61,7 +61,7 @@ $submenuTitle = __('Evaluation Events', true);
 $params = array('controller'=>'courses', 'submenu'=>$submenu, 'submenuTitle'=>$submenuTitle, 'course_id'=>$data['Course']['id']);
 echo $this->element('courses/submenu', $params);
 
-if (User::hasPermission('controllers/Surveys')) {
+if (($teamMakerEnabled ?? true) && User::hasPermission('controllers/Surveys')) {
   $submenu = 'TeamMaker';
   $submenuTitle = __('Team Maker', true);
   $params = array('controller'=>'courses', 'submenu'=>$submenu, 'submenuTitle'=>$submenuTitle, 'course_id'=>$data['Course']['id']);

app/views/elements/courses/submenu.ctp

@@ -55,6 +55,9 @@ switch($submenu) {
     );
     break;
   case "TeamMaker":
+    if (!($teamMakerEnabled ?? true)) {
+        break;
+    }
     if ($status == 'A') {
         array_push(
             $items,
@@ -91,6 +94,12 @@ switch($submenu) {
     }
     break;
 }
+
+// nothing to show (e.g. the section is disabled) - skip the heading and
+// border rather than rendering an empty box
+if (empty($items)) {
+    return;
+}
 ?>
 <div class="course_submenu course_submenu-<?php echo $submenu; ?>">
 <h3>

app/views/elements/global/footer.ctp

@@ -1,6 +1,10 @@
 <div id='footer' class='pagewidth'>
   <p>
-  <?php __('Powered by iPeer and TeamMaker - Created by UBC and Rose-Hulman')?>
+  <?php if ($teamMakerEnabled ?? true) {
+      __('Powered by iPeer and TeamMaker - Created by UBC and Rose-Hulman');
+  } else {
+      __('Powered by iPeer - Created by UBC and Rose-Hulman');
+  } ?>
   </p>
   <?php if (!empty($ipeerCommitHash)): ?>
   <p>

app/views/elements/list/ajaxList.ctp

@@ -14,17 +14,6 @@
         echo "<span style='color:red'>ajaxList: $message</span><br />";
     }
 
-    function utf8ize($d) {
-        if (is_array($d)) {
-            foreach ($d as $k => $v) {
-                $d[$k] = utf8ize($v);
-            }
-        } else if (is_string ($d)) {
-            return utf8_encode($d);
-        }
-        return $d;
-    }
-
     $divisionName = "ajaxListDiv";
     // The main div containing the controll
     echo "<div id='$divisionName'>";
@@ -45,7 +34,9 @@
     } else {
 
         // Start Up the element
-        $variables = json_encode(utf8ize($paramsForList));
+        // Data is already UTF-8; substitute rather than re-encode so valid
+        // multi-byte characters aren't mangled (matches the AJAX refresh path).
+        $variables = json_encode($paramsForList, JSON_INVALID_UTF8_SUBSTITUTE);
 
         echo $html->script("ajaxList");
         echo $html->scriptBlock("var ajaxList = new AjaxList({$variables},'$divisionName')");

app/views/home/combined.ctp

@@ -91,7 +91,11 @@ if (isset($course_list['I']))
     <li><?php __('Then <i>register students</i> into that course from that course\'s home page. This display will be available (once the course is created) by clicking on the course\'s name from most menus.')?>
     </li>
 
-    <li><?php __('Put your students into <i>groups</i> manually, (or, if you have the students complete a survey, iPeer can do it for you, using TeamMaker).')?>
+    <li><?php if ($teamMakerEnabled ?? true) {
+        __('Put your students into <i>groups</i> (or, if you have the students complete a survey, iPeer can do it for you, using TeamMaker).');
+    } else {
+        __('Put your students into <i>groups</i>.');
+    } ?>
     </li>
 
     <li>

app/views/home/index.ctp

@@ -86,7 +86,11 @@ if (isset($course_list['I']))
     <li><?php __('Then <i>register students</i> into that course from that course\'s home page. This display will be available (once the course is created) by clicking on the course\'s name from most menus.')?>
     </li>
 
-    <li><?php __('Put your students into <i>groups</i> manually, (or, if you have the students complete a survey, iPeer can do it for you, using TeamMaker).')?>
+    <li><?php if ($teamMakerEnabled ?? true) {
+        __('Put your students into <i>groups</i> (or, if you have the students complete a survey, iPeer can do it for you, using TeamMaker).');
+    } else {
+        __('Put your students into <i>groups</i>.');
+    } ?>
     </li>
 
     <li>