Sip.php: renamed urlParamToSip to queryStringToSip, getSipFromUrlParam to...

Sip.php: renamed urlParamToSip to queryStringToSip, getSipFromUrlParam to getSipFromQueryString. Added getQueryStringFromSip

qfq/store/Sip.php

@@ -55,12 +55,20 @@ class Sip {
     }
 
     /**
-     * @param $urlParam
+     * @param string $queryString  Possible variants:
+     *   * http://www.math.uzh.ch/index.php?a=1&s=4b3403665fea6&r=45&type=99&id=person
+     *   * index.php?a=1&s=4b3403665fea6&r=45&type=99&id=person
+     *   * ?a=1&s=4b3403665fea6&r=45&type=99&id=person
+     *   * a=1&s=4b3403665fea6&r=45&type=99&id=person
+     *
+     * @param string $mode   Possible values: RETURN_URL|RETURN_SIP
      * @return string
+     *  * mode=RETURN_URL: return complete URL
+     *  * mofr=RETURN_SIP: returns only the sip
      * @throws CodeException
      * @throws UserException
      */
-    public function urlParamToSip($urlParam, $mode = RETURN_URL) {
+    public function queryStringToSip($queryString, $mode = RETURN_URL) {
 
         // Validation: Check if still the same fe_user is logged in.
         if (isset($GLOBALS["TSFE"]->fe_user->user["uid"])) {
@@ -73,7 +81,7 @@ class Sip {
         $sipArray = array();
 
         // Split URL parameter:
-        $paramArray = KeyValueStringParser::parse($urlParam, "=", "&");
+        $paramArray = KeyValueStringParser::parse($queryString, "=", "&");
 
         // Split parameter between Script, Client and SIP
         $script = $this->splitParamClientSip($paramArray, $clientArray, $sipArray);
@@ -224,12 +232,23 @@ class Sip {
     }
 
     /**
-     * @param $urlParam
+     * @param $queryString
+     * @return mixed
+     */
+    public function getSipFromQueryString($queryString) {
+        if (isset($_SESSION[$queryString])) {
+            return $_SESSION[$queryString];
+        }
+        return false;
+    }
+
+    /**
+     * @param $queryString
      * @return mixed
      */
-    public function getSipFromUrlParam($urlParam) {
-        if (isset($_SESSION[$urlParam])) {
-            return $_SESSION[$urlParam];
+    public function getQueryStringFromSip($s) {
+        if (isset($_SESSION[$s])) {
+            return $_SESSION[$s];
         }
         return false;
     }