From 4b4a3f4d40587e9e829dd06e0bc2dfc1afa09fb6 Mon Sep 17 00:00:00 2001
From: skodak <skodak>
Date: Wed, 16 May 2007 21:26:16 +0000
Subject: [PATCH] MDL-9392 resource_popup: not working

---
 mod/resource/type/file/resource.class.php       |  6 +++++-
 mod/resource/type/html/resource.class.php       | 10 +++++++---
 mod/resource/type/ims/resource.class.php        |  6 +++++-
 mod/resource/type/repository/resource.class.php |  6 +++++-
 mod/resource/type/text/resource.class.php       |  6 +++++-
 5 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/mod/resource/type/file/resource.class.php b/mod/resource/type/file/resource.class.php
index a035ea699d4..8a27739b190 100644
--- a/mod/resource/type/file/resource.class.php
+++ b/mod/resource/type/file/resource.class.php
@@ -586,7 +586,11 @@ function set_encrypted_parameter() {
 }
 
 function setup_preprocessing(&$defaults){
-    if (!empty($defaults['popup'])) {
+
+    if (!isset($defaults['popup'])) {
+        // use form defaults
+
+    } else if (!empty($defaults['popup'])) {
         $defaults['windowpopup'] = 1;
         if (array_key_exists('popup', $defaults)) {
             $rawoptions = explode(',', $defaults['popup']);
diff --git a/mod/resource/type/html/resource.class.php b/mod/resource/type/html/resource.class.php
index 08d10f2176f..435712a848c 100644
--- a/mod/resource/type/html/resource.class.php
+++ b/mod/resource/type/html/resource.class.php
@@ -72,7 +72,7 @@ function display() {
         $pagetitle = strip_tags($course->shortname.': '.format_string($resource->name));
         $inpopup = optional_param('inpopup', '', PARAM_BOOL);
         
-        // fix for MDL-9021, thanks Etienne Rozé
+        // fix for MDL-9021, thanks Etienne Roz�
         add_to_log($course->id, "resource", "view", "view.php?id={$cm->id}", $resource->id, $cm->id);
 
         if ($resource->popup) {
@@ -127,7 +127,11 @@ function display() {
 }
 
 function setup_preprocessing(&$defaults){
-    if (!empty($defaults['popup'])) {
+
+    if (!isset($defaults['popup'])) {
+        // use form defaults
+
+    } else if (!empty($defaults['popup'])) {
         $defaults['windowpopup'] = 1;
         if (array_key_exists('popup', $defaults)) {
             $rawoptions = explode(',', $defaults['popup']);
@@ -156,7 +160,7 @@ function setup_elements(&$mform) {
 
     $woptions = array(0 => get_string('pagewindow', 'resource'), 1 => get_string('newwindow', 'resource'));
     $mform->addElement('select', 'windowpopup', get_string('display', 'resource'), $woptions);
-    $mform->setDefault('windowpopup', !empty($CFG->resource_popup));
+    $mform->setDefault('windowpopup', (int)!empty($CFG->resource_popup));
 
     $mform->addElement('checkbox', 'blockdisplay', get_string('showcourseblocks', 'resource'));
     $mform->setDefault('blockdisplay', 0);
diff --git a/mod/resource/type/ims/resource.class.php b/mod/resource/type/ims/resource.class.php
index 47e19f5c7e6..e67e2d28904 100644
--- a/mod/resource/type/ims/resource.class.php
+++ b/mod/resource/type/ims/resource.class.php
@@ -602,7 +602,11 @@ class resource_ims extends resource_base {
 
 
     function setup_preprocessing(&$defaults){
-        if (!empty($defaults['popup'])) {
+
+        if (!isset($defaults['popup'])) {
+            // use form defaults
+    
+        } else if (!empty($defaults['popup'])) {
             $defaults['windowpopup'] = 1;
             if (array_key_exists('popup', $defaults)) {
                 $rawoptions = explode(',', $defaults['popup']);
diff --git a/mod/resource/type/repository/resource.class.php b/mod/resource/type/repository/resource.class.php
index 5b6de91b6bf..18bc1d3325a 100644
--- a/mod/resource/type/repository/resource.class.php
+++ b/mod/resource/type/repository/resource.class.php
@@ -512,7 +512,11 @@ function set_encrypted_parameter() {
 
 
 function setup_preprocessing(&$defaults){
-    if (!empty($defaults['popup'])) {
+
+    if (!isset($defaults['popup'])) {
+        // use form defaults
+
+    } else if (!empty($defaults['popup'])) {
         $defaults['windowpopup'] = 1;
         if (array_key_exists('popup', $defaults)) {
             $rawoptions = explode(',', $defaults['popup']);
diff --git a/mod/resource/type/text/resource.class.php b/mod/resource/type/text/resource.class.php
index 5a1f032de0d..03880719546 100644
--- a/mod/resource/type/text/resource.class.php
+++ b/mod/resource/type/text/resource.class.php
@@ -129,7 +129,11 @@ function display() {
 
 
 function setup_preprocessing(&$defaults){
-    if (!empty($defaults['popup'])) {
+
+    if (!isset($defaults['popup'])) {
+        // use form defaults
+
+    } else if (!empty($defaults['popup'])) {
         $defaults['windowpopup'] = 1;
         if (array_key_exists('popup', $defaults)) {
             $rawoptions = explode(',', $defaults['popup']);