Merge pull request tsugiproject#16 in UELA/tsugi from dev to qa

* commit 'a7e028901d76471309f21fe3999b0a91b5cc7b6b': TSUGI-122 Each is deprecated in 7.2 replace with foreach TSUGI-114 Change banner alert styling for new app design Revert "Updated certificate to new format. Added clear option and update/create buttons." Updated certificate to new format. Added clear option and update/create buttons.
udaytonapps · May 22, 2019 · 571c9dc · 571c9dc
2 parents ec508d2 + a7e0289
commit 571c9dc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/vendor/tsugi/lib/src/UI/Output.php b/vendor/tsugi/lib/src/UI/Output.php
@@ -73,12 +73,15 @@ public static function headerJson() {
     function flashMessages() {
         ob_start();
         if ( $this->session_get('error') ) {
-            echo '<div class="alert alert-danger" style="clear:both"><a href="#" class="close" data-dismiss="alert">&times;</a>'.
-            $this->session_get('error')."</div>\n";
+            echo '<div class="alert alert-danger alert-banner" style="clear:both">
+                    <div class="container"><a href="#" class="close" data-dismiss="alert">&times;</a>'.
+                $this->session_get('error')."</div></div>\n";
             $this->session_forget('error');
         } else if ( isset($_GET['lti_errormsg']) ) {
-            echo '<div class="alert alert-danger" style="clear:both"><a href="#" class="close" data-dismiss="alert">&times;</a>'.
-            htmlentities($_GET['lti_errormsg'])."</div>";
+            echo '<div class="alert alert-danger alert-banner" style="clear:both">
+                    <div class="container"><a href="#" class="close" data-dismiss="alert">&times;</a>'.
+                htmlentities($_GET['lti_errormsg'])."</div></div>";
+
             if ( isset($_GET['detail']) ) {
                 echo("\n<!--\n");
                 echo(str_replace("-->","--:>",$_GET['detail']));
@@ -87,8 +90,10 @@ function flashMessages() {
         }
 
         if ( $this->session_get('success') ) {
-            echo '<div class="alert alert-success" style="clear:both"><a href="#" class="close" data-dismiss="alert">&times;</a>'.
-            $this->session_get('success')."</div>\n";
+            echo '<div class="alert alert-success alert-banner" style="clear:both">
+                    <div class="container"><a href="#" class="close" data-dismiss="alert">&times;</a>'.
+                $this->session_get('success')."</div></div>\n";
+
             $this->session_forget('success');
         }
 

diff --git a/vendor/tsugi/lib/src/Util/LTI.php b/vendor/tsugi/lib/src/Util/LTI.php
@@ -681,7 +681,7 @@ public static function parseContextMembershipsResponse($response) {
             $result = array();
             $members = $xml->xpath('/message_response/members/member');
 
-            while(list( , $node) = each($members)) {
+            foreach($members as $node) {
                 $groups = array();
                 foreach($node->groups as $k) {
                     foreach($k->group as $v) {