Merge remote-tracking branch 'origin/develop'

.gitignore

@@ -22,4 +22,7 @@ USER-FILES/
 library/Xerte/Authentication/Saml2/settings.php
 
 #ignore tsugi folder (if installed)
-tsugi/
+tsugi/
+
+#ignore lrsdb_config.php
+lrsdb_config.php

catalog.php

@@ -40,13 +40,13 @@
 
 function require_auth() {
     global $xerte_toolkits_site;
-
+#TODO use hash for authentication
     header('Cache-Control: no-cache, must-revalidate, max-age=0');
     $has_supplied_credentials = !(empty($_SERVER['PHP_AUTH_USER']) && empty($_SERVER['PHP_AUTH_PW']));
     $is_not_authenticated = (
         !$has_supplied_credentials ||
         $_SERVER['PHP_AUTH_USER'] != $xerte_toolkits_site->admin_username ||
-        $_SERVER['PHP_AUTH_PW']   != $xerte_toolkits_site->admin_password);
+        hash('sha256', $_SERVER['PHP_AUTH_PW'])   != $xerte_toolkits_site->admin_password);
     if ($is_not_authenticated) {
         header('HTTP/1.1 401 Authorization Required');
         header('WWW-Authenticate: Basic realm="Access denied"');

config.php

@@ -252,6 +252,14 @@
     $xerte_toolkits_site->altauthentication = "";
 }
 
+/* Set flag of whether oai-pmh harvesting is configured and available */
+$xerte_toolkits_site->oai_pmh = file_exists($xerte_toolkits_site->root_file_path . "oai-pmh/oai_config.php");
+
+if (file_exists(dirname(__FILE__) . '/lrsdb_config.php'))
+{
+    require_once(dirname(__FILE__) . '/lrsdb_config.php');
+}
+
 if(!isset($tsugi_disable_xerte_session) || $tsugi_disable_xerte_session !== true)
 {
     if($xerte_toolkits_site->authentication_method == "Moodle") {

edit.php

@@ -44,7 +44,7 @@
 function update_access_time($row_edit){
     global $xerte_toolkits_site;
     /* This function is called even if the template is new - in which case it fails as a record doesn't exist */
-    db_query("UPDATE {$xerte_toolkits_site->database_table_prefix}templatedetails SET date_accessed=? WHERE template_id = ?", array(date('Y-m-d'), $row_edit['template_id']));
+    db_query("UPDATE {$xerte_toolkits_site->database_table_prefix}templatedetails SET date_accessed=? WHERE template_id = ?", array(date('Y-m-d H:i:s'), $row_edit['template_id']));
     return true;
 }
 

edithtml.php

@@ -46,7 +46,7 @@
 function update_access_time($row_edit){
     global $xerte_toolkits_site;
     /* This function is called even if the template is new - in which case it fails as a record doesn't exist */
-    db_query("UPDATE {$xerte_toolkits_site->database_table_prefix}templatedetails SET date_accessed=? WHERE template_id = ?", array(date('Y-m-d'), $row_edit['template_id']));
+    db_query("UPDATE {$xerte_toolkits_site->database_table_prefix}templatedetails SET date_accessed=? WHERE template_id = ?", array(date('Y-m-d H:i:s'), $row_edit['template_id']));
     return true;
 }
 

editor/css/complex.css

@@ -680,7 +680,7 @@ select, input, textarea
     padding: 4px;
 }
 
-#mainPanel select,  #mainPanel textarea {
+#mainPanel select,  #mainPanel textarea{
     /* background: #ececed; */
     background: #fff;
    /* border-radius: 4px;*/
@@ -689,6 +689,14 @@ select, input, textarea
     box-sizing: border-box;
 }
 
+#mainPanel form{
+	display: flex;
+}
+
+#mainPanel input[name=fileToUpload]{
+	flex-grow: 1;
+}
+
 #mainPanel select.deprecated {
 	width: 95%;
 }
@@ -710,6 +718,11 @@ select, input, textarea
 {
     width: 100%;
 }
+
+.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {
+	background: #FDF5C7;
+}
+
 table.wizard, table.wizardgroup_table{
     vertical-align: middle;
     width: 100%;
@@ -727,6 +740,10 @@ td.wizardlabel {
     min-width: 155px;
 }
 
+.wizardgroup .column_table td.wizardlabel {
+	/*min-width: auto;*/
+}
+
 td.wizardvalue {
 }
 
@@ -742,12 +759,12 @@ fieldset.wizardgroup.collapsed {
 	border-top-color: #ccc;
 }
 
-fieldset.wizardgroup legend {
+fieldset.wizardgroup legend.noindent {
 	padding-right: 10px;
 	cursor: pointer;
 }
 
-fieldset.wizardgroup.wizardoptional legend {
+fieldset.wizardgroup.wizardoptional legend.noindent {
 	margin-left: -17px;
 }
 
@@ -1114,6 +1131,9 @@ div#bottom_buttons .xerte-icon,  div#top_buttons .xerte-icon {cursor: pointer;}
 #mergeGlossaryCheck, #pages {
 	margin-left: 15px;
 }
+#overwriteGlossaryCheck, #pages {
+	margin-left: 30px;
+}
 #merge_button_icon {
 	height: 17px;
 	padding-bottom:1px;
@@ -1370,6 +1390,12 @@ div.hotspot360Icon span.icon360Holder .icon360 {
 	cursor: default;
 }
 
+[data-cke-editorplaceholder]::before {
+	padding: 4px;
+	overflow: hidden;
+	height: 1.2em;
+}
+
 /* start of xertecss.css
 
 body {background: #b3b3b5; padding-bottom: 30px;}

editor/importpages/import-choose.php

@@ -144,7 +144,8 @@
         <div id="content" class="content">
                 <div id="mergeGlossary">
                     <div class="merge_title"><?php echo GLOSSARY;?></div>
-                    <div><label><input type="checkbox" id="mergeGlossaryCheck"><?php echo MERGE_GLOSSARY;?></label></div>
+                    <div><label><input type="checkbox" id="mergeGlossaryCheck" onclick="this.checked ? getElementById('overwriteGlossaryCheck').disabled = false : (getElementById('overwriteGlossaryCheck').disabled = true , getElementById('overwriteGlossaryCheck').checked = false) "><?php echo MERGE_GLOSSARY;?></label></div>
+                    <div><label><input type="checkbox" id="overwriteGlossaryCheck" disabled ><?php echo OVERWRITE_GLOSSARY;?></label></div>
                 </div>
                 <div class="merge_title"><?php echo PAGES;?></div>
                 <div id="pages">

editor/importpages/merge.php

@@ -8,7 +8,7 @@
 
 require( "../../" . $xerte_toolkits_site->php_library_path . "xmlInspector.php" );
 
-function merge_pages_to_project($source_project_id, $source_pages, $target_project, $target_page_location, $merge_glossary)
+function merge_pages_to_project($source_project_id, $source_pages, $target_project, $target_page_location, $merge_glossary, $overwrite_glossary)
 {
 	global $xerte_toolkits_site;
 
@@ -42,7 +42,6 @@ function merge_pages_to_project($source_project_id, $source_pages, $target_proje
 
 	$filemapping = getFileMapping($source_folder . "/media", $target_folder . "/media");
     $filesToCopy = array();
-
 	if($merge_glossary === "true")
 	{
 		$str_glossary = $xmlSource->documentElement->getAttribute("glossary");
@@ -53,11 +52,27 @@ function merge_pages_to_project($source_project_id, $source_pages, $target_proje
 		{
 			$orig_glossary = $xmlTarget->documentElement->getAttribute("glossary");
 		}
-		if($orig_glossary != "")
-		{
-			$orig_glossary .= "||";
-		}
-		$orig_glossary .= $str_glossary;
+        if ($overwrite_glossary === "false") {
+            if ($orig_glossary != "") {
+                $orig_glossary .= "||";
+            }
+            $orig_glossary .= $str_glossary;
+        } else {
+            if ($orig_glossary === "") {
+                $orig_glossary .= $str_glossary;
+            } else {
+                $orig_gloss_array = glossaryToArray($orig_glossary);
+                $str_gloss_array = glossaryToArray($str_glossary);
+                $doubles = array_uintersect($orig_gloss_array, $str_gloss_array, 'compareTerms');
+                foreach ($doubles as $key => $var){
+                    unset($orig_gloss_array[$key]);
+                }
+                $orig_glossary = arrayToGlossary($orig_gloss_array);
+                $orig_glossary .= "||";
+                $orig_glossary .= $str_glossary;
+            }
+
+        }
 		$xmlTarget->documentElement->setAttribute("glossary", $orig_glossary);
 	}
 	$bannedLinkIDs = array();
@@ -137,6 +152,27 @@ function merge_pages_to_project($source_project_id, $source_pages, $target_proje
 
 
 }
+//converts a glossary to an array.
+function glossaryToArray($glossary){
+    $glosArray = array();
+    $rows = explode('||', $glossary);
+    foreach ($rows as $key => $row){
+        $glosArray[$key] = explode('|', $row);
+    }
+    return $glosArray;
+}
+//returns the indexes of all terms in source that are also in target
+function compareTerms($source, $target){
+    return strcmp($source[0], $target[0]);
+}
+//converts an array to a glossary
+function arrayToGlossary($inputArray) {
+    $glossary = "";
+    foreach ($inputArray as $row) {
+        $glossary .= $row[0] . "|" . $row[1] . "||";
+    }
+    return substr($glossary, 0, -2);
+}
 
 function getFileMapping($source_media_folder, $target_media_folder)
 {
@@ -273,5 +309,6 @@ function addNode($index, $node, $root)
 $target_project = $_REQUEST["target_project"];
 $target_insert_page_position = $_REQUEST["target_page_position"];
 $merge_glossary= $_REQUEST["merge_glossary"];
-merge_pages_to_project($source_project, $source_pages, $target_project, $target_insert_page_position, $merge_glossary);
+$overwrite_glossary = $_REQUEST["overwrite_glossary"];
+merge_pages_to_project($source_project, $source_pages, $target_project, $target_insert_page_position, $merge_glossary, $overwrite_glossary);
 

editor/js/import-choose.js

@@ -128,6 +128,7 @@ function CheckAll() {
 
 function getIcon(nodetype)
 {
+    debugger
     var nodetypetemp = nodetype;
     if (nodetype){
         nodetypetemp = nodetype.replace("_group", "");
@@ -146,6 +147,8 @@ function getIcon(nodetype)
                 icon = "website_code/images/Icon_Folder_Group.gif";
             }else if (nodetype == "folder_shared"){
                 icon = "website_code/images/Icon_Folder_Shared.gif";
+            }else if(nodetype == 'sub_folder_shared'){
+                icon = "website_code/images/Icon_Sub_Shared_Folder.gif"
             }else{
                 icon = "website_code/images/Icon_Folder.gif";
             }
@@ -181,6 +184,7 @@ function showPageData(xot_id, data) {
 						$("#mergeGlossary").show();
 				}else{
 						$("#mergeGlossaryCheck").prop("checked", false);
+                        $("#overwriteGlossaryCheck").prop("checked", false);
 						$("#mergeGlossary").hide();
 				}
 
@@ -208,6 +212,7 @@ function showPageData(xot_id, data) {
 			}
 			else {
 				$("#mergeGlossaryCheck").prop("checked", false);
+                $("#overwriteGlossaryCheck").prop("checked", false);
 				$("#mergeGlossary").hide();
 				$("#pages").html("");
 				$("#merge").hide();
@@ -319,6 +324,7 @@ function init_workspace()
                 }
 
                 $("#mergeGlossaryCheck").prop("checked", false);
+                $("#overwriteGlossaryCheck").prop("checked", false)
                 $("#mergeGlossary").hide();
                 $("#pages").html("");
                 $("#merge").hide();
@@ -384,7 +390,8 @@ function init()
 
             });
             merge_glossary = $("#mergeGlossaryCheck").is(":checked");
-            if(source_pages.length > 0 || merge_glossary)
+            overwrite_glossary = $("#overwriteGlossaryCheck").is(":checked");
+            if(source_pages.length > 0 || merge_glossary || overwrite_glossary)
             {
                 source_page = source_pages.join();
                 source_project = sourceProject;
@@ -420,7 +427,8 @@ function init()
                                 target_project: target_project,
                                 target_page_position: target_insert,
                                 source_pages: source_page,
-                                merge_glossary: merge_glossary
+                                merge_glossary: merge_glossary,
+                                overwrite_glossary: overwrite_glossary
                             },
                             dataType: "text",
                             type: "POST"