Dev: Update check after super admin login works

LimeSurvey · Oct 4, 2018 · 7c073b4 · 7c073b4
1 parent d367983
commit 7c073b4
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 2 deletions.
diff --git a/application/core/plugins/UpdateCheck/UpdateCheck.php b/application/core/plugins/UpdateCheck/UpdateCheck.php
@@ -27,13 +27,34 @@ class UpdateCheck extends PluginBase
     public function init()
     {
         $this->subscribe('afterSuccessfulLogin');
+        $this->subscribe('beforeControllerAction');
     }
 
     /**
      * @return void
      */
     public function afterSuccessfulLogin()
     {
+        if (Permission::model()->hasGlobalPermission('superadmin')) {
+            // Set flag.
+            Yii::app()->session['do_update_check'] = true;
+        }
+    }
+
+    /**
+     * @return void
+     */
+    public function beforeControllerAction()
+    {
+        $controller = $this->getEvent()->get('controller');
+        $doUpdateCheck = Yii::app()->session['do_update_check'];
+
+        if ($controller == 'admin' && $doUpdateCheck) {
+            $this->spitOutUrl();
+            $this->registerScript();
+            // Unset flag.
+            Yii::app()->session['do_update_check'] = false;
+        }
     }
 
     /**
@@ -64,7 +85,7 @@ public function checkAll()
                         implode(', ', $availableVersions)
                     );
                 }
-            } catch (\Exception $ex) {
+            } catch (\Throwable $ex) {
                 $errors[] = $ex->getMessage();
             }
         }
@@ -74,10 +95,37 @@ public function checkAll()
             UniqueNotification::broadcast(
                 [
                     'title' => gT('Updates available'),
-                    'message' => implode('<br/>', $messages)
+                    'message' => implode('<br/>', $messages) . '<br/>' . implode('<br/>', $errors)
                 ],
                 $superadmins
             );
         }
     }
+
+    /**
+     * @return void
+     */
+    protected function spitOutUrl()
+    {
+        $data = [
+            'url' => Yii::app()->createUrl(
+                'admin/pluginhelper',
+                array(
+                    'sa'     => 'ajax',
+                    'plugin' => 'updateCheck',
+                    'method' => 'checkAll'
+                )
+            )
+        ];
+        echo $this->api->renderTwig(__DIR__ . '/views/index.twig', $data);
+    }
+
+    /**
+     * @return void
+     */
+    protected function registerScript()
+    {
+        $assetsUrl = Yii::app()->assetManager->publish(dirname(__FILE__) . '/assets/js');
+        Yii::app()->clientScript->registerScriptFile($assetsUrl . '/updateCheck.js');
+    }
 }
diff --git a/application/core/plugins/UpdateCheck/assets/js/updateCheck.js b/application/core/plugins/UpdateCheck/assets/js/updateCheck.js
@@ -0,0 +1,15 @@
+$(document).ready(function() {
+    var url = LS.plugin.updateCheck.url;
+    $.ajax({
+        url: url,
+        data: {},
+        method: 'GET',
+        success: function(response) {
+            console.ls.log(response);
+            //LS.updateNotificationWidget();
+        },
+        error : function(arguments) {
+            console.ls.log(arguments);
+        }
+    });
+});