Attempt to extract the user from the old author field when upgrading

diff --git a/mod/wiki/db/mysql.php b/mod/wiki/db/mysql.php
index b7d36aa82d11a7d7d50c189a84a402d258c8e7b8..9104d2b88029692981b47e9a4deb91f5bffeeb7f 100644 (file)
--- a/mod/wiki/db/mysql.php
+++ b/mod/wiki/db/mysql.php
@@ -4,7 +4,7 @@ function wiki_upgrade($oldversion) {
 /// This function does anything necessary to upgrade 
 /// older versions to match current functionality 
 
-    global $CFG;
+    global $CFG, $db;
 
     if ($oldversion < 2004040200) {
         execute_sql('ALTER TABLE `'.$CFG->prefix.'wiki` DROP `allowstudentstowiki`');
@@ -55,6 +55,22 @@ function wiki_upgrade($oldversion) {
         table_column('wiki_pages', '', 'userid', "integer", "10", "unsigned", "0", "not null", "author");
     }
 
+    if ($oldversion < 2004082303) {  // Try to update userid for old records
+        if ($pages = get_records('wiki_pages', 'userid', 0, 'pagename', 'lastmodified,author,pagename,version')) {
+            foreach ($pages as $page) {
+                $name = explode('(', $page->author);
+                $name = trim($name[0]);
+                $name = explode(' ', $name);
+                $firstname = $name[0];
+                unset($name[0]);
+                $lastname = trim(implode(' ', $name));
+                if ($user = get_record('user', 'firstname', $firstname, 'lastname', $lastname)) {
+                    set_field('wiki_pages', 'userid', $user->id,                                                                                      'pagename', addslashes($page->pagename), 'version', $page->version);
+                }
+            }
+        }
+    }
+
     return true;
 }
 

diff --git a/mod/wiki/db/postgres7.php b/mod/wiki/db/postgres7.php
index e162103a028bd15fcb9f5b5da8359f11cc60f1dc..3d8d2bf9946aaf58f6affee7986a175829c7f0c6 100644 (file)
--- a/mod/wiki/db/postgres7.php
+++ b/mod/wiki/db/postgres7.php
@@ -21,6 +21,21 @@ function wiki_upgrade($oldversion) {
     if ($oldversion < 2004082200) {
         table_column('wiki_pages', '', 'userid', "integer", "10", "unsigned", "0", "not null", "author");
     }
+    if ($oldversion < 2004082303) {  // Try to update userid for old records
+        if ($pages = get_records('wiki_pages', 'userid', 0, 'pagename', 'lastmodified,author,pagename,version')) {
+            foreach ($pages as $page) {
+                $name = explode('(', $page->author);
+                $name = trim($name[0]);
+                $name = explode(' ', $name);
+                $firstname = $name[0];
+                unset($name[0]);
+                $lastname = trim(implode(' ', $name));
+                if ($user = get_record('user', 'firstname', $firstname, 'lastname', $lastname)) {
+                    set_field('wiki_pages', 'userid', $user->id,                                                                                      'pagename', addslashes($page->pagename), 'version', $page->version);
+                }
+            }
+        }
+    }
     return true;
 }
 

diff --git a/mod/wiki/ewiki/ewiki.php b/mod/wiki/ewiki/ewiki.php
index ad89f8638f25c9cafb0ce32f0e9656fbe688ffec..91f5d20d264ab51406038d65df6bc65cc6b8334a 100644 (file)
--- a/mod/wiki/ewiki/ewiki.php
+++ b/mod/wiki/ewiki/ewiki.php
@@ -1158,7 +1158,7 @@ function ewiki_page_info($id, &$data, $action) {
          continue;
       }
 
-      $o .= '<table align="center" class="version-info" cellpadding="2" cellspacing="1">' . "\n";
+      $o .= '<table  class="version-info" cellpadding="2" cellspacing="1">' . "\n";
 
       #-- additional info-actions
       $commands = '';
@@ -1253,7 +1253,7 @@ function ewiki_page_info($id, &$data, $action) {
          }
 
    ##### BEGIN MOODLE ADDITION #####
-         $o .= '<tr class="page-'.$i.'"><td valign="top" align="right"><b>' .ewiki_t($i). ':</b></td>' .
+         $o .= '<tr class="page-'.$i.'"><td valign="top" align="right" nowrap="nowrap"><b>' .ewiki_t($i). ':</b></td>' .
                '<td>' . $value . "</td></tr>\n";
    ##### END MOODLE ADDITION #####
 

diff --git a/mod/wiki/version.php b/mod/wiki/version.php
index f0d3f504ef1c034e758b2d28c49cfdf8d347a71d..8ade8e1c4687414f53fb0d76aae4627817464c92 100644 (file)
--- a/mod/wiki/version.php
+++ b/mod/wiki/version.php
@@ -5,7 +5,7 @@
 ///  This fragment is called by moodle_needs_upgrading() and /admin/index.php
 /////////////////////////////////////////////////////////////////////////////////
 
-$module->version  = 2004082200;  // The current module version (Date: YYYYMMDDXX)
+$module->version  = 2004082303;  // The current module version (Date: YYYYMMDDXX)
 $module->cron     = 0;           // Period for cron to check this module (secs)
 
 ?>