--- o\class.tslib_content.php	2005-05-23 02:41:24.000000000 +0200
+++ c\class.tslib_content.php	2005-05-30 17:24:04.000000000 +0200
@@ -1945,7 +1945,7 @@
 		$hiddenfields = '<div style="display:none;">'.$hiddenfields.'</div>';
 
 		if ($conf['REQ'])	{
-			$validateForm=' onsubmit="return validateForm(\''.$formname.'\',\''.implode(',',$fieldlist).'\',\''.rawurlencode($conf['goodMess']).'\',\''.rawurlencode($conf['badMess']).'\',\''.rawurlencode($conf['emailMess']).'\')"';
+			/* by bednee */ $validateForm=' onsubmit="return validateForm(\''.$formname.'\',\''.implode(',',$fieldlist).'\',\''.($conf['goodMess']).'\',\''.($conf['badMess']).'\',\''.($conf['emailMess']).'\')"';
 			$GLOBALS['TSFE']->additionalHeaderData['JSFormValidate'] = '<script type="text/javascript" src="'.$GLOBALS['TSFE']->absRefPrefix.'t3lib/jsfunc.validateform.js"></script>';
 		} else $validateForm='';
 
@@ -2567,9 +2567,18 @@
 					$dims = $gifCreator->getImageScale($gifCreator->getImageDimensions($imageFile),$conf['width'],$conf['height'],'');
 					$offset = t3lib_div::intExplode(',',$conf['JSwindow.']['expand'].',');
 
-					$a1='<a href="#" onclick="'.
-						htmlspecialchars('openPic(\''.$GLOBALS['TSFE']->baseUrlWrap($url).'\',\''.($conf['JSwindow.']['newWindow']?md5($url):'thePicture').'\',\'width='.($dims[0]+$offset[0]).',height='.($dims[1]+$offset[1]).',status=0,menubar=0\'); return false;').
-						'"'.$GLOBALS['TSFE']->ATagParams.'>';
+                    /* by bednee */
+                    if (($dims[0]+$offset[0]>820)&&($dims[1]+$offset[1]>620)) {
+                        $a1='<a href="#" onclick="'.
+    						htmlspecialchars('openPic(\''.$GLOBALS['TSFE']->baseUrlWrap($url).'\',\''.($conf['JSwindow.']['newWindow']?md5($url):'thePicture').'\',\'width=800,height=600,status=0,menubar=0,resizable=1,scrollbars=1\'); return false;').
+    						'"'.$GLOBALS['TSFE']->ATagParams.'>';
+                    }
+                    else {
+                    /* by bednee */
+    					$a1='<a href="#" onclick="'.
+    						htmlspecialchars('openPic(\''.$GLOBALS['TSFE']->baseUrlWrap($url).'\',\''.($conf['JSwindow.']['newWindow']?md5($url):'thePicture').'\',\'width='.($dims[0]+$offset[0]).',height='.($dims[1]+$offset[1]).',status=0,menubar=0\'); return false;').
+    						'"'.$GLOBALS['TSFE']->ATagParams.'>';
+                    }
 					$a2='</a>';
 					$GLOBALS['TSFE']->setJS('openPic');
 				} else {