openwebwork-cvs

[Mike G. v. a. <we...@ma...>]

Log Message:
-----------
removed sql_moodle as a choice on the add course page since that database structure
is no longer supported.

Added switch to global.conf for determining what level of permissions is needed to see hardcopy errors.

download_hardcopy_view_errors =>"professor",

Modified Files:
--------------
    webwork2/conf:
        database.conf.dist
        global.conf.dist

Revision Data
-------------
Index: global.conf.dist
===================================================================
RCS file: /webwork/cvs/system/webwork2/conf/global.conf.dist,v
retrieving revision 1.214
retrieving revision 1.215
diff -Lconf/global.conf.dist -Lconf/global.conf.dist -u -r1.214 -r1.215
--- conf/global.conf.dist
+++ conf/global.conf.dist
@@ -49,7 +49,7 @@
 # Paths to external programs 
 ################################################################################
 
-# system utilties
+# system utilities
 $externalPrograms{mv}    = "/bin/mv";
 $externalPrograms{cp}    = "/bin/cp";
 $externalPrograms{rm}    = "/bin/rm";
@@ -161,6 +161,10 @@
 $mail{editor_window_rows}    = 15;
 $mail{editor_window_columns} = 100;
 
+###################################################
+# Customizing the action of the "Email your instructor" button
+###################################################
+
 # Use this to customize the text of the feedback button.
 $feedback_button_name = "Email instructor";
 
@@ -168,6 +172,21 @@
 # section as the user initiating the feedback.
 $feedback_by_section = 0;
 
+# If the variable below is set to a non-empty value (i.e. in course.conf), WeBWorK's usual
+# email feedback mechanism  will be replaced with a link to the given URL.
+# See also $feedback_button_name, above.
+
+$courseURLs{feedbackURL} = "";
+
+# If the variable below is set to a non-empty value (i.e. in course.conf), 
+# WeBWorK's usual email feedback mechanism  will be replaced with a link to the given URL and
+# a POST request with information about the problem including the HTML rendering
+# of the problem will be sent to that URL.
+# See also $feedback_button_name, above.
+
+#$courseURLs{feedbackFormURL} = "http://www.mathnerds.com/MathNerds/mmn/SDS/askQuestion.aspx";  #"http://www.tipjar.com/cgi-bin/test";
+$courseURLs{feedbackFormURL} = "";
+
 ################################################################################
 # Theme
 ################################################################################
@@ -299,10 +318,6 @@
 # Location of temporary editing files.
 $courseDirs{tmpEditFileDir}  = "$courseDirs{templates}/tmpEdit";
 
-# If this is set to a non-empty value (i.e. in course.conf), WeBWorK's usual
-# email feedback mechanism  will be replaced with a link to the given URL.
-# See also $feedback_button_name, above.
-$courseURLs{feedbackURL} = "";
 
 # mail merge status directory
 $courseDirs{mailmerge}   = "$courseDirs{DATA}/mailmerge";
@@ -709,6 +724,7 @@
 	
 	download_hardcopy_multiuser  => "ta",
 	download_hardcopy_multiset   => "ta",
+	download_hardcopy_view_errors =>"professor",
 	download_hardcopy_format_pdf => "guest",
 	download_hardcopy_format_tex => "ta",
 );
Index: database.conf.dist
===================================================================
RCS file: /webwork/cvs/system/webwork2/conf/database.conf.dist,v
retrieving revision 1.38
retrieving revision 1.39
diff -Lconf/database.conf.dist -Lconf/database.conf.dist -u -r1.38 -r1.39
--- conf/database.conf.dist
+++ conf/database.conf.dist
@@ -276,61 +276,61 @@
 =cut
 
 # params used by moodle-backed tables
-my %moodleParams = (
-	non_native  => 1,
-	username    => $moodle_username,
-	password    => $moodle_password,
-	debug       => $database_debug,
-	tablePrefix => $moodle_table_prefix,
-	courseName  => $courseName,
-	moodle17    => $moodle17,
-);
-
-$dbLayouts{sql_moodle} = {
-	# start with sql_single table definitions
-	%{$dbLayouts{sql_single}},
-	
-	# then override user, password, and permission tables
-	# use the same record classes as sql_single
-	user => {
-		record => "WeBWorK::DB::Record::User",
-		schema => "WeBWorK::DB::Schema::NewSQL::Moodle::User",
-		driver => "WeBWorK::DB::Driver::SQL",
-		source => $moodle_dsn,
-		params => { %moodleParams,
-			statusDeletedAbbrevs    => $statuses{Drop}{abbrevs},
-			statusDeletedDefault    => $statuses{Drop}{abbrevs}[0],
-			statusNotDeletedAbbrevs => $statuses{Enrolled}{abbrevs},
-			statusNotDeletedDefault => $statuses{Enrolled}{abbrevs}[0],
-			#sectionPrefix          => "SEC_", # not implemented
-			#recitationPrefix       => "",  # not implemented
-		},
-	},
-	password => {
-		record => "WeBWorK::DB::Record::Password",
-		schema => "WeBWorK::DB::Schema::NewSQL::Moodle::PasswordPermission",
-		driver => "WeBWorK::DB::Driver::SQL",
-		source => $moodle_dsn,
-		params => { %moodleParams,
-			guestsPermissionLevel => -5,
-			studentsPermissionLevel => 0,
-			teachersPermissionLevel => 10,
-			adminsPermissionLevel => 10,
-		},
-	},
-	permission => {
-		record => "WeBWorK::DB::Record::PermissionLevel",
-		schema => "WeBWorK::DB::Schema::NewSQL::Moodle::PasswordPermission",
-		driver => "WeBWorK::DB::Driver::SQL",
-		source => $moodle_dsn,
-		params => { %moodleParams,
-			guestsPermissionLevel => -5,
-			studentsPermissionLevel => 0,
-			teachersPermissionLevel => 10,
-			adminsPermissionLevel => 10,
-		},
-	},
-};
+#my %moodleParams = (
+#	non_native  => 1,
+#	username    => $moodle_username,
+#	password    => $moodle_password,
+#	debug       => $database_debug,
+#	tablePrefix => $moodle_table_prefix,
+#	courseName  => $courseName,
+#	moodle17    => $moodle17,
+#);
+#
+#$dbLayouts{sql_moodle} = {
+#	# start with sql_single table definitions
+#	%{$dbLayouts{sql_single}},
+#	
+#	# then override user, password, and permission tables
+#	# use the same record classes as sql_single
+#	user => {
+#		record => "WeBWorK::DB::Record::User",
+#		schema => "WeBWorK::DB::Schema::NewSQL::Moodle::User",
+#		driver => "WeBWorK::DB::Driver::SQL",
+#		source => $moodle_dsn,
+#		params => { %moodleParams,
+#			statusDeletedAbbrevs    => $statuses{Drop}{abbrevs},
+#			statusDeletedDefault    => $statuses{Drop}{abbrevs}[0],
+#			statusNotDeletedAbbrevs => $statuses{Enrolled}{abbrevs},
+#			statusNotDeletedDefault => $statuses{Enrolled}{abbrevs}[0],
+#			#sectionPrefix          => "SEC_", # not implemented
+#			#recitationPrefix       => "",  # not implemented
+#		},
+#	},
+#	password => {
+#		record => "WeBWorK::DB::Record::Password",
+#		schema => "WeBWorK::DB::Schema::NewSQL::Moodle::PasswordPermission",
+#		driver => "WeBWorK::DB::Driver::SQL",
+#		source => $moodle_dsn,
+#		params => { %moodleParams,
+#			guestsPermissionLevel => -5,
+#			studentsPermissionLevel => 0,
+#			teachersPermissionLevel => 10,
+#			adminsPermissionLevel => 10,
+#		},
+#	},
+#	permission => {
+#		record => "WeBWorK::DB::Record::PermissionLevel",
+#		schema => "WeBWorK::DB::Schema::NewSQL::Moodle::PasswordPermission",
+#		driver => "WeBWorK::DB::Driver::SQL",
+#		source => $moodle_dsn,
+#		params => { %moodleParams,
+#			guestsPermissionLevel => -5,
+#			studentsPermissionLevel => 0,
+#			teachersPermissionLevel => 10,
+#			adminsPermissionLevel => 10,
+#		},
+#	},
+#};
 
 =head1 DATABASE LAYOUT METADATA
 
@@ -354,7 +354,7 @@
 
 %dbLayout_descr = (
 	sql_single => "Uses a single SQL database to record WeBWorK data for all courses using this layout. This is the recommended layout for new courses.",
-	sql_moodle => "Simiar to sql_single, but uses a Moodle database for user, password, and permission information. This layout should be used for courses used with wwmoodle.",
+#	sql_moodle => "Simiar to sql_single, but uses a Moodle database for user, password, and permission information. This layout should be used for courses used with wwmoodle.",
 );
 
 =back