Index: Dev/branches/jos-branch/applicationcreation.php
===================================================================
--- Dev/branches/jos-branch/applicationcreation.php	(revision 264)
+++ 	(revision )
@@ -1,57 +1,0 @@
-<?php
-require 'classes/master.php';
-
-var_dump($_POST);
-
-if (is_null($_SESSION['username']))
-    redirect('index.php');
-
-$savedApplication = null;
-
-if(isset($_POST['applicationUID']) && $_POST['applicationUID'] != "") //either from same page or from menu
-{
-    $applicationUID = $_POST['applicationUID'];
-    $applicationDBI = new ApplicationDatabaseInterface($applicationUID);
-    
-    if (isset($_POST['applicationDescription']) && isset($_POST['applicationTitle'])) // from same page
-    {
-        $applicationDBI->setApplicationInfo($_POST);
-    }
-    
-    $info = $applicationDBI->getApplicationInfo($applicationUID);
-    $savedApplication = Application::getApplication($info);
-}
-else if(isset($_POST['applicationTitle'])) //save for first time
-{
-    $applicationDBI = new ApplicationDatabaseInterface($_POST['applicationUID']);
-    $applicationDBI->setApplicationInfo($_POST);
-    $applicationID = $applicationDBI->getApplicationID();
-    $info = $applicationDBI->getApplicationInfo($applicationID);
-    $savedApplication = Application::getApplication($info);
-}
-
-var_dump($savedApplication);
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-            <title>Application Creation</title>
-            <?php new StyleSheet(); ?>
-    </head>
-    <body>
-        <div id="header">
-            <?php new Logo(); ?>
-        </div>
-        <div id="wrapper">
-
-            <div id="content">
-                <?php
-                    new ApplicationCreationTool($savedApplication);
-                ?>
-            </div>
-        </div>
-    </body>
-</html>
Index: Dev/branches/jos-branch/createObject.php
===================================================================
--- Dev/branches/jos-branch/createObject.php	(revision 264)
+++ 	(revision )
@@ -1,62 +1,0 @@
-<?php
-
-require 'classes/master.php'; //should be at top of every page
-
-if (isset($_POST['objectToCreate'])) {
-    if (!empty($_POST['objectToCreate'])) {
-        $otc = $_POST['objectToCreate'];
-    } else {
-        //die ("Invalid arguments passed!");
-    }
-} else {
-    //die ("No arguments passed!");
-}
-
-
-$creator_results = User::get(array("uid" => $_SESSION['userUid']));
-$creator = $creator_results[0];
-
-//var_dump($creator);
-
-if (!$creator) {
-    die("Stuff is broke, yo!");
-}
-
-$uid = null;
-switch (strtolower($otc)) {
-    case "application":
-        $newApp = new Application(null, "New application", "Default description", "Default style");
-        $newApp->save();
-        $uid = $newApp->uid;
-        break;
-    case "survey":
-        $newSurvey = new Survey(null, "New Survey", "Default description", $creator, null);
-        $newSurvey->save();
-        $uid = $newSurvey->uid;
-        break;
-    case "dashboard":
-        //TODO
-        break;
-    case "question":
-        $newQuestion = new Question(null, "QCode", "new Question", "int", "Default description", "Standard category", array());
-        $newQuestion->save();
-        $uid = $newQuestion->uid;
-        break;
-    case "session":
-        if (isset($_POST['newSessionName']) && !empty($_POST['newSessionName'])) {
-            $newSession = new Session(null, $_POST['newSessionName'], $creator, new DateTime(), null, null);
-            $newSession->save();
-            $uid = $newSession->uid;
-        } else {
-            die("No session name specified!");
-        }
-
-
-        break;
-    default:
-        //die ("Variable \$otc: $otc does not match a compatible object type!");
-        break;
-}
-
-echo $uid;
-?>
Index: Dev/branches/jos-branch/createapplication.php
===================================================================
--- Dev/branches/jos-branch/createapplication.php	(revision 264)
+++ 	(revision )
@@ -1,22 +1,0 @@
-<?php
-
-require 'classes/master.php'; //should be at top of every page
-
-if (!isset($_SESSION['currentSession'])) {
-    die("No session currently active!");
-}
-
-
-$dbi = new DatabaseInterface();
-
-$newApplication = new Application(null, "New application", "Default application", "Default style");
-$dbi->set($newApplication);
-
-if (isset($_SESSION['localSessionCopy']) && !empty($_SESSION['localSessionCopy'])) {
-    $session = $_SESSION['localSessionCopy'];
-    $session->pipeline[] = $newApplication;
-    $_SESSION['localSessionCopy'] = $session;
-}
-
-redirect("pipelineEditor.php");
-?>
Index: Dev/branches/jos-branch/createsurvey.php
===================================================================
--- Dev/branches/jos-branch/createsurvey.php	(revision 264)
+++ 	(revision )
@@ -1,29 +1,0 @@
-<?php
-
-require 'classes/master.php'; //should be at top of every page
-
-if (!isset($_SESSION['username'])) {
-    redirect("index.php");
-}
-
-$dbi = new DatabaseInterface();
-$creator_results = $dbi->get("user", array("name" => $_SESSION['username']));   // Determine if user exists, so we can add him/her as creator of the new survey
-if (count($creator_results) > 0) {
-    $creator = $creator_results[0];
-    $newSurvey = new Survey(null, "New survey", "Default description", $creator, null);
-    $dbi->set($newSurvey);
-} else {
-    die("No user with that uid found!");
-}
-
-// Optional part, for when the session needs to be set in pipelineEditor
-// For now, store in local copy, only upload local copy to db when needed (page change, etc...)
-if (isset($_SESSION['localSessionCopy']) && !empty($_SESSION['localSessionCopy'])) {
-    $session = $_SESSION['localSessionCopy'];
-    $session->pipeline[] = $newSurvey;
-    $_SESSION['localSessionCopy'] = $session;
-}
-
-
-redirect("pipelineEditor.php");
-?>
Index: Dev/branches/jos-branch/dashboard.php
===================================================================
--- Dev/branches/jos-branch/dashboard.php	(revision 264)
+++ 	(revision )
@@ -1,59 +1,0 @@
-<?php
-require 'classes/master.php';
-
-if (is_null($_SESSION['username']))
-	redirect('index.php');
-
-/* MOCK SURVEY */
-
-$survey = new Survey('ultimateid', 'The Epic Survey');
-$question1 = new Question('question1id', 'AE340', 'Age', 'int', 'What is your age?');
-$question2 = new Question('question2id', 'XV453', 'Identity', 'mc', 'Are you freakazoid?');
-$question2->answers = array('yes', 'no', 'maybe');
-
-$survey->addQuestion($question1);
-$survey->addQuestion($question2);
-
-/* MOCK RESULTS */
-
-
-$survey1Results = new SurveyResults();
-
-$question1Answers = array(3, 5, 12, 134, 5, 40); // int
-$question2Answers = array('yes', 'no', 'no', 'yes', 'maybe', 'no');	// Multiple choice
-
-$question1Result = new QuestionResult(ResultType::INTEGER, $question1Answers);
-$question2Result = new QuestionResult(ResultType::MULTIPLE_CHOICE, $question2Answers);
-
-$survey1Results->addQuestionResult($question1Result);
-$survey1Results->addQuestionResult($question2Result);
-
-/*  COMBINE */
-
-$survey->setResults($survey1Results);
-
-$surveys = array($survey);
-
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-            <title></title>
-			<?php new StyleSheet(); ?>
-			<script type="text/javascript" src="d3/d3.js"></script>
-    </head>
-    <body>
-        <div id="header">
-			<?php new Logo(); ?>
-        </div>
-        <div id="wrapper">
-
-            <div id="content">
-				<?php new DashboardTool($surveys); ?>
-            </div>
-        </div>
-    </body>
-</html>
Index: Dev/branches/jos-branch/database_example.php
===================================================================
--- Dev/branches/jos-branch/database_example.php	(revision 264)
+++ 	(revision )
@@ -1,17 +1,0 @@
-<?php
-    require 'classes/master.php';
-
-    $db = new DatabaseInterface();
-    $result = $db->get("user", array("name" => "jkraaijeveld"));
-    print_r($result);
-    
-    // Create new application and save it in database
-    $newApp = new Application(null, "Titel", "Beschrijving", "Stijl");
-    $db->set(newApp);
-    
-    //Retrieve all Questions
-    $results = $db->get("question", array());
-    
-    //Batchsave all results
-    $db->set($results);
-?>
Index: Dev/branches/jos-branch/getInfo.php
===================================================================
--- Dev/branches/jos-branch/getInfo.php	(revision 264)
+++ 	(revision )
@@ -1,85 +1,0 @@
-<?php
-
-require 'classes/master.php'; //should be at top of every page
-
-if (isset($_POST['uid']) && isset($_POST['type'])) {
-    if (!empty($_POST['uid']) && !empty($_POST['type'])) {
-        $uid = $_POST['uid'];
-        $type = $_POST['type'];
-    } else {
-//$errors[] = "No uid passed!";
-        return;
-    }
-} else {
-//$errors[] = "Wrong call, no uid property in POST data!";
-    return;
-}
-
-
-$results = $type::get(array("uid" => $uid));
-
-if (count($results) > 0) {      // check if DB object exists and assign it to variable
-    if ($results[0] != null) {
-        $returnString = "";
-        $result = $results[0];
-    } else
-        return;
-} else
-    return;
-
-// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-// Note: the next part needs to be converted to JSON operation, so that the javascript can easily handle any style changes to the information retrieved. This implementation is just silly.
-// Basic idea: return a JSON array of property: value pairs, then let javascript loop through these properties and format them suitably. This is both more flexible and easier to adjust, as well as resulting in smaller packets.
-// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-switch ($type) {
-    case "Session":
-        $returnString .= "<span class='property'>Title: </span><span class='value'>$result->title</span>";
-        $result->evaluate();
-        $returnString .= "<span class='property'>Created: </span><span class='value'>" . $result->creationdate->format("H:i:s, d-m-Y") . " by " . $result->creator->name . "</span>";
-        $cS = 0; $cD = 0; $cA = 0;
-        foreach ($result->pipeline as $step) {
-            switch (get_class($step)){
-                case "Survey":
-                    $cS++;
-                    break;
-                case "Application":
-                    $cA++;
-                    break;
-                case "Dashboard":
-                    $cD++;
-                    break;
-                default:
-                    //derp?
-                    break;
-            }
-        }
-        $returnString .= "<span class='property'>Number of steps: </span><span class='value'><ul style='list-style-type: none;'><li style='margin-left: -40px;'>$cS Surveys<li style='margin-left: -40px;'>$cA Applications<li style='margin-left: -40px;'>$cD Dashboards</ul></span>";
-        break;
-    case "Survey":
-        $returnString .= "<span class='property'>Title: </span><span class='value'>$result->title</span>";
-        $returnString .= "<span class='property'>Creator: </span><span class='value'>LOLOL ME!!!</span>";
-        $qCount = 0;
-        $qCount = count($result->questions);
-        $returnString .= "<span class='property'>Questions: </span><span class='value'>$qCount</span>";
-        $returnString .= "<span class='property'>Description: </span><span class='value'>$result->description</span>";
-        break;
-    case "Application":
-        $returnString .= "<span class='property'>Title: </span><span class='value'>$result->title</span>";
-        $returnString .= "<span class='property'>Path: </span><span class='value'>C:/folder_of_awesomeness/epicgame.exe</span>";
-        $returnString .= "<span class='property'>Description: </span><span class='value'>$result->description</span>";
-        break;
-    case "Dashboard":
-        break;
-    case "Respondent":
-        break;
-    case "Question":
-        break;
-    case "Answer":
-        break;
-    default:
-        break;
-}
-
-echo $returnString;
-?>
Index: Dev/branches/jos-branch/getObject.php
===================================================================
--- Dev/branches/jos-branch/getObject.php	(revision 264)
+++ 	(revision )
@@ -1,35 +1,0 @@
-<?php
-
-require "classes/master.php";
-
-//Get post variables
-if (isset($_POST['args']) || !empty($_POST['args'])) {
-    $requestArray = JSON_decode($_POST['args']);
-} else {
-    die("No input passed!");
-}
-
-$resultArray = array();
-
-foreach ($requestArray as $request) {
-    $type = $request->type;
-
-    if (isset($request->uid)) {
-        $results = $type::get(array("uid" => $request->uid));
-    } else if (isset($request->title)) {
-        $results = $type::get(array("title" => $request->title));
-    }
-
-
-    if (isset($results) && !empty($results) && count($results) > 0) {
-        // Add type property for easier identification in JS.
-        $results[0]->objectType = $type;
-        $resultArray[] = $results[0];
-    } else {
-        $resultArray[] = false; //Insert a false return so that the calling JS code knows when an object is not found
-    }
-}
-
-$output = JSON_encode($resultArray);
-echo $output;
-?>
Index: Dev/branches/jos-branch/index.php
===================================================================
--- Dev/branches/jos-branch/index.php	(revision 264)
+++ 	(revision )
@@ -1,98 +1,0 @@
-<?php
-require 'classes/master.php'; //should be at top of every page
-
-/*  Page still has ambiguous design. Login and Register buttons are at same hierarchy level, makes user suspect the register button works based on input given here.
- *  Instead redirects to anoter page.
- *   
- */
-
-$errorMessage[] = "";
-
-if (isset($_POST['register'])) {
-    if (isset($_POST['username']) && isset($_POST['password'])) {
-        $user_results = User::get(array("name" => $_POST['username']));
-        if (count($user_results) == 0 || !$user_results) {
-            if (strlen($_POST['password']) > 6) {
-                $user = new User(null, $_POST['username'], $_POST['password']);
-                $user->save();
-                $_SESSION['userUid'] = $user->uid;
-            } else {
-                $errorMessage[] = "Password is too short";
-            }
-        }
-        else
-            $errorMessage[] = "Username already exists, try something else!";
-    }
-    else
-        $errorMessage[] = "Please fill in a username and password";
-}
-
-if (isset($_POST['login'])) {   // User clicked the login button
-    $user_results = User::get(array("name" => $_POST['username']));
-    if (isset($user_results[0])) {
-        if ($user_results[0]->password == $_POST['password']) {
-            
-            $_SESSION['userUid'] = $user_results[0]->uid;
-            var_dump($user_results[0]);
-        } else {
-            $errorMessage[] = "Incorrect password!";
-        }
-    } else {
-        $errorMessage[] = "Username doesn't exist!";
-    }
-}
-
-if (isset($_SESSION['userUid'])) {  // User just registered a new account
-    redirect('mainmenu.php');
-}
-?>
-
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <title>Facilitator</title>
-        <?php new StyleSheet("visualeditors"); ?>
-        <script type="text/javascript" src="js/menu.js"></script>
-        <script type="text/javascript">
-        
-    
-
-        </script>
-    </head>
-    <body>
-        <div id="header">
-            <?php new Logo(); ?>
-        </div>
-
-        <div id="wrapper">
-
-            <div id="content">
-                <div class="largeFrame">
-                    <div class="largeTitle">Log in</div>
-                    <div class="content">
-                        <form action="index.php" method="POST">
-                            <h3>Username</h3>
-                            <input type="text" name="username"><br />
-                            <h3>Password</h3>
-                            <input type="password" name="password"><br/><br />
-                            <div id="errorDisplay">
-                                <?php
-                                foreach ($errorMessage as $message) {
-                                    echo "<h3 style='color: #FF0000;'>$message</h3>";
-                                }
-                                ?>
-                            </div>
-                            <br/>
-                            <input type="submit" name="login" class="bigButton vertical" value="Log in">
-                        </form>
-                        <form action="register.php" method="POST">
-                            <input type="submit" name="register" class="bigButton vertical" value="Register" style="margin-bottom: 0.25em;">
-                        </form>
-                    </div>
-
-                </div>
-            </div>
-        </div>
-    </body>
-</html>
Index: Dev/branches/jos-branch/logout.php
===================================================================
--- Dev/branches/jos-branch/logout.php	(revision 264)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<!--
-To change this template, choose Tools | Templates
-and open the template in the editor.
--->
-<?php
-require 'classes/master.php';
-
-session_destroy();
-redirect("index.php");
-?>
Index: Dev/branches/jos-branch/mainmenu.php
===================================================================
--- Dev/branches/jos-branch/mainmenu.php	(revision 264)
+++ 	(revision )
@@ -1,94 +1,0 @@
-<?php
-require 'classes/master.php'; //should be at top of every page
-?>
-
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <title>Facilitator</title>
-        <?php new StyleSheet("visualeditors"); ?>
-        <script type="text/javascript" src="js/generalScripts.js"></script>
-        <script type="text/javascript">
-            function browseSessions() {
-                // This one doesn't use the objectSelector yet. Just redirect to selectSession.php
-                window.location = 'selectSession.php';
-            }
-            
-            function browseSurveys() {
-                var form = ce("form");
-                form.method = "POST";
-                form.action = "selectObject.php";
-                var input1 = ce("input");
-                input1.name = "objectType";
-                input1.value = "Survey";
-                var input2 = ce("input");
-                input2.name = "function";
-                input2.value = "redirEditor";
-                form.appendChild(input1);
-                form.appendChild(input2);
-                form.submit();
-            }
-            
-            function browseQuestions() {
-                var form = ce("form");
-                form.method = "POST";
-                form.action = "selectObject.php";
-                var input1 = ce("input");
-                input1.name = "objectType";
-                input1.value = "Question";
-                var input2 = ce("input");
-                input2.name = "function";
-                input2.value = "redirEditor";
-                form.appendChild(input1);
-                form.appendChild(input2);
-                form.submit();
-            }
-            
-            function browseApplications() {
-                var form = ce("form");
-                form.method = "POST";
-                form.action = "selectObject.php";
-                var input1 = ce("input");
-                input1.name = "objectType";
-                input1.value = "Application";
-                var input2 = ce("input");
-                input2.name = "function";
-                input2.value = "redirEditor";
-                form.appendChild(input1);
-                form.appendChild(input2);
-                form.submit();
-            }
-        </script>
-    </head>
-    <body>
-        <div id="header">
-            <?php new Logo(); ?>
-        </div>
-
-        <div id="wrapper">
-            <div id="content">
-                <div class="largeFrame side" id="adminPanel">
-                    <div class="largeTitle">Administrator</div>
-                    <div class="innerLargeFrame">
-                        <p>Use the below buttons to access, edit and create new sessions and content.</p><br />
-                        <input type="button" class="bigButton vertical" value="Browse Sessions" id="btnBrowseSessions" onClick="browseSessions()" /><br />
-                        <input type="button" class="bigButton vertical" value="Browse Surveys" id="btnBrowseSurveys" onClick="browseSurveys()" /><br />
-                        <input type="button" class="bigButton vertical" value="Browse Questions" id="btnBrowseQuestions" onClick="browseQuestions()" /><br />
-                        <input type="button" class="bigButton vertical" value="Browse Applications" id="btnBrowseApplications" onClick="browseApplications()" /><br />
-
-                    </div>
-                    <div class="controls"></div>
-                </div>
-                <div class="largeFrame side" id="facilitatorPanel">
-                    <div class="largeTitle">Facilitator</div>
-                    <div class="innerLargeFrame">
-                        <p>Use the Start button below to start hosting a session.</p>
-                        <input type="button" class="bigButton vertical" value="Start" id="btnFacStart" onClick="window.location='facpanel.php'" style="margin-top: 0.25em;"/>
-                    </div>
-                    <div class="controls"></div>
-                </div>
-            </div>
-        </div>
-    </body>
-</html>
Index: Dev/branches/jos-branch/questionEditor.php
===================================================================
--- Dev/branches/jos-branch/questionEditor.php	(revision 264)
+++ 	(revision )
@@ -1,72 +1,0 @@
-<?php
-require 'classes/master.php'; //should be at top of every page
-
-if (!isset($_SESSION['userUid'])) {
-    redirect("index.php");
-}
-
-if (!isset($_POST['questionUid']) || empty($_POST['questionUid'])) {
-    redirect("index.php");
-} else {
-    $questionUid = $_POST['questionUid'];
-}
-
-$questions = Question::get(array());    //Get all questions
-?>
-
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <title>Research tool</title>
-        <script type="text/javascript" src="js/generalScripts.js"></script>
-        <script type="text/javascript" src="js/sequencerScripts.js"></script>
-        <script type="text/javascript" src="js/questionEditorScripts.js"></script>
-        <script type="text/javascript">
-            window.onload = loadfn;
-
-            function saveAndReturn_override() {
-                // This should be the override function for the save button on the questionEditor (smallFrame).
-                // It should redirect back to the selectQuestion.php page after the standard questionEditor script saves the changes (or not).
-                alert("DUH!");
-                window.location = "selectQuestion.php";
-            }
-
-            function loadfn() {
-                questionEditor.init();
-                ge("questionEditor_innerFrame").appendChild(questionEditor.element);
-                ge("btnSave").addEventListener("mouseup", saveAndReturn_override, true);
-                request = new Array({
-                  type: "Question",
-                  uid: "<?php echo $questionUid ?>"
-                });
-                
-                var requestString = "args="+JSON.stringify(request);
-                newAjaxRequest(requestString, "getObject.php", function(result){
-                    questionEditor.setValues(result.responseText);
-                }, true);
-                
-            }
-        </script>
-
-        <?php new Stylesheet('visualEditors'); ?>
-    </head>
-    <body>
-        <div id="header">
-            <?php new Logo(); ?>
-        </div>
-        
-        <div id="content">
-            <div id="wrapper">
-                <div id="questionEditor_outer" class="largeFrame">
-                    <div class="largeTitle">Edit Question</div>
-                    <div class="innerLargeFrame" id="questionEditor_innerFrame">
-                    </div>
-                    <div class="controls">
-                        <input type="button" value="???" id="btnSaveQuestion" class="smallButton" onclick="" />
-                    </div>
-                </div>
-            </div>
-        </div>
-    </body>
-</html>
Index: Dev/branches/jos-branch/questionEditor_old.php
===================================================================
--- Dev/branches/jos-branch/questionEditor_old.php	(revision 264)
+++ 	(revision )
@@ -1,53 +1,0 @@
-<?php
-require 'classes/master.php'; //should be at top of every page
-?>
-
-<!--
-To change this template, choose Tools | Templates
-and open the template in the editor.
--->
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <title></title>
-        <script type="text/javascript" src="js/questionEditorScripts.js"></script>
-        <?php new StyleSheet("awesome"); ?>
-    </head>
-    <body>
-        <div id="wrapper">
-            <div id="content">
-                <div id="questionEditor">
-                    <div id="questionEditor_header">
-                        Editing: <span id="header_identifier">#QUESTION-IDENT-NO</span>
-                    </div>
-                    <div id="questionEditor_content">
-                        <h2>Question text:</h2>
-                        <div id="questionEditor_bodyText">
-                            <textarea id="questionEditor_bodyText_textArea" onKeyUp="resizeTextArea();">THIS IS THE QUESTION BODY TEXT. CLICK HERE TO EDIT!</textarea>
-                        </div>
-                        <div id="questionEditor_questionParams" >
-                            <label for="questionIdentifierField" class="formLineBreak">Question tag:</label> <input type="text" id="questionIdentifierField" class="questionParamField" onChange="updateIdentifier();" />
-
-                            <label for="questionType" class="formLineBreak">Answer type:</label>
-                            <select id="questionType" onChange="selectAnswerType();" class="questionParamField">
-                                <option value=""></option>
-                                <option value="int">Integer</option>
-                                <option value="scale">Scale</option>
-                                <option value="choice">Multiple choice</option>
-                                <option value="text">Text</option>
-                            </select>
-
-
-
-                        </div>
-                    </div>
-                    <div id="questionEditor_controls">
-                        <input type="button" id="discard" value="Discard" />
-                        <input type="button" value="Save" />
-                    </div>
-                </div>
-            </div>
-        </div>
-    </body>
-</html>
Index: Dev/branches/jos-branch/questioncreation.php
===================================================================
--- Dev/branches/jos-branch/questioncreation.php	(revision 264)
+++ 	(revision )
@@ -1,35 +1,0 @@
-<?php
-require 'classes/master.php';
-$questionDBI = new QuestionCreationDatabaseInterface();
-/* If a question is saved */
-if(isset($_POST['questionCode']))
-{
-    echo $questionDBI->setQuestionInfo($_POST); // save to DB
-}
-
-$questions = Loader::loadFullQuestions();
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-            <title>Question Database</title>
-            <?php new StyleSheet(); ?>
-    </head>
-    <body>
-        <div id="header">
-            <?php new Logo(); ?>
-        </div>
-        <div id="wrapper">
-
-            <div id="content">
-                <?php var_dump($_POST);      ?>
-                <?php
-                    new QuestionCreationTool($questions);
-                ?>
-            </div>
-        </div>
-    </body>
-</html>
Index: Dev/branches/jos-branch/rdfConstants.php
===================================================================
--- Dev/branches/jos-branch/rdfConstants.php	(revision 264)
+++ 	(revision )
@@ -1,64 +1,0 @@
-<?php
-define("RDFAPI_INCLUDE_DIR", "rdfapi/");
-
-// Constants for defining namespaces, resources, predicates, datatypes, questiontypes for RDF database
-
-// Default namespace for survey tool
-define('SURVEYTOOL_NAMESPACE','http://tbm.tudelft.nl/researchtool/');
-define('SURVEYTOOL_RESOURCES_NAMESPACE',SURVEYTOOL_NAMESPACE . 'resources/');
-define('SURVEYTOOL_PREDICATES_NAMESPACE',SURVEYTOOL_NAMESPACE . 'predicates/');
-
-// Resource used for RDF triples
-define('USER',SURVEYTOOL_RESOURCES_NAMESPACE . 'user');
-define('SURVEY',SURVEYTOOL_RESOURCES_NAMESPACE . 'survey');
-define('QUESTION',SURVEYTOOL_RESOURCES_NAMESPACE . 'question');
-define('APPLICATION',SURVEYTOOL_RESOURCES_NAMESPACE . 'application');
-define('ANSWER', SURVEYTOOL_RESOURCES_NAMESPACE . 'answer');
-define('ANSWERSET', SURVEYTOOL_RESOURCES_NAMESPACE . 'answerset');
-define('SESSION',SURVEYTOOL_RESOURCES_NAMESPACE . 'session');
-define('DASHBOARD',SURVEYTOOL_RESOURCES_NAMESPACE . 'dashboard');
-define('GRAPH',SURVEYTOOL_RESOURCES_NAMESPACE . 'graph');
-define('DATA',SURVEYTOOL_RESOURCES_NAMESPACE . 'data');
-define('RESPONDENT',SURVEYTOOL_RESOURCES_NAMESPACE . 'respondent');
-define('APPDATA',SURVEYTOOL_RESOURCES_NAMESPACE . 'graph');
-define('SESSIONINSTANCE', SURVEYTOOL_RESOURCES_NAMESPACE . 'sessioninstance');
-define('RESULTSET', SURVEYTOOL_RESOURCES_NAMESPACE . 'resultset');
-
-// Predicates used for RDF triples
-define('UID',SURVEYTOOL_PREDICATES_NAMESPACE . 'uid');
-define('NAME',SURVEYTOOL_PREDICATES_NAMESPACE . 'name');
-define('PASSWORD',SURVEYTOOL_PREDICATES_NAMESPACE . 'password');
-define('CREATOR',SURVEYTOOL_PREDICATES_NAMESPACE . 'creator');
-define('TITLE',SURVEYTOOL_PREDICATES_NAMESPACE . 'title');
-define('DESCRIPTION',SURVEYTOOL_PREDICATES_NAMESPACE . 'description');
-define('DATETIME',SURVEYTOOL_PREDICATES_NAMESPACE . 'datetime');
-define('PART_OF',SURVEYTOOL_PREDICATES_NAMESPACE . 'part_of');
-define('STYLE',SURVEYTOOL_PREDICATES_NAMESPACE . 'style');
-define('RTYPE',SURVEYTOOL_PREDICATES_NAMESPACE . 'resource_type');
-define('QTYPE',SURVEYTOOL_PREDICATES_NAMESPACE . 'question_type');
-define('QCODE',SURVEYTOOL_PREDICATES_NAMESPACE . 'question_code');
-define('ANSWERED',SURVEYTOOL_PREDICATES_NAMESPACE . 'answered');
-define('QCATEGORY',SURVEYTOOL_PREDICATES_NAMESPACE . 'question_category');
-define('HAS_QUESTION',SURVEYTOOL_PREDICATES_NAMESPACE . 'has_question');
-define('HAS_ANSWER',SURVEYTOOL_PREDICATES_NAMESPACE . 'has_answer');
-define('HAS_GRAPH',SURVEYTOOL_PREDICATES_NAMESPACE . 'has_graph');
-define('HAS_PROCESS',SURVEYTOOL_PREDICATES_NAMESPACE . 'has_process');
-define('INDEX',SURVEYTOOL_PREDICATES_NAMESPACE . 'index');
-define('GRAPH_TYPE',SURVEYTOOL_PREDICATES_NAMESPACE . 'graph_type');
-define('HAS_DATA',SURVEYTOOL_PREDICATES_NAMESPACE . 'has_data');
-define('DATA_TYPE',SURVEYTOOL_PREDICATES_NAMESPACE . 'data_type');
-define('FOR_SURVEY',SURVEYTOOL_PREDICATES_NAMESPACE . 'for_survey');
-define('BY_RESPONDENT',SURVEYTOOL_PREDICATES_NAMESPACE . 'by_respondent');
-define('GIVEN_ANSWER',SURVEYTOOL_PREDICATES_NAMESPACE . 'given_answer');
-define('HAS_APPLICATION', SURVEYTOOL_PREDICATES_NAMESPACE . 'has_application');
-define('HAS_SURVEY', SURVEYTOOL_PREDICATES_NAMESPACE . 'has_survey');
-define('HAS_ANSWERSET', SURVEYTOOL_PREDICATES_NAMESPACE . 'has_answerset');
-define('LOCATION', SURVEYTOOL_PREDICATES_NAMESPACE . 'location');
-define('FACILITATOR', SURVEYTOOL_PREDICATES_NAMESPACE . 'facilitator');
-define('STARTTIME', SURVEYTOOL_PREDICATES_NAMESPACE . 'starttime');
-define('ENDTIME', SURVEYTOOL_PREDICATES_NAMESPACE . 'endtime');
-define('HAS_NOTE', SURVEYTOOL_PREDICATES_NAMESPACE . 'has_note');
-define('OF_SESSION', SURVEYTOOL_PREDICATES_NAMESPACE . 'of_session');
-define('HAS_RESULTSET', SURVEYTOOL_PREDICATES_NAMESPACE . 'has_resultset');
-define('CREATIONDATE', SURVEYTOOL_PREDICATES_NAMESPACE . 'creationdate');
-?>
Index: Dev/branches/jos-branch/register.php
===================================================================
--- Dev/branches/jos-branch/register.php	(revision 264)
+++ 	(revision )
@@ -1,33 +1,0 @@
-<?php require 'classes/master.php'; //should be at top of every page     ?>
-
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <title>Facilitator</title>
-        <?php new StyleSheet("visualEditors"); ?>
-        <script type="text/javascript" src="js/menu.js"></script>
-    </head>
-    <body>
-        <div id="header">
-            <?php new Logo(); ?>
-        </div>
-
-        <div id="wrapper">
-            <div id="content">
-                <div class="largeFrame">
-                    <div class="largeTitle">Register new user</div>
-                    <div class="content">
-                        <form action="index.php" method="POST"><br/>
-                            <h3>Username</h3>
-                            <input type="text" name="username"><br/>
-                            <h3>Password</h3>
-                            <input type="password" name="password"><br/><br/>
-                            <input type="submit" name="register" class="bigSurveyButton surveyButton" value="Register">
-                        </form>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </body>
-</html>
Index: Dev/branches/jos-branch/returnObjectDisplay.php
===================================================================
--- Dev/branches/jos-branch/returnObjectDisplay.php	(revision 264)
+++ 	(revision )
@@ -1,40 +1,0 @@
-<?php
-
-require 'classes/master.php';
-
-/*
- * Note: do not try to implement info panel displays in this file as well, it passes and queries a lot of data that you really do not need.
- * Since this function will be used so often, adding extra unneeded code to it will slow down the regular operation of the editor (refreshes, etc..) while not offering a significant advantage over the existing getInfo.php
- */
-
-
-if (isset($_POST['args']) && !empty($_POST['args'])) {
-    // Get arguments and convert to object
-    $input = $_POST['args'];
-    $requestArray = json_decode($input);
-} else {
-    die('DOESNT WORK...');
-}
-
-$outputArray = array();
-foreach ($requestArray as $request) {
-
-    $type = $request->type;
-    $results = $type::get(array("uid" => $request->uid));
-    
-    if (isset($results) && !empty($results)) {
-        is_array($results) ? $object = $results[0] : $object = $results;
-        if ($object->evaluate()) {
-            $object->ObjectType = $type;
-            $outputArray[] = $object;
-        }
-    }
-    // We now have the targeted object loaded in memory
-    // First add all shared properties
-}
-
-// Encode the output array in JSON format, then send back to the client
-if (!empty($outputArray)) {
-    echo JSON_encode($outputArray);
-}
-?>
Index: Dev/branches/jos-branch/saveSurvey.php
===================================================================
--- Dev/branches/jos-branch/saveSurvey.php	(revision 264)
+++ 	(revision )
@@ -1,44 +1,0 @@
-<?php
-
-require 'classes/master.php';
-
-// Quit if no arguments have been passed.
-if (!isset($_POST['args'])) {
-    if (empty($_POST['args'])) {
-        die("Error! No arguments passed!");
-    }
-}
-
-$args = json_decode($_POST['args']);
-if ($args == false) {
-    die("Error decoding JSON arguments!");
-}
-
-// At this point we know we have arguments in the POST data.
-// Query the survey object from the database.
-
-$survey_results = Survey::get(array("uid" => $args->uid));
-if (!empty($survey_results)) {
-    $survey = $survey_results[0];
-} else {
-    die("No survey found!");
-}
-
-$question->questions = array();
-foreach ($args->questions->uids as $questionUid) {
-    $question_results = Question::get(array("uid"=>$questionUid));
-    $question = $question_results[0];
-    $survey->questions[] = $question;
-}
-
-// The next part is a rather experimental way of automatically writing all passed arguments to the session object.
-// If this does not work properly, we should write the "write title to session->title" call by hand.
-/*
-  foreach ($args as $key=>$value) {
-  $session->$key = $value;
-  }
- */
-//var_dump($survey);
-// Do I need to check if this is done before proceeding?
-$survey->save();
-?>
Index: Dev/branches/jos-branch/savesession.php
===================================================================
--- Dev/branches/jos-branch/savesession.php	(revision 264)
+++ 	(revision )
@@ -1,45 +1,0 @@
-<?php
-
-require 'classes/master.php'; //should be at top of every page
-
-/*
- * Dit kan een STUK sneller. Vervang gewoon de hele pipeline string met de lokale versie.
- * Daarna: $session->eval
- */
-
-if (isset($_POST['uids']) && isset($_POST['types']) && isset($_POST['sessionUid'])) {
-    if (!empty($_POST['uids']) && !empty($_POST['types']) && !empty($_POST['sessionUid'])) {
-        // user has passed a pipeline/type string from javascript in order to save the session.
-        $uids = explode(",", $_POST['uids']);
-        $types = explode(",", $_POST['types']);
-
-        $sessionUid = $_POST['sessionUid'];
-        $session_results = Session::get(array("uid" => $sessionUid));
-        if (count($session_results) > 0) {
-            $session = $session_results[0];
-        } else {
-            echo "!!!!!!!!!!!!!!!!!!!!!!NO SESSION FOUND!!!!!!!!!!!!!!!!!!!!";
-            die();
-        }
-        if (count($uids) == count($types)) {
-            $count = count($uids);
-        } else {
-            echo "!!!!!!!!!!!!!!!!!NON MATCHING ARGUMENTS PASSED!!!!!!!!!!!!!!!";
-            die();
-        }
-
-        $session->pipeline = array();
-        for ($i = 0; $i < $count; $i++) {
-            $type = $types[$i];
-            $results = $type::get(array("uid" => $uids[$i]));
-            if (count($results) > 0) {
-                $result = $results[0];
-            }
-            $session->pipeline[] = $result;
-        }
-
-        $session->save();
-        //var_dump($session);
-    }
-}
-?>
Index: Dev/branches/jos-branch/selectObject.php
===================================================================
--- Dev/branches/jos-branch/selectObject.php	(revision 264)
+++ 	(revision )
@@ -1,109 +1,0 @@
-<?php
-require 'classes/master.php'; //should be at top of every page
-
-if (!isset($_SESSION['userUid'])) {
-    redirect("index.php");
-}
-
-if (isset($_POST['objectType']) && isset($_POST['function'])) {
-    if (!empty($_POST['objectType']) && !empty($_POST['function'])) {
-        $objectType = $_POST['objectType'];
-        $function = $_POST['function'];
-    }
-    else
-        die("Empty!");
-} else
-    die("No input!");
-
-$objects = $objectType::get(array());
-?>
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <title></title>
-        <?php new Stylesheet("visualeditors"); ?>
-        <script type="text/javascript" src="js/generalScripts.js"></script>
-        <script type="text/javascript">
-            function redirEditor(uid, type) {
-                // Function to select the object and post the uid to the relevant object editor
-                // Question = stand-alone questionEditor
-                // Survey = surveyEditor.php
-                // Session = sessionEditor.php
-                // Application = applicationEditor.php
-                // Dashboard = N/A, dashboards currently cannot be stored
-                var form = ce("form");
-                form.method = "POST";
-                var input = ce("input");
-                input.type = "hidden";
-                input.value = uid;
-                form.appendChild(input);
-                
-                
-                switch (type.toLowerCase()) {
-                    case "question":
-                        form.action = "questionEditor.php";
-                        input.name = "questionUid";
-                        break;
-                    case "survey":
-                        form.action = "surveyEditor.php";
-                        input.name = "objectUid";
-                        break;
-                    case "session":
-                        // SessionsEditor input structure is not consistent with the others. Should be changed in next version ASAP!
-                        break;
-                    case "application":
-                        form.action = "applicationEditor.php";
-                        input.name = "applicationUid";
-                        break;
-                    default:
-                        return false;
-                        break;
-                }
-                
-                form.submit();
-            }
-        
-            function redirInsert(uid, type) {
-                // Function to select the object and post the uid to the editor that it can be insert into.
-                // Question = Survey editor
-                // Application/Survey = Session Editor
-                // Session = N/A, should use redirEditor instead!
-                var form = ce("form");
-                form.method = "POST";
-                var input = ce("input");
-                input.type = "hidden";
-                input.value = uid;
-                form.appendChild(input);
-            }
-        
-        
-        
-        </script>
-    </head>
-    <body>
-        <div id="header">
-            <?php new Logo(); ?>
-        </div>
-
-        <div id="content">
-            <div id="wrapper">
-                <div id="objectSelector" class="largeFrame">
-                    <div class="largeTitle">Browse <?php echo $objectType; ?>s</div>
-                    <div class="content">
-                        <select size="15" id="objectSelectBox" style="width: 350px;">
-                            <?php
-                            foreach ($objects as $object) {
-                                echo "<option value='" . $object->uid . "'>" . $object->title . "</option>";
-                            }
-                            ?>
-                        </select>
-                    </div>
-                    <div class="controls">
-                        <input type="button" value="Edit" id="btnEdit" class="smallButton" onclick="<?php echo $function; ?>(ge('objectSelectBox').value, '<?php echo $objectType; ?>');" />
-                    </div>
-                </div>
-            </div>
-        </div>
-    </body>
-</html>
Index: Dev/branches/jos-branch/selectQuestion.php
===================================================================
--- Dev/branches/jos-branch/selectQuestion.php	(revision 264)
+++ 	(revision )
@@ -1,59 +1,0 @@
-<?php
-require 'classes/master.php'; //should be at top of every page
-
-if (!isset($_SESSION['userUid'])) {
-    redirect("index.php");
-}
-
-$questions = Question::get(array());    //Get all questions
-?>
-
-
-
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <title>Research tool</title>
-        <?php new Stylesheet("visualeditors"); ?>
-        <script type="text/javascript" src="js/generalScripts.js"></script>
-        <script type="text/javascript">
-            function invokeSingleQuestionEditor(uid) {
-                var form = ce("form");
-                form.method = "POST";
-                form.action = "questionEditor.php";
-                var input = ce("input");
-                input.type="hidden";
-                input.name="questionUid";
-                input.value = uid;
-                form.appendChild(input);
-                form.submit();
-            }
-        </script>
-    </head>
-    <body>
-        <div id="header">
-            <?php new Logo(); ?>
-        </div>
-
-        <div id="content">
-            <div id="wrapper">
-                <div id="questionSelector" class="largeFrame">
-                    <div class="largeTitle">Browse questions</div>
-                    <div class="content">
-                        <select size="15" id="questionSelectBox" style="width: 350px;">
-                            <?php
-                            foreach ($questions as $question) {
-                                echo "<option value='" . $question->uid . "'>" . $question->title . "</option>";
-                            }
-                            ?>
-                        </select>
-                    </div>
-                    <div class="controls">
-                        <input type="button" value="Edit" id="btnEditQuestion" class="smallButton" onclick="invokeSingleQuestionEditor(ge('questionSelectBox').value)" />
-                    </div>
-                </div>
-            </div>
-        </div>
-    </body>
-</html>
Index: Dev/branches/jos-branch/selectSession.php
===================================================================
--- Dev/branches/jos-branch/selectSession.php	(revision 264)
+++ 	(revision )
@@ -1,176 +1,0 @@
-<?php
-require 'classes/master.php'; //should be at top of every page
-
-if (!isset($_SESSION['userUid'])) {
-    redirect("index.php");
-}
-
-if (isset($_SESSION['message'])) {
-    echo $_SESSION['message'];
-    unset($_SESSION['message']);
-}
-
-if (isset($_POST['createSession'])) {
-    //check if name is set
-    if (isset($_POST['newSessionName'])) {
-        // check if name is available
-        if (!empty($_POST['newSessionName'])) {
-            $session_results = Session::get(array("title" => $_POST['newSessionName']));
-            if (count($session_results) == 0) {
-                // make new session!
-                unset($session_results);
-                $creators = User::get(array("uid" => $_SESSION['userUid']));
-                $creator = $creators[0];
-                $session = new Session(null, $_POST['newSessionName'], $creator, new DateTime(), null, null);
-                $session->save();
-            } else {
-                $errorMessage[] = "A session with the name " . $_POST['newSessionName'] . " already exists!";
-            }
-        }
-    } else {
-        $errorMessage[] = "Please enter a name for the new session!";
-    }
-}
-
-if (isset($_POST['deleteSession'])) {
-    if (isset($_POST['sessionUID'])) {
-        //Kan de database al objecten verwijderen?
-    }
-}
-
-if (isset($_POST['editSession'])) {
-    var_dump($_POST);
-    if (isset($_POST['sessionUid'])) {
-        $session_results = Session::get((array("uid" => $_POST['sessionUid'])));
-        var_dump($session_results);
-        if (count($session_results) == 1 && $session_results[0] != null) {
-            // DEZE SESSION MOET UITEINDELIJK EEN POST WORDEN, WANNEER DEZE HELE PAGINA IS OVERGEZET IN JAVASCRIPT!
-            $_SESSION['currentSession'] = $_POST['sessionUid'];
-            $_SESSION['updateNeeded'] = "true";
-            redirect("sessionEditor.php");
-        }
-    }
-}
-
-//Get available sessions for current user
-//$sessions = $dbi->get("Session", array("creator"=>$_SESSION['username']));  //This does not work, session.php does not yet have a property 'creator'
-$sessions = Session::get(array());  // Let's just load everything then...
-?>
-
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <title>Select a session</title>
-        <?php new StyleSheet("visualeditors"); ?>
-        <script type="text/javascript" src="js/sequencerScripts.js"></script>
-        <script type="text/javascript" src="js/generalScripts.js"></script>
-        <script type="text/javascript">
-            function sendToEditor() {
-                debugger;
-                var uid = ge('objectUid').value;
-                if (uid.length == 32) {
-                    // A valid uid has actually been passed
-                    var form = ce("form");
-                    form.method = "POST";
-                    form.action = "sessionEditor.php";
-                    var input = ce("input");
-                    input.name = "objectUid";
-                    input.value = uid;
-                    form.appendChild(input);
-                    form.submit();
-                }
-            }
-            
-            function createNewSession() {
-                //debugger;
-                var desiredName = ge('newSessionName').value;
-                if (desiredName.length < 1) return;
-                var request = Array({
-                    type: "Session",
-                    title: desiredName
-                });
-                var requestString = "args="+JSON.stringify(request);
-                newAjaxRequest(requestString, "getObject.php", function(result){
-                    debugger;
-                    console.log(result.responseText);
-                    var session = JSON.parse(result.responseText)[0];
-                    if (session != false) {
-                        alert("Session with that name already exists. Please choose a different name.");
-                    }
-                    else {
-                        var requestString = "objectToCreate=Session&newSessionName="+desiredName;
-                        
-                        newAjaxRequest(requestString, "createObject.php", function(result){
-                            var objectUid = result.responseText;
-                            if (objectUid.length != 32) return;
-                            var form = ce("form");
-                            form.method = "POST";
-                            form.action = "sessionEditor.php";
-                            var input = ce("input");
-                            input.value = objectUid;
-                            input.name = "objectUid";
-                            form.appendChild(input);
-                            form.submit();
-                        },false);
-                    }
-                }, false);
-            }
-        </script>
-    </head>
-    <body>
-        <div id="header">
-            <?php new Logo(); ?>
-        </div>
-
-        <div id="wrapper">
-            <div id="content">
-                <div class="largeFrame" id="sessionSelector" style="width: 400px;">
-                    <div class="largeTitle">Select session</div>
-                    <div class="content">
-                        <form action="selectSession.php" method="POST">
-                            <div style="float: left; clear: left;">
-                                <select id ="objectUid" name="objectUid" style="float: left;" onChange="ajaxInfoRequest(this.value, document.getElementById('infoPanelContent'), 'Session');">
-                                    <option value="" disabled="true" selected>Please select a session</option>
-                                    <?php
-                                    foreach ($sessions as $session) {
-                                        $selected = "";
-                                        if ($session->title == $_POST['newSessionName']) {
-                                            $selected = ' selected="true"';
-                                        }
-
-                                        echo '<option value="' . $session->uid . '"' . $selected . '>' . $session->title . '</option>' . "\n";
-                                    }
-                                    ?>                    
-                                </select>
-                                <input type="hidden" name="updateNeeded" value="true" />
-                                <input type="text" id="newSessionName" name="newSessionName" value="Name..." style="float: left; clear: left;" /><br />
-                            </div>
-                            <div style="float: left; clear: none;">
-                                <input type="button" onclick="createNewSession();" name="createSession" value="Create new session" class="smallButton vertical" style="float: left;" />
-                                <input type="button" name="editSession" value="Edit session" class="smallButton vertical" style="float: left;" onclick="sendToEditor();" />
-                                <input type="submit" name="deleteSession" value="Delete session" class="smallButton vertical" style="float: left;" />
-                            </div>
-                            <div id="errorDisplay"><?php
-                                    if (isset($errorMessage)) {
-                                        foreach ($errorMessage as $message) {
-                                            echo $message;
-                                        }
-                                    }
-                                    ?>
-                            </div>
-                    </div>
-                </div>
-
-                <div id="sessionInfoPanel" class="largeFrame" style="margin-top: 10px; width: 400px; height: 100px;">
-                    <div class="largeTitle">Info</div>
-                    <div id="infoPanelContent" class="content" style="float: left; clear: left;">
-                    </div>
-                </div>
-                </form>
-            </div>
-        </div>
-    </div>
-</div>
-</body>
-</html>
Index: Dev/branches/jos-branch/sessionEditor.php
===================================================================
--- Dev/branches/jos-branch/sessionEditor.php	(revision 264)
+++ 	(revision )
@@ -1,46 +1,0 @@
-<?php
-require 'classes/master.php'; //should be at top of every page
-
-if (!isset($_SESSION['userUid'])) {
-    redirect('index.php');
-}
-
-$sequencer = new SessionEditorWidget();
-$sequencer->LoadSession(); //load session into php part of the sequencer
-$sequencer->HandlePostData();
-?>
-
-<!--
-To change this template, choose Tools | Templates
-and open the template in the editor.
--->
-<!DOCTYPE html>
-
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <title></title>
-        <?php
-        new StyleSheet("visualeditors");
-        $sequencer->Javascript();
-        ?>
-
-    </head>
-    <body>
-        <div id="header">
-            <?php new Logo(); ?>
-        </div>
-
-        <div id="wrapper">
-            <div id="content">
-                <?php $sequencer->init(); ?>
-                <?php $toolbox = new Toolbox(); ?>
-                <?php new PipelineInfoPanel(); ?>
-            </div>
-        </div>
-        <div id="settingsFields">
-            <input type="hidden" id="sContentTypeField" value="session" />
-        </div>
-
-    </body>
-</html>
Index: Dev/branches/jos-branch/sessioncreation.php
===================================================================
--- Dev/branches/jos-branch/sessioncreation.php	(revision 264)
+++ 	(revision )
@@ -1,41 +1,0 @@
-<?php
-require 'classes/master.php';
-
-if (is_null($_SESSION['username']))
-    redirect('index.php');
-
-/* LOAD SURVEY */
-if (isset($_POST['UID'])) {
-    $sessionID = $_POST['UID'];
-    $sessionDBI = new SessionCreationDatabaseInterface($sessionID);
-    $info = $sessionDBI->getSessionInfo();
-}
-
-$session = Session::getSession($_POST);
-?>
-
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-            <title>Session Creation</title>
-            <?php new StyleSheet(); ?>
-    </head>
-    <body>
-        <div id="header">
-            <?php new Logo(); ?>
-        </div>
-        <div id="wrapper">
-
-            <div id="content">
-                <?php
-                    new SessionCreationTool($session);
-                ?>
-            </div>
-        </div>
-    </body>
-</html>
Index: Dev/branches/jos-branch/setQuestion.php
===================================================================
--- Dev/branches/jos-branch/setQuestion.php	(revision 264)
+++ 	(revision )
@@ -1,37 +1,0 @@
-<?php
-
-require 'classes/master.php'; //should be at top of every page
-
-if (isset($_POST['args']) && !empty($_POST['args'])) {
-    $input = JSON_decode($_POST['args']) or die("Invalid input!");
-} else {
-    die("No or invalid input!");
-}
-
-if (isset($input->uid) && $input->uid != null) {
-    // This concerns an edit of an existing question, not creation of a new one.
-    $question_results = Question::get(array("uid" => $input->uid));
-    if (!empty($question_results)) {
-        $question = $question_results[0];
-    } else {
-        die("Error: attempt to edit a non-existing database object!");
-    }
-    
-    if ($input->answerType) $question->type = $input->answerType;
-    if ($input->code) $question->code = $input->code;
-    if ($input->title) $question->title = $input->title;
-    if ($input->description) $question->description = $input->description;
-    if (isset($input->category) ) $question->category = null;
-    if (isset($input->answers)) $question->answers = null;
-    $question->save();
-    $outputArray = array("created"=>false, "uid"=>$question->uid);
-    echo JSON_encode($outputArray);
-}
-else {
-// Obviously, this call does not save most of the data entered into the question Editor, because the database has not place to store these values as of yet.
-    $question = new Question(null, $input->code, $input->title, $input->answerType, $input->description, null, null);
-    $question->save();
-    $outputArray = array("created"=>true, "uid"=>$question->uid);
-    echo JSON_encode($outputArray);
-}
-?>
Index: Dev/branches/jos-branch/submitsurvey.php
===================================================================
--- Dev/branches/jos-branch/submitsurvey.php	(revision 264)
+++ 	(revision )
@@ -1,6 +1,0 @@
-<?php 
-require 'classes/master.php';
-
-var_dump($_POST);
-
-?>
Index: Dev/branches/jos-branch/survey.php
===================================================================
--- Dev/branches/jos-branch/survey.php	(revision 264)
+++ 	(revision )
@@ -1,47 +1,0 @@
-<?php
-require 'classes/master.php';
-
-    //var_dump($_POST);
-    
-if (is_null($_SESSION['username']))
-    redirect('index.php');
-
-if (isset($_GET['id']))
-{
-    $surveyID = $_GET['id'];
-
-    $surveyDBI = new SurveyAnswerDatabaseInterface($surveyID,'123','321');
-    $info = $surveyDBI->getSurveyInfo();
-    $surveyDBI->setRespondentInfo($_SESSION);
-    $surveyDBI->setSurveyAnswers($_POST);
-
-    $savedSurvey = Survey::getSurvey($info);
-    
-    var_dump($_POST);
-}
-else
-    redirect('index.php');
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-            <title>Survey</title>
-            <?php new StyleSheet(); ?>
-            <script type="text/javascript" src="js/menu.js"></script>
-    </head>
-
-    <body>
-        <div id="header">
-            <?php new Logo(); ?>
-        </div>
-
-        <div id="wrapper">
-            <div id="content">
-                <?php new SurveyTool($savedSurvey); ?>
-            </div>
-        </div>
-    </body>
-</html>
Index: Dev/branches/jos-branch/surveyEditor.php
===================================================================
--- Dev/branches/jos-branch/surveyEditor.php	(revision 264)
+++ 	(revision )
@@ -1,35 +1,0 @@
-<?php
-require "classes/master.php";
-
-$surveyEditor = new surveyEditorWidget();
-$surveyEditor->handlePost();
-?>
-
-<!--
-To change this template, choose Tools | Templates
-and open the template in the editor.
--->
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <title>Edit survey</title>
-        <?php
-        $surveyEditor->javascript();
-        new StyleSheet("visualeditors");
-        ?>
-    </head>
-    <body>
-        <div id="header">
-            <?php new Logo(); ?>
-        </div>
-        <div id="wrapper">
-            <div id="content">
-                <?php $surveyEditor->init(); ?>
-            </div>
-            <div id="settingsFields">
-                <input type="hidden" id="sContentTypeField" value="Survey" />
-            </div>
-        </div>
-    </body>
-</html>
Index: Dev/branches/jos-branch/surveycreation.php
===================================================================
--- Dev/branches/jos-branch/surveycreation.php	(revision 264)
+++ 	(revision )
@@ -1,81 +1,0 @@
-<?php
-require 'classes/master.php';
-
-if (is_null($_SESSION['username']))
-    redirect('index.php');
-
-if (isset($_POST['submit'])) {
-    if (isset($_POST['surveyName'])) {
-        $survey = new Survey(null, $_POST['surveyName'], "Thijs", null);
-        $dbi = new DatabaseInterface();
-        $dbi->set($survey);
-    }
-}
-
-
-
-
-/*
-  $savedSurvey = null;
-  $timeStamp = null;
- */
-
-/* LOAD SURVEY */
-/*
-  if (isset($_POST['UID'])) {
-  $surveyID = $_POST['UID'];
-  $surveyDBI = new SurveyCreationDatabaseInterface($surveyID);
-  $info = $surveyDBI->getSurveyInfo();
-
-  $savedSurvey = Survey::getSurvey($info);
-  }
- */
-/* AUTOSAVE */
-
-/*
-  else if (isset($_POST['timeStamp'])) {
-  $timeStamp = $_POST['timeStamp'];
-
-  echo 'This is what gets sent:';
-  var_dump($_POST);
-  echo '<br/><br/>';
-  $surveyDBI = new SurveyCreationDatabaseInterface($_POST['surveyID']);
-  $surveyDBI->setSurveyInfo($_POST,$_SESSION);
-  $info = $surveyDBI->getSurveyInfo();
-  echo '<br/><br/>';
-  echo 'This is what I get back:';
-  var_dump($info);
-
-  $savedSurvey = Survey::getSurvey($info);
-  }
-
- */
-?>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <title>Survey Creation</title>
-        <?php new StyleSheet("awesome"); ?>
-    </head>
-    <body>
-        <div id="header">
-            <?php new Logo(); ?>
-        </div>
-        <div id="wrapper">
-
-            <div id="content">
-                <form action="surveycreation.php" method="post">
-                    <fieldset>
-                    Name: <input type="text" name="surveyName" /><br />
-                    Uid: <input type="text" name="surveyID" /><br /><br />
-                    <input type="submit" name="submit" value="Make fake survey!" />
-                    </fieldset>
-                </form>
-            </div>
-        </div>
-    </body>
-</html>
Index: Dev/branches/jos-branch/testpage.php
===================================================================
--- Dev/branches/jos-branch/testpage.php	(revision 264)
+++ 	(revision )
@@ -1,8 +1,0 @@
-<?php
-    require 'classes/master.php';
-	$result = SessionInstance::get(array());
-	$sessionInstance = $result[0];
-	$sessionInstance->evaluate();
-	print_r($sessionInstance);
-
-?>
