Talenttic_survey/CATI_Tool
2
0
Fork 0
mirror of https://github.com/ACSPRI/queXS synced 2024-04-02 12:12:16 +00:00
Code Issues Releases Activity

Removed references to the updater

Browse Source
This commit is contained in:
Adam Zammit
2015-12-10 10:55:09 +11:00
parent 07620e1db6
commit 40ef637ed3
2 changed files with 38 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/limesurvey/admin/admin.php
View File

@@ -325,11 +325,11 @@ if(isset($_SESSION['loginID']))
{ {
include('listcolumn.php'); include('listcolumn.php');
} }
elseif ($action=='update') // elseif ($action=='update')
{ // {
if( $_SESSION['USER_RIGHT_SUPERADMIN'] == 1) include($homedir.'/update/updater.php'); // if( $_SESSION['USER_RIGHT_SUPERADMIN'] == 1) include($homedir.'/update/updater.php');
else { include('access_denied.php');} // else { include('access_denied.php');}
} // }
elseif ($action=='assessments' || $action=='assessmentdelete' || $action=='assessmentedit' || $action=='assessmentadd' || $action=='assessmentupdate') elseif ($action=='assessments' || $action=='assessmentdelete' || $action=='assessmentedit' || $action=='assessmentadd' || $action=='assessmentupdate')
{ {
if(bHasSurveyPermission($surveyid,'assessments','read')) { if(bHasSurveyPermission($surveyid,'assessments','read')) {

65
include/limesurvey/common.php
View File

@@ -260,38 +260,39 @@ if ($sourcefrom == "admin")
} }
// Check if the DB is up to date // Check if the DB is up to date
If (!$dbexistsbutempty && $sourcefrom=='admin') // not for queXS
{ //if (!$dbexistsbutempty && $sourcefrom=='admin')
$usrow = getGlobalSetting('DBVersion'); //{
if (floatval($usrow)<$dbversionnumber) // $usrow = getGlobalSetting('DBVersion');
{ // if (floatval($usrow)<$dbversionnumber)
$action=''; // {
require_once($rootdir.'/classes/core/language.php'); // $action='';
$clang = new limesurvey_lang($defaultlang); // require_once($rootdir.'/classes/core/language.php');
include_once($homedir.'/update/updater.php'); // $clang = new limesurvey_lang($defaultlang);
if(isset($_GET['continue']) && $_GET['continue']==1) // include_once($homedir.'/update/updater.php');
{ // if(isset($_GET['continue']) && $_GET['continue']==1)
echo getAdminHeader(); // {
CheckForDBUpgrades(); // echo getAdminHeader();
echo "<br /><a href='$homeurl'>".$clang->gT("Back to main menu")."</a></div>"; // CheckForDBUpgrades();
//updatecheck(); // echo "<br /><a href='$homeurl'>".$clang->gT("Back to main menu")."</a></div>";
echo getAdminFooter("http://docs.limesurvey.org", $clang->gT("LimeSurvey online manual")); // //updatecheck();
} // echo getAdminFooter("http://docs.limesurvey.org", $clang->gT("LimeSurvey online manual"));
else // }
{ // else
echo getAdminHeader(), // {
'<div class="messagebox">',CheckForDBUpgrades(),'</div>', // echo getAdminHeader(),
getAdminFooter("http://docs.limesurvey.org", $clang->gT("LimeSurvey online manual")) // '<div class="messagebox">',CheckForDBUpgrades(),'</div>',
; // getAdminFooter("http://docs.limesurvey.org", $clang->gT("LimeSurvey online manual"))
} // ;
die; // }
} // die;
// }
if (is_dir($homedir."/install") && $debug<2) //
{ // 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>"); // {
} // 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 //Admin menus and standards
//IF THIS IS AN ADMIN SCRIPT, RUN THE SESSIONCONTROL SCRIPT //IF THIS IS AN ADMIN SCRIPT, RUN THE SESSIONCONTROL SCRIPT