Dev: sid in SurveyDynamic and TokenDynamic are static …

LimeSurvey · Oct 6, 2018 · 6bb4566 · 6bb4566 · Shnoulle · Oct 7, 2018
1 parent fd7911f
commit 6bb4566
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 13 deletions.
diff --git a/application/models/Response.php b/application/models/Response.php
@@ -188,8 +188,9 @@ public function tableName()
          * @return int
          */
         public function getSurveyId() {
-            return $this->dynamicId;
+            return $this->getDynamicId();
         }
+
         public function browse()
         {
         }

diff --git a/application/models/SurveyDynamic.php b/application/models/SurveyDynamic.php
@@ -919,6 +919,6 @@ public function getPrintAnswersArray($sSRID, $sLanguage, $bHonorConditions = fal
      * @return int
      */
     public function getSurveyId() {
-        return $this->sid;
+        return self::$sid;
     }
 }
diff --git a/application/models/Token.php b/application/models/Token.php
@@ -385,6 +385,6 @@ public function tableName()
      * @return int
      */
     public function getSurveyId() {
-        return $this->dynamicId;
+        return $this->getDynamicId();
     }
 }
diff --git a/application/models/TokenDynamic.php b/application/models/TokenDynamic.php
@@ -1019,6 +1019,6 @@ public function search()
      * @return int
      */
     public function getSurveyId() {
-        return $this->sid;
+        return self::$sid;
     }
 }
diff --git a/application/models/behaviors/PluginEventBehavior.php b/application/models/behaviors/PluginEventBehavior.php
@@ -45,31 +45,35 @@ public function beforeSave(CModelEvent $event)
          * @param string $what
          * @return PluginEvent the dispatched event
          */
-        private function _dispatchDynamic($when,$what) {
-            if(is_subclass_of($this->owner,'Dynamic'))
-            {
-                $oPluginEvent = new PluginEvent($when.get_parent_class($this->owner).$what, $this);
-                $oPluginEvent->set('model', $this->owner);
-                $oPluginEvent->set('dynamicId', $this->owner->getDynamicId());
-                return App()->getPluginManager()->dispatchEvent($oPluginEvent);
+        private function _dispatchDynamic($when,$what)
+        {
+            if(is_subclass_of($this->owner,'Dynamic')) {
+                $params = array(
+                    'dynamicId' => $this->owner->getDynamicId()
+                );
+                return $this->dispatchPluginModelEvent($when.get_parent_class($this->owner).$what,null,$params);
             }
         }
         /**
          * method for dispatching plugin events
          *
          * See {@link find()} for detailed explanation about $condition and $params.
          * @param string $sEventName event name to dispatch
-         * @param array	$criteria array containing attributes, conditions and params for the filter query
+         * @param array $criteria array containing attributes, conditions and params for the filter query
+         * @param array $eventParams array of params for event
          * @return PluginEvent the dispatched event
          */
-        public function dispatchPluginModelEvent($sEventName, $criteria = null)
+        public function dispatchPluginModelEvent($sEventName, $criteria = null, $eventParams = array())
         {
             $oPluginEvent = new PluginEvent($sEventName, $this);
             $oPluginEvent->set('model', $this->owner);
             if(method_exists($this->owner,'getSurveyId')) {
                 $oPluginEvent->set('iSurveyID', $this->owner->getSurveyId());
                 $oPluginEvent->set('surveyId', $this->owner->getSurveyId());
             }
+            foreach($eventParams as $param => $value) {
+                $oPluginEvent->set($param, $value);
+            }
             if (isset($criteria)) {
                 $oPluginEvent->set('filterCriteria', $criteria);
             }