Dev: Don't allow survey id to be 0 when copying survey

Dev: Superadmin permission entity id is 0, so it will be
Dev: removed when permission are copied.

application/helpers/admin/import_helper.php

@@ -1543,13 +1543,13 @@ function XMLImportSurvey($sFullFilePath,$sXMLdata=NULL,$sNewSurveyName=NULL,$iDe
 * This function returns a new random sid if the existing one is taken,
 * otherwise it returns the old one.
 *
-* @param mixed $iOldSID
+* @param mixed $iDesiredSurveyId
 */
-function GetNewSurveyID($iOldSID)
+function GetNewSurveyID($iDesiredSurveyId)
 {
     Yii::app()->loadHelper('database');
-    $aSurvey=Survey::model()->findByPk($iOldSID);
-    if(!empty($aSurvey))
+    $aSurvey=Survey::model()->findByPk($iDesiredSurveyId);
+    if(!empty($aSurvey) || $iDesiredSurveyId == 0)
     {
         // Get new random ids until one is found that is not used
         do
@@ -1563,7 +1563,7 @@ function GetNewSurveyID($iOldSID)
     }
     else
     {
-        return $iOldSID;
+        return $iDesiredSurveyId;
     }
 }
 

application/models/Permission.php

@@ -440,6 +440,11 @@ public function setGlobalPermission($iNewUID,$sPermType,array $aPermissions=arra
 
     public function giveAllSurveyPermissions($iUserID, $iSurveyID)
     {
+        if ($iSurveyID == 0)
+        {
+            throw new InvalidArgumentException('Survey ID cannot be 0 (collides with superadmin permission entity id)');
+        }
+
         $aPermissions=$this->getSurveyBasePermissions();
         $aPermissionsToSet=array();
         foreach ($aPermissions as $sPermissionName=>$aPermissionDetails)