"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "packages/web/lib/pages/fogconfigurationpage.class.php" between
fogproject-1.5.7.tar.gz and fogproject-1.5.8.tar.gz

About: FOG is a Linux-based network computer cloning solution for Windows, Mac OSX and various Linux distributions that ties together a few open-source tools with a PHP-based web interface. FOG doesn’t use any boot disks, or CDs; everything is done via TFTP and PXE.

fogconfigurationpage.class.php  (fogproject-1.5.7)	:	fogconfigurationpage.class.php  (fogproject-1.5.8)
skipping to change at line 2434		skipping to change at line 2434
. '"btn btn-warning resettoken" type="button">'		. '"btn btn-warning resettoken" type="button">'
. _('Reset Token')		. _('Reset Token')
. '</button>'		. '</button>'
. '</div>';		. '</div>';
break;		break;
case 'FOG_STORAGENODE_MYSQLPASS':		case 'FOG_STORAGENODE_MYSQLPASS':
$type .= '<input type="text" name="${service_id}" value="'		$type .= '<input type="text" name="${service_id}" value="'
. '${service_value}" autocomplete="off" class='		. '${service_value}" autocomplete="off" class='
. '"form-control" id="${service_name}"/>';		. '"form-control" id="${service_name}"/>';
break;		break;
		case 'FOG_AD_DEFAULT_PASSWORD':
		$type .= '<input name="${service_id}" type="password" value=
		"'
		. ($Service->value ? '********************************'
		: '')
		. '" autocomplete="off" class='
		. '"form-control" id="${service_name}"/>';
		break;
default:		default:
$type .= '<input type="password" name="${service_id}" value= "'		$type .= '<input type="password" name="${service_id}" value= "'
. '${service_value}" autocomplete="off" class='		. '${service_value}" autocomplete="off" class='
. '"form-control" id="${service_name}"/>';		. '"form-control" id="${service_name}"/>';
}		}
$type .= '</div>';		$type .= '</div>';
break;		break;
case (in_array($Service->name, $ServiceNames)):		case (in_array($Service->name, $ServiceNames)):
$type = '<input type="checkbox" name="${service_id}" value="1" '		$type = '<input type="checkbox" name="${service_id}" value="1" '
. 'id="${service_name}"'		. 'id="${service_name}"'
skipping to change at line 2770		skipping to change at line 2776
) {		) {
$set = 0;		$set = 0;
}		}
}		}
if (isset($needstobeip[$name])		if (isset($needstobeip[$name])
&& !filter_var($set, FILTER_VALIDATE_IP)		&& !filter_var($set, FILTER_VALIDATE_IP)
) {		) {
$set = '';		$set = '';
}		}
switch ($name) {		switch ($name) {
		case 'FOG_AD_DEFAULT_PASSWORD':
		$set = (
		preg_match('/^\*{32}$/', $set) ?
		self::getSetting($name) :
		$set
		);
		break;
case 'FOG_API_TOKEN':		case 'FOG_API_TOKEN':
$set = base64_decode($set);		$set = base64_decode($set);
break;		break;
case 'FOG_MEMORY_LIMIT':		case 'FOG_MEMORY_LIMIT':
if ($set < 128) {		if ($set < 128) {
$set = 128;		$set = 128;
}		}
break;		break;
case 'FOG_AD_DEFAULT_PASSWORD':
break;
case 'FOG_CLIENT_BANNER_SHA':		case 'FOG_CLIENT_BANNER_SHA':
continue 2;		continue 2;
case 'FOG_CLIENT_BANNER_IMAGE':		case 'FOG_CLIENT_BANNER_IMAGE':
$banner = filter_input(INPUT_POST, 'banner');		$banner = filter_input(INPUT_POST, 'banner');
$set = $banner;		$set = $banner;
if (!$banner) {		if (!$banner) {
self::setSetting('FOG_CLIENT_BANNER_SHA', '');		self::setSetting('FOG_CLIENT_BANNER_SHA', '');
}		}
if (!($_FILES[$key]['name']		if (!($_FILES[$key]['name']
&& file_exists($_FILES[$key]['tmp_name']))		&& file_exists($_FILES[$key]['tmp_name']))
End of changes. 3 change blocks.
2 lines changed or deleted		15 lines changed or added

---