Bug 1810990: blocktype: googleapps

    note: tags, height,
         -  not sure if there was another way around
          making googleapps function public to access these.
Change-Id: If1de7f614088d5cdc28c6d14d50e1347cd9b00d5

htdocs/blocktype/googleapps/lib.php

@@ -103,7 +103,7 @@ class PluginBlocktypeGoogleApps extends MaharaCoreBlocktype {
         );
     }
 
-    private static function make_apps_url($url) {
+    public static function make_apps_url($url) {
         $httpstr = is_https() ? 'https' : 'http';
 
         if (preg_match('#//goo\.gl/#', $url)) {

htdocs/testing/classes/generator/TestingDataGenerator.php

@@ -1037,6 +1037,30 @@ EOD;
         return $configdata;
     }
 
+    /**
+     * generate configdata for blocktype: googleapps
+     * embedded links include '=' symbol which can get cut up setup_configdata()
+     * so I've used == to separate the key and value in the table.
+     *
+     * @param array $fields holding the 'googleapps' => embeddedsource
+     * @return array $configdata of the processed keys and values for the db table
+     */
+    public static function generate_configdata_googleapps($fields) {
+        $configdata = array();
+        foreach ($fields as $key => $value) {
+            if ($key == 'googleapp') {
+              $app = PluginBlocktypeGoogleApps::make_apps_url($value);
+              $configdata['appsid'] = $app['url'];
+            }
+            if ($key == 'height') {
+                if ($value > 0) {
+                    $configdata['height'] = $value;
+                }
+            }
+        }
+        return $configdata;
+    }
+
     /**
      * generate configdata for blocktype: html
      * @param array $fields holding each chunk of data between the ; in the behat data column
@@ -1542,11 +1566,11 @@ EOD;
                     $value = trim($value);
                     $sortedfields[$key]=$value;
                 }
+                else {
+                  throw new SystemException("Empty fields!");
+                }
             }
         }
-        else {
-            throw new SystemException("Empty fields!");
-        }
         return $sortedfields;
     }
 

test/behat/features/user_content/test.feature

@@ -174,11 +174,12 @@ Background:
     | Profile Information  | profileinfo    | Page Two      | no         | introtext =Mahara unicorn here! Nice to meet you :);profileicon=Image1.jpg |
     | Profile Information  | profileinfo    | Page Two      | no         | introtext =Mahara unicorn here! Nice to meet you :);profileicon=Image2.png |
     | Résumé               | entireresume   | Page Two      | no         | tags=mahara |
-    | Résumé field: Employment History | resumefield    | Page Two      | no         | artefacttype=employmenthistory |
-    | Résumé field: Personal Goal      | resumefield    | Page Two      | no         | artefacttype=personalgoal |
-    | Résumé field: Work Skill         | resumefield    | Page Two      | no         | artefacttype=workskill |
-    | Résumé field: Interest           | resumefield    | Page Two      | no         | artefacttype=interest |
-
+    | Résumé: Employment Hist.| resumefield | Page Two      | no         | artefacttype=employmenthistory |
+    | Résumé: Personal Goal   | resumefield | Page Two      | no         | artefacttype=personalgoal |
+    | Résumé: Work Skill      | resumefield | Page Two      | no         | artefacttype=workskill |
+    | Résumé: Interest        | resumefield | Page Two      | no         | artefacttype=interest |
+    | GoogleApps: Google Maps | googleapps  | Page Two      | no         | googleapp=<iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d2997.861064367898!2d174.77176941597108!3d-41.29012814856559!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x6d38afd6326bfda5%3A0x5c0d858838e52d7a!2sCatalyst!5e0!3m2!1sen!2snz!4v1550707486290" width="800" height="600" frameborder="0" style="border:0" allowfullscreen></iframe>;height=100;tags=cat,dog,monkeys |
+    | GoogleApps: Google Calen| googleapps  | Page Two      | no         | googleapp=https://calendar.google.com/calendar/embed?src=en.new_zealand%23holiday%40group.v.calendar.google.com&ctz=Pacific%2FAuckland |
 
 Scenario: Login as admin to change upload settings
     # To allow users to upload specific internal media types