fixed updating access level for prefs, headers for po files, httpq player skip command and image resize for gif and png

3 files changed, 16 insertions, 4 deletions

diff --git a/lib/class/preference.class.php b/lib/class/preference.class.php
index a648434c..dadbbd17 100644
--- a/lib/class/preference.class.php
+++ b/lib/class/preference.class.php
@@ -79,7 +79,15 @@ class Preference {
 	 * update_level
 	 * This takes a preference ID and updates the level required to update it (performed by an admin)
 	 */
-	public static function update_level($preference_id,$level) { 
+	public static function update_level($preference,$level) { 
+
+                // First prepare
+                if (!is_numeric($preference)) { 
+                        $preference_id = self::id_from_name($preference);
+                } 
+                else { 
+                        $preference_id = $preference;
+                } 
 
 		$preference_id 	= Dba::escape($preference_id);
 		$level		= Dba::escape($level); 
diff --git a/lib/preferences.php b/lib/preferences.php
index d37404c8..811f7a82 100644
--- a/lib/preferences.php
+++ b/lib/preferences.php
@@ -47,7 +47,8 @@ function update_preferences($pref_id=0) {
 		/* Get the Value from POST/GET var called $data */
 		$type 		= $data['type'];
 		$name 		= $data['name'];
-		$apply_to_all	= "check_" . $data['name'];
+		$apply_to_all	= 'check_' . $data['name'];
+		$new_level	= 'level_' . $data['name']; 
 		$id		= $data['id'];
 		$value 		= scrub_in($_REQUEST[$name]);
 
@@ -69,6 +70,9 @@ function update_preferences($pref_id=0) {
 		/* Run the update for this preference only if it's set */
 		if (isset($_REQUEST[$name])) { 
 			Preference::update($id,$pref_id,$value,$_REQUEST[$apply_to_all]); 
+			if (Access::check('interface','100') AND $_REQUEST[$new_level]) { 
+				Preference::update_level($id,$_REQUEST[$new_level]); 
+			} 
 		}
 
 	} // end foreach preferences
diff --git a/lib/ui.lib.php b/lib/ui.lib.php
index b27124fc..ed208f34 100644
--- a/lib/ui.lib.php
+++ b/lib/ui.lib.php
@@ -401,10 +401,10 @@ function img_resize($image,$size,$type,$album_id) {
 			imagejpeg($img,null,100);
 			break;
 		case 'gif':
-			imagegif($img,null,100);
+			imagegif($img);
 			break;
 		case 'png':
-			imagepng($img,null,100);
+			imagepng($img);
 			break;
 	}