From 40ef637ed3d02764bc5e33ea9f2d519b147710e7 Mon Sep 17 00:00:00 2001
From: Adam Zammit <adam.zammit@acspri.org.au>
Date: Thu, 10 Dec 2015 10:55:09 +1100
Subject: [PATCH] Removed references to the updater

---
 include/limesurvey/admin/admin.php | 10 ++---
 include/limesurvey/common.php      | 65 +++++++++++++++---------------
 2 files changed, 38 insertions(+), 37 deletions(-)

diff --git a/include/limesurvey/admin/admin.php b/include/limesurvey/admin/admin.php
index f4fb9c6f..103eea80 100644
--- a/include/limesurvey/admin/admin.php
+++ b/include/limesurvey/admin/admin.php
@@ -325,11 +325,11 @@ if(isset($_SESSION['loginID']))
     {
         include('listcolumn.php');
     }
-    elseif ($action=='update')
-    {
-        if( $_SESSION['USER_RIGHT_SUPERADMIN'] == 1)    include($homedir.'/update/updater.php');
-        else { include('access_denied.php');}
-    }
+//    elseif ($action=='update')
+//    {
+//      if( $_SESSION['USER_RIGHT_SUPERADMIN'] == 1)    include($homedir.'/update/updater.php');
+//        else { include('access_denied.php');}
+//    }
     elseif ($action=='assessments' || $action=='assessmentdelete' || $action=='assessmentedit' || $action=='assessmentadd' || $action=='assessmentupdate')
     {
         if(bHasSurveyPermission($surveyid,'assessments','read'))    {
diff --git a/include/limesurvey/common.php b/include/limesurvey/common.php
index 248f5cb5..206be404 100644
--- a/include/limesurvey/common.php
+++ b/include/limesurvey/common.php
@@ -260,38 +260,39 @@ if ($sourcefrom == "admin")
 }
 
 // Check if the DB is up to date
-If (!$dbexistsbutempty && $sourcefrom=='admin')
-{
-    $usrow = getGlobalSetting('DBVersion');
-    if (floatval($usrow)<$dbversionnumber)
-    {
-        $action='';
-        require_once($rootdir.'/classes/core/language.php');
-        $clang = new limesurvey_lang($defaultlang);
-        include_once($homedir.'/update/updater.php');
-        if(isset($_GET['continue']) && $_GET['continue']==1)
-        {
-            echo getAdminHeader();
-            CheckForDBUpgrades();
-            echo "<br /><a href='$homeurl'>".$clang->gT("Back to main menu")."</a></div>";
-            //updatecheck();
-            echo getAdminFooter("http://docs.limesurvey.org", $clang->gT("LimeSurvey online manual"));
-        }
-        else
-        {
-            echo getAdminHeader(),
-                 '<div class="messagebox">',CheckForDBUpgrades(),'</div>',
-                 getAdminFooter("http://docs.limesurvey.org", $clang->gT("LimeSurvey online manual"))
-                 ;
-        }
-        die;
-    }
-
-      if (is_dir($homedir."/install") && $debug<2)
-       {
-        die ("<p style='text-align: center; margin-left: auto; margin-right: auto; width: 500px; margin-top: 50px;'><img src='../images/limecursor-handle.png' /><strong>Congratulations</strong><br /><br />Your installation is now complete. The final step is to remove or rename the LimeSurvey installation directory (admin/install) on your server since it may be a security risk.<br /><br />Once this directory has been removed or renamed you will be able to log in to your new LimeSurvey Installation.<br /><br /><a href='admin.php'>Try again</a></p>");
-       }
-}
+// not for queXS
+//if (!$dbexistsbutempty && $sourcefrom=='admin')
+//{
+//    $usrow = getGlobalSetting('DBVersion');
+//    if (floatval($usrow)<$dbversionnumber)
+//    {
+//        $action='';
+//        require_once($rootdir.'/classes/core/language.php');
+//        $clang = new limesurvey_lang($defaultlang);
+//        include_once($homedir.'/update/updater.php');
+//       if(isset($_GET['continue']) && $_GET['continue']==1)
+//        {
+//            echo getAdminHeader();
+//            CheckForDBUpgrades();
+//            echo "<br /><a href='$homeurl'>".$clang->gT("Back to main menu")."</a></div>";
+//            //updatecheck();
+//            echo getAdminFooter("http://docs.limesurvey.org", $clang->gT("LimeSurvey online manual"));
+//        }
+//        else
+//        {
+//            echo getAdminHeader(),
+//                 '<div class="messagebox">',CheckForDBUpgrades(),'</div>',
+//                 getAdminFooter("http://docs.limesurvey.org", $clang->gT("LimeSurvey online manual"))
+//                 ;
+//        }
+//        die;
+//    }
+//
+//      if (is_dir($homedir."/install") && $debug<2)
+//       {
+//        die ("<p style='text-align: center; margin-left: auto; margin-right: auto; width: 500px; margin-top: 50px;'><img src='../images/limecursor-handle.png' /><strong>Congratulations</strong><br /><br />Your installation is now complete. The final step is to remove or rename the LimeSurvey installation directory (admin/install) on your server since it may be a security risk.<br /><br />Once this directory has been removed or renamed you will be able to log in to your new LimeSurvey Installation.<br /><br /><a href='admin.php'>Try again</a></p>");
+//       }
+//}
 
 //Admin menus and standards
 //IF THIS IS AN ADMIN SCRIPT, RUN THE SESSIONCONTROL SCRIPT