Minor - remove notices

main/metadata/doc/dcex.php

@@ -1,18 +1,17 @@
 <?php
 
-require_once("../metadata/md_funcs.php"); $mdStore = new mdstore(TRUE);
-require_once(api_get_path(LIBRARY_PATH) . 'xmd.lib.php');
-require_once(api_get_path(LIBRARY_PATH) . 'xht.lib.php');
-require_once('../metadata/md_document.php');
+require_once api_get_path(SYS_CODE_PATH).'metadata/md_funcs.php'; $mdStore = new mdstore(TRUE);
+require_once api_get_path(LIBRARY_PATH) . 'xmd.lib.php';
+require_once api_get_path(LIBRARY_PATH) . 'xht.lib.php';
+require_once api_get_path(SYS_CODE_PATH).'metadata/md_document.php';
 
 $mdObj = new mdobject($_course, $docId);  // e.g. '12'
 
 // Fetch example:
-if (is_array($dcelems = $mdStore->mds_get_dc_elements($mdObj)))
+if (is_array($dcelems = $mdStore->mds_get_dc_elements($mdObj))) {
 	echo '<div>', htmlspecialchars($dcelems['Identifier']), ': ',
 	    htmlspecialchars($dcelems['Description']), '</div>';
-
+}
 // Store example:
 $langMdCopyright = 'Provided the source is acknowledged';
-$mdStore->mds_put_dc_elements($mdObj, array('Description'=>time()));
-?>
+$mdStore->mds_put_dc_elements($mdObj, array('Description'=>time()));

main/metadata/importmanifest.php

@@ -106,7 +106,7 @@ $originalHdrInfo = $hdrInfo;
 
 function slurpmanifest()
 {
-    global $baseWorkDir, $workWith, $sdisub, $mfContents, $xht_doc;
+    global $baseWorkDir, $workWith, $sdisub, $mfContents, $xht_doc, $charset;
     $fmff = $baseWorkDir .'/'. $workWith . '/' . MFFNAME . $sdisub . MFFDEXT;
     if (file_exists($fmff))
     {
@@ -236,7 +236,7 @@ elseif ($smo == get_lang('Import'))
     function store_md_and_traverse_subitems($mfdocId, $level, $counter,
             $contextElem, $treeElem, $parentElem)
     {
-        global $_user, $xht_doc, $mdStore, $mdObj, $sdisub;
+        global $_user, $xht_doc, $mdStore, $mdObj, $sdisub, $charset;
 
         //  $contextElem -> @identifier, metadata/lom
         //  $treeElem ->    title, items

main/metadata/md_phpdig.php

@@ -157,7 +157,7 @@ function index_words($site_id, $path, $file, $first_words, $keywords)
         Database::query("INSERT INTO " . PHPDIG_DB_PREFIX .
             "engine (spider_id,key_id,weight) VALUES ($spider_id,$key_id,$w)");
     }
-
+    global $charset;
     echo '<tr><td>', htmlspecialchars($file, ENT_QUOTES, $charset), '</td><td>(spider_id ',
         $spider_id, '):</td><td align="right">', count($keywords), ' kwds, ',
         $new , ' new</td></tr>', "\n";

main/metadata/phpdig/phpdig_functions.php

@@ -156,7 +156,7 @@ if ($ereg) {
     return $string;
 }
 else {
-    return $result;
+    return null;
 }
 }
 
@@ -169,7 +169,7 @@ if (!isset($phpdigEncode[$encoding])) {
 }
 // exceptions
 if ($encoding == 'iso-8859-1') {
-    $chaine = str_replace('Æ','ae',str_replace('æ','ae',$chaine));
+    $chaine = str_replace('<EFBFBD>','ae',str_replace('<EFBFBD>','ae',$chaine));
 }
 return( strtr( $chaine,$phpdigEncode[$encoding]['str'],$phpdigEncode[$encoding]['tr']) );
 }
@@ -217,7 +217,7 @@ foreach($subststrings as $encoding => $subststring) {
 }
 
 //=================================================
-//epure a string from all non alnum words (words can contain &__&ßðþ character)
+//epure a string from all non alnum words (words can contain &__&<EFBFBD><EFBFBD><EFBFBD> character)
 function phpdigEpureText($text,$min_word_length=2,$encoding=PHPDIG_ENCODING) {
 global $phpdig_words_chars;
 
@@ -225,7 +225,7 @@ $text = phpdigStripAccents(strtolower ($text));
 //no-latin upper to lowercase - now islandic
 switch (PHPDIG_ENCODING) {
    case 'iso-8859-1':
-   $text = strtr( $text,'ÐÞ','ðþ');
+   $text = strtr( $text,'<EFBFBD><EFBFBD>','<EFBFBD><EFBFBD>');
    break;
 }
 

main/metadata/phpdig/search_function.php

@@ -33,6 +33,7 @@ if (($refine != 0) && ($refine != 1)) { $refine = 0; }
 // $lim_start set in search_function.php file
 settype($limite,'integer');
 if (($limite != 10) && ($limite != 30) && ($limite != 100)) { $limite = SEARCH_DEFAULT_LIMIT; }
+$limit_start = 0;
 settype($limit_start,'integer');
 if (isset($limit_start)) { $limit_start = $limite * floor($limit_start / $limite); }
 if (($browse != 0) && ($browse != 1)) { $browse = 0; }
@@ -53,7 +54,7 @@ $timer = new phpdigTimer('html');
 $timer->start('All');
 
 // init variables
-global $phpdig_words_chars;
+global $phpdig_words_chars,$maxweight;
 settype($maxweight,'integer');
 $ignore = '';
 $ignore_common = '';