"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "packages/web/lib/pages/imagemanagementpage.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.

imagemanagementpage.class.php  (fogproject-1.5.7):imagemanagementpage.class.php  (fogproject-1.5.8)
skipping to change at line 524 skipping to change at line 524
'<select name="imagemanage" id="imagemanage" class="form-control">' '<select name="imagemanage" id="imagemanage" class="form-control">'
. '<option value="0"%s>%s</option>' . '<option value="0"%s>%s</option>'
. '<option value="1"%s>%s</option>' . '<option value="1"%s>%s</option>'
. '<option value="2"%s>%s</option>' . '<option value="2"%s>%s</option>'
. '<option value="3"%s>%s</option>' . '<option value="3"%s>%s</option>'
. '<option value="4"%s>%s</option>' . '<option value="4"%s>%s</option>'
. '<option value="5"%s>%s</option>' . '<option value="5"%s>%s</option>'
. '<option value="6"%s>%s</option>' . '<option value="6"%s>%s</option>'
. '</select>', . '</select>',
( (
!$imagemanage || $imagemanage == 0 ? $imagemanage == 0 ?
' selected' : ' selected' :
'' ''
), ),
_('Partclone Gzip'), _('Partclone Gzip'),
( (
$imagemanage == 1 ? $imagemanage == 1 ?
' selected' : ' selected' :
'' ''
), ),
_('Partimage'), _('Partimage'),
skipping to change at line 554 skipping to change at line 554
'' ''
), ),
_('Partclone Uncompressed'), _('Partclone Uncompressed'),
( (
$imagemanage == 4 ? $imagemanage == 4 ?
' selected' : ' selected' :
'' ''
), ),
_('Partclone Uncompressed Split 200MiB'), _('Partclone Uncompressed Split 200MiB'),
( (
$imagemanage == 5 ? !$imagemanage || $imagemanage == 5 ?
' selected' : ' selected' :
'' ''
), ),
_('Partclone Zstd'), _('Partclone Zstd'),
( (
$imagemanage == 6 ? $imagemanage == 6 ?
' selected' : ' selected' :
'' ''
), ),
_('Partclone Zstd Split 200MiB') _('Partclone Zstd Split 200MiB')
skipping to change at line 958 skipping to change at line 958
. $StorageNode->get('path') . $StorageNode->get('path')
. '/' . '/'
. '</span>' . '</span>'
. '<input type="text" class="form-control imagefile-input" ' . '<input type="text" class="form-control imagefile-input" '
. 'name="file" id="iFile" ' . 'name="file" id="iFile" '
. 'value="' . 'value="'
. $file . $file
. '"/>', . '"/>',
'<label for="imagetype">' '<label for="imagetype">'
. _('Image Type') . _('Image Type')
. '</label>' => $ImageTypes, . '</label>&nbsp;&nbsp;<i class="icon fa fa-info-circle '
. 'fa-lg hand" data-toggle="tooltip" data-placement="right" '
. 'data-html="true" data-trigger="click" style="size:+3; color:#337a
b7;" '
. 'title="Image Type is a very important setting and can have '
. 'major impact on how your imaging works or fails. Please read '
. 'more about the different image types and how to use those '
. '<a href=\'https://wiki.fogproject.org/wiki/index.php?title=Managi
ng_FOG#Images\' '
. 'target=\'_blank\'>in our wiki</a> before you chose!"></i>' => $Im
ageTypes,
'<label for="imagepartitiontype">' '<label for="imagepartitiontype">'
. _('Partition') . _('Partition')
. '</label>' => $ImagePartitionTypes, . '</label>' => $ImagePartitionTypes,
'<label for="protectimage">' '<label for="protectimage">'
. _('Protected') . _('Protected')
. '</label>' => '<input type="checkbox" ' . '</label>' => '<input type="checkbox" '
. 'name="protected_image" id="protectimage"' . 'name="protected_image" id="protectimage"'
. $toprot . $toprot
. '/>', . '/>',
'<label for="isEnabled">' '<label for="isEnabled">'
skipping to change at line 1125 skipping to change at line 1132
echo '<div class="panel panel-info">'; echo '<div class="panel panel-info">';
echo '<div class="panel-heading text-center">'; echo '<div class="panel-heading text-center">';
echo '<h4 class="title">'; echo '<h4 class="title">';
echo _('Image Storage Groups'); echo _('Image Storage Groups');
echo '</h4>'; echo '</h4>';
echo '</div>'; echo '</div>';
echo '<div class="panel-body">'; echo '<div class="panel-body">';
echo '<form class="form-horizontal" method="post" action="' echo '<form class="form-horizontal" method="post" action="'
. $this->formAction . $this->formAction
. '&tab=image-storage">'; . '&tab=image-storage">';
if (count($this->data)) { if (is_array($this->data) && count($this->data)) {
echo '<div class="text-center">'; echo '<div class="text-center">';
echo '<div class="checkbox">'; echo '<div class="checkbox">';
echo '<label for="groupMeShow">'; echo '<label for="groupMeShow">';
echo '<input type="checkbox" name="groupMeShow" ' echo '<input type="checkbox" name="groupMeShow" '
. 'id="groupMeShow"/>'; . 'id="groupMeShow"/>';
echo _('Check here to see what storage groups can be added'); echo _('Check here to see what storage groups can be added');
echo '</label>'; echo '</label>';
echo '</div>'; echo '</div>';
echo '</div>'; echo '</div>';
echo '<br/>'; echo '<br/>';
skipping to change at line 1220 skipping to change at line 1227
'storageGroup_id' => $StorageGroup->id, 'storageGroup_id' => $StorageGroup->id,
'storageGroup_name' => $StorageGroup->name, 'storageGroup_name' => $StorageGroup->name,
'is_primary' => ( 'is_primary' => (
$this->obj->getPrimaryGroup($StorageGroup->id) ? $this->obj->getPrimaryGroup($StorageGroup->id) ?
' checked' : ' checked' :
'' ''
) )
); );
unset($StorageGroup); unset($StorageGroup);
} }
if (count($this->data) > 0) { if (is_array($this->data) && count($this->data) > 0) {
self::$HookManager->processEvent( self::$HookManager->processEvent(
'IMAGE_EDIT_STORAGE_GROUP', 'IMAGE_EDIT_STORAGE_GROUP',
array( array(
'data' => &$this->data, 'data' => &$this->data,
'headerData' => &$this->headerData, 'headerData' => &$this->headerData,
'templates' => &$this->templates, 'templates' => &$this->templates,
'attributes' => &$this->attributes 'attributes' => &$this->attributes
) )
); );
echo '<div class="panel panel-info">'; echo '<div class="panel panel-info">';
 End of changes. 5 change blocks. 
5 lines changed or deleted 15 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)