sloodle_development_tools/moodle_2_compatibility/sloodle.patch

diff -rupN --exclude=.svn sloodle_moodle_1_9_compat/lang/en_utf8/sloodle.php sloodle_moodle_2_0_compat/lang/en_utf8/sloodle.php
--- sloodle_moodle_1_9_compat/lang/en_utf8/sloodle.php	2011-06-20 08:58:12.000000000 +0000
+++ sloodle_moodle_2_0_compat/lang/en_utf8/sloodle.php	2011-06-20 08:25:20.000000000 +0000
@@ -6,6 +6,8 @@
 * @package sloodlelang
 */
 
+$string['pluginname']   = 'SLOODLE';
+
 $string['accesslevel'] = 'Access Level';
 $string['accesslevel:public'] = 'Public';
 $string['accesslevel:owner'] = 'Owner';
diff -rupN --exclude=.svn sloodle_moodle_1_9_compat/lib/capability.php sloodle_moodle_2_0_compat/lib/capability.php
--- sloodle_moodle_1_9_compat/lib/capability.php	1970-01-01 00:00:00.000000000 +0000
+++ sloodle_moodle_2_0_compat/lib/capability.php	2011-06-20 08:47:58.000000000 +0000
@@ -0,0 +1,17 @@
+<?php 
+/* capability.php
+Edmund Edgar, 2010-06-18
+Moodle capability wrapper
+We should be able to get rid of this - the legacy thing is already deprecated as of 1.something
+*/
+
+function sloodle_has_capability($capability = null, $contextid = null, $userid = null, $kill = null) {
+	global $CFG;
+	if ($CFG->version > 2010060800) {
+		if ( $capability == 'moodle/legacy:guest' ) {
+			return false;
+		}
+	}
+	return has_capability($capability, $contextid, $userid, $kill );
+}
+?>
diff -rupN --exclude=.svn sloodle_moodle_1_9_compat/lib/db.php sloodle_moodle_2_0_compat/lib/db.php
--- sloodle_moodle_1_9_compat/lib/db.php	1970-01-01 00:00:00.000000000 +0000
+++ sloodle_moodle_2_0_compat/lib/db.php	2011-06-20 08:24:39.000000000 +0000
@@ -0,0 +1,165 @@
+<?php 
+/* db.lib
+Edmund Edgar, 2010-06-18
+Sloodle database compatibility wrappers
+For reasons best known to themselves, Moodle decided to suddenly rip out all their old db functions and put in a bunch of near-identical ones with slightly different syntax.
+To avoid the need for a different release, we'll go through a layer of sloodle_ functions which wrap the appropriate Moodle database call.
+We'll probably want to switch these out for the regular Moodle 2.0 calls when people have had a change to upgrade to Moodle 2.
+*/
+
+function sloodle_do_use_db_object() {
+   global $CFG;
+   return ($CFG->version > 2010060800); 
+}
+
+function sloodle_get_record($p1=null, $p2=null, $p3=null, $p4=null, $p5=null, $p6=null, $p7=null, $p8='*') {
+   global $DB;
+   if ( sloodle_do_use_db_object() ) {
+      return $DB->get_record($p1, sloodle_conditions_to_array($p2,$p3,$p4,$p5,$p6,$p7) );
+   } else {
+      return get_record($p1, $p2, $p3, $p4, $p5, $p6, $p6, $p8);
+   }
+}
+
+function sloodle_record_exists($p1=null, $p2=null, $p3=null, $p4=null, $p5=null, $p6=null, $p7=null) {
+   global $DB;
+   if ( sloodle_do_use_db_object() ) {
+      return $DB->record_exists($p1, sloodle_conditions_to_array($p2,$p3,$p4,$p5,$p6,$p7) );
+   } else {
+      return record_exists($p1, $p2, $p3, $p4, $p5, $p6, $p7);
+   }
+}
+
+function sloodle_get_records($p1=null, $p2=null, $p3=null, $p4=null, $p5='*', $p6=null, $p7=null) {
+   if ( sloodle_do_use_db_object() ) {
+      global $DB;
+      return $DB->get_records($p1, sloodle_conditions_to_array( $p2, $p3), $p4, $p5, $p6, $p7 );
+   } else {
+      return get_records($p1, $p2, $p3, $p4, $p5, $p6, $p7);
+   }
+}
+
+function sloodle_get_records_sql($p1=null, $p2=null) {
+   if ( sloodle_do_use_db_object() ) {
+      global $DB;
+      return $DB->get_records_sql($p1, $p2);
+   } else {
+      return get_records_sql($p1, $p2);
+   }
+}
+
+function sloodle_get_records_select( $p1=null, $p2=null, $p3=null, $p4='*', $p5=null, $p6=null) {
+   if ( sloodle_do_use_db_object() ) {
+      global $DB;
+      return $DB->get_records_select($p1, $p2, array(), $p3, $p4, $p5, $p6); // get_records_select now has an option to pass in an array of params
+   } else {
+      return get_records_select($p1, $p2, $p3, $p4, $p5, $p6);
+   }
+}
+
+function sloodle_insert_record($p1=null, $p2=null, $returnid=true, $primarykey='id') {
+   if ( sloodle_do_use_db_object() ) {
+      global $DB;
+      return $DB->insert_record($p1, $p2, $returnid, false);  // if we need that primarykey field, I guess something will break
+   } else {
+      return insert_record($p1, $p2, $returnid, $primarykey );
+   }
+}
+
+function sloodle_update_record($p1=null, $p2=null) {
+   if ( sloodle_do_use_db_object() ) {
+      global $DB;
+      return $DB->update_record($p1, $p2);
+   } else {
+      return update_record($p1, $p2);
+   }
+}
+
+function sloodle_count_records($p1=null, $p2=null, $p3=null) {
+   if ( sloodle_do_use_db_object() ) {
+      global $DB;
+      return $DB->count_records($p1, array( $p2=>$p3 ) );
+   } else {
+      return count_records($p1, $p2, $p3);
+   }
+}
+
+function sloodle_delete_records($p1=null, $p2=null, $p3=null, $p4=null, $p5=null, $p6=null, $p7=null) {
+   if ( sloodle_do_use_db_object() ) {
+      global $DB;
+      return $DB->delete_records($p1, sloodle_conditions_to_array($p2, $p3, $p4, $p5, $p6, $p7) );
+   } else {
+      return delete_records($p1, $p2, $p3, $p4, $p5, $p6, $p7);
+   }
+}
+
+function sloodle_delete_records_select($p1=null, $p2=null) {
+   if ( sloodle_do_use_db_object() ) {
+      global $DB;
+      return $DB->delete_records($p1, $p2);
+   } else {
+      return delete_records($p1, $p2);
+   }
+}
+
+
+function sloodle_delete_record($p1=null, $p2=null, $p3=null, $p4=null, $p5=null, $p6=null, $p7=null) {
+   if ( sloodle_do_use_db_object() ) {
+      global $DB;
+      return $DB->delete_record($p1, array($p2=>$p3, $p4=>$p5, $p6=>$p7) );
+   } else {
+      return delete_record($p1, $p2, $p3, $p4, $p5, $p6, $p7);
+   }
+}
+
+function sloodle_get_field($p1=null, $p2=null, $p3=null, $p4=null, $p5=null, $p6=null, $p7=null, $p8=null) {
+   if ( sloodle_do_use_db_object() ) {
+      global $DB;
+      return $DB->get_field($p1, $p2, sloodle_conditions_to_array($p3, $p4, $p5, $p6, $p7, $p8) );
+   } else {
+      return get_field($p1, $p2, $p3, $p4, $p5, $p6, $p7, $p8);
+   }
+}
+
+function sloodle_get_field_sql($p1=null) {
+   if ( sloodle_do_use_db_object() ) {
+      global $DB;
+      return $DB->sloodle_get_field_sql($p1);
+   } else {
+      return sloodle_get_field_sql($p1);
+   }
+}
+
+function sloodle_set_field($p1=null, $p2=null, $p3=null, $p4=null, $p5=null, $p6=null, $p7=null, $p8=null) {
+   if ( sloodle_do_use_db_object() ) {
+      global $DB;
+      return $DB->set_field($p1, $p2, $p3, sloodle_conditions_to_array( $p4, $p5, $p6, $p7, $p8) );
+   } else {
+      return set_field($p1, $p2, $p3, $p4, $p5, $p6, $p7, $p8);
+   }
+}
+
+function sloodle_sql_ilike($p1=null) {
+   if ( sloodle_do_use_db_object() ) {
+      global $DB;
+      return $DB->sql_ilike();
+   } else {
+      return sql_ilike();
+   }
+
+}
+
+function sloodle_conditions_to_array($c1 = null, $c2 = null, $c3 = null, $c4 = null, $c5 = null, $c6 = null) {
+   $conditions = array();
+   if ($c1) {
+      $conditions[$c1] = $c2;
+   }
+   if ($c3) {
+      $conditions[$c3] = $c4;
+   }
+   if ($c5) {
+      $conditions[$c5] = $c6;
+   }
+   return $conditions;
+}
+?>
diff -rupN --exclude=.svn sloodle_moodle_1_9_compat/lib.php sloodle_moodle_2_0_compat/lib.php
--- sloodle_moodle_1_9_compat/lib.php	2011-06-20 08:58:15.000000000 +0000
+++ sloodle_moodle_2_0_compat/lib.php	2011-06-20 08:49:38.000000000 +0000
@@ -471,5 +471,14 @@
     }
 
 
+function sloodle_supports($feature) {
+    switch($feature) {
+        case FEATURE_MOD_INTRO:               return true;
+        //case FEATURE_BACKUP_MOODLE2:          return true; // not sure
+
+        default: return null;
+    }
+}
+
 
 ?>
diff -rupN --exclude=.svn sloodle_moodle_1_9_compat/mod_form.php sloodle_moodle_2_0_compat/mod_form.php
--- sloodle_moodle_1_9_compat/mod_form.php	2011-06-20 08:58:15.000000000 +0000
+++ sloodle_moodle_2_0_compat/mod_form.php	2011-06-20 08:27:23.000000000 +0000
@@ -84,15 +84,20 @@ class mod_sloodle_mod_form extends moodl
         // Set a client-size rule that an entry is required
         $mform->addRule('name', null, 'required', null, 'client');
 
-        // Create an HTML editor for module description (intro text)
-        $mform->addElement('htmleditor', 'intro', get_string('description'));
-        // Make it raw type (so the HTML isn't filtered out)
-        $mform->setType('intro', PARAM_RAW);
-        // Make it required
-        //$mform->addRule('intro', get_string('required'), 'required', null, 'client'); // Don't require description - PRB
-        // Provide an HTML editor help button
-        $mform->setHelpButton('intro', array('writing', 'questions', 'richtext'), false, 'editorhelpbutton');
-        
+
+	if (method_exists($this,'add_intro_editor')) {
+	       $this->add_intro_editor(true);
+	} else {
+	       // Create an HTML editor for module description (intro text)
+	       $mform->addElement('htmleditor', 'intro', get_string('description'));
+	       // Make it raw type (so the HTML isn't filtered out)
+	       $mform->setType('intro', PARAM_RAW);
+	       // Make it required
+	       $mform->addRule('intro', get_string('required'), 'required', null, 'client'); // Don't require description - PRB
+	       // Provide an HTML editor help button
+	       $mform->setHelpButton('intro', array('writing', 'questions', 'richtext'), false, 'editorhelpbutton');
+	}
+
         
 //-------------------------------------------------------------------------------
         
diff -rupN --exclude=.svn sloodle_moodle_1_9_compat/sl_config.php sloodle_moodle_2_0_compat/sl_config.php
--- sloodle_moodle_1_9_compat/sl_config.php	2011-06-20 08:58:15.000000000 +0000
+++ sloodle_moodle_2_0_compat/sl_config.php	2011-06-20 08:48:21.000000000 +0000
@@ -11,6 +11,8 @@
 	// Pull in the main moodle config
 	// NB the following is necessary for when we pull in this config.php from a module under sloodle/mod
 	require_once (realpath(dirname(__FILE__) . "/" . "../../config.php"));
+	require_once (realpath(dirname(__FILE__) . "/" . "lib/db.php"));
+	require_once (realpath(dirname(__FILE__) . "/" . "lib/capability.php"));
     
     // Is this a linker script?
     if (defined('SLOODLE_LINKER_SCRIPT')) {
diff -rupN --exclude=.svn sloodle_moodle_1_9_compat/version.php sloodle_moodle_2_0_compat/version.php
--- sloodle_moodle_1_9_compat/version.php	2011-06-20 08:58:15.000000000 +0000
+++ sloodle_moodle_2_0_compat/version.php	2011-06-20 08:29:34.000000000 +0000
@@ -6,7 +6,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 $module->version  = 2010022202;
-$module->requires = 2007021500;  // Requires Moodle 1.8
+//$module->requires = 2007021500;  // Requires Moodle 1.8
+// 2.0 INCOMPATIBILITY
+$module->requires = 2010000000;
 $module->cron     = 60;
 
 ?>