commit f39b4850f26efe0989b1d3ad14acbb9924de6718 parent 92709b3d4bec48eee356242ab6622932787ef3a7 Author: Jan Dankert <develop@jandankert.de> Date: Wed, 19 Feb 2020 23:16:50 +0100 New: A ConditionalAttribute for HTML checkboxes and radiobuttons (the attribute 'checked' may not be present if value is 'off'). Diffstat:
86 files changed, 257 insertions(+), 190 deletions(-)
diff --git a/modules/cms-ui/themes/default/html/views/element/advanced.php b/modules/cms-ui/themes/default/html/views/element/advanced.php @@ -21,7 +21,7 @@ </input> <?php } ?> <?php $if7=!(isset($subtypes)); if($if7) { ?> - <input name="subtype" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$subtype)) ?>" class=""> + <input name="subtype" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$subtype)) ?>" class=""> </input> <?php } ?> </div> @@ -32,7 +32,7 @@ <div class="label"> </div> <div class="input"> - <input type="checkbox" name="with_icon" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$with_icon)) ?>" class=""> + <input type="checkbox" name="with_icon" value="1" <?php if(''.@$with_icon.''){ ?>checked="1"<?php } ?> class=""> </input> <label class="label"> <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_WITH_ICON'))) ?> @@ -46,7 +46,7 @@ <div class="label"> </div> <div class="input"> - <input type="checkbox" name="inherit" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$inherit)) ?>" class=""> + <input type="checkbox" name="inherit" value="1" <?php if(''.@$inherit.''){ ?>checked="1"<?php } ?> class=""> </input> <label class="label"> <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_INHERIT'))) ?> @@ -60,7 +60,7 @@ <div class="label"> </div> <div class="input"> - <input type="checkbox" name="all_languages" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$all_languages)) ?>" class=""> + <input type="checkbox" name="all_languages" value="1" <?php if(''.@$all_languages.''){ ?>checked="1"<?php } ?> class=""> </input> <label class="label"> <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_ALL_LANGUAGES'))) ?> @@ -74,7 +74,7 @@ <div class="label"> </div> <div class="input"> - <input type="checkbox" name="writable" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$writable)) ?>" class=""> + <input type="checkbox" name="writable" value="1" <?php if(''.@$writable.''){ ?>checked="1"<?php } ?> class=""> </input> <label class="label"> <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_writable'))) ?> @@ -90,7 +90,7 @@ </span> </div> <div class="input"> - <input name="width" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$width)) ?>" class=""> + <input name="width" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$width)) ?>" class=""> </input> </div> </div> @@ -102,7 +102,7 @@ </span> </div> <div class="input"> - <input name="height" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$height)) ?>" class=""> + <input name="height" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$height)) ?>" class=""> </input> </div> </div> @@ -138,7 +138,7 @@ </span> </div> <div class="input"> - <input name="decimals" disabled="" type="text" maxlength="2" value="<?php echo encodeHtml(htmlentities(@$decimals)) ?>" class=""> + <input name="decimals" type="text" maxlength="2" value="<?php echo encodeHtml(htmlentities(@$decimals)) ?>" class=""> </input> </div> </div> @@ -150,7 +150,7 @@ </span> </div> <div class="input"> - <input name="dec_point" disabled="" type="text" maxlength="5" value="<?php echo encodeHtml(htmlentities(@$dec_point)) ?>" class=""> + <input name="dec_point" type="text" maxlength="5" value="<?php echo encodeHtml(htmlentities(@$dec_point)) ?>" class=""> </input> </div> </div> @@ -162,7 +162,7 @@ </span> </div> <div class="input"> - <input name="thousand_sep" disabled="" type="text" maxlength="1" value="<?php echo encodeHtml(htmlentities(@$thousand_sep)) ?>" class=""> + <input name="thousand_sep" type="text" maxlength="1" value="<?php echo encodeHtml(htmlentities(@$thousand_sep)) ?>" class=""> </input> </div> </div> @@ -174,7 +174,7 @@ </span> </div> <div class="input"> - <input name="default_text" disabled="" type="text" maxlength="255" value="<?php echo encodeHtml(htmlentities(@$default_text)) ?>" class=""> + <input name="default_text" type="text" maxlength="255" value="<?php echo encodeHtml(htmlentities(@$default_text)) ?>" class=""> </input> </div> </div> diff --git a/modules/cms-ui/themes/default/html/views/element/name.php b/modules/cms-ui/themes/default/html/views/element/name.php @@ -6,7 +6,7 @@ </span> </td> <td class=""> - <input name="name" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class=""> + <input name="name" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class=""> </input> </td> </tr> diff --git a/modules/cms-ui/themes/default/html/views/element/prop.php b/modules/cms-ui/themes/default/html/views/element/prop.php @@ -7,7 +7,7 @@ </span> </div> <div class="input"> - <input name="label" disabled="" required="required" autofocus="autofocus" type="text" maxlength="100" value="<?php echo encodeHtml(htmlentities(@$label)) ?>" class=""> + <input name="label" required="required" autofocus="autofocus" type="text" maxlength="100" value="<?php echo encodeHtml(htmlentities(@$label)) ?>" class=""> </input> </div> </div> @@ -17,7 +17,7 @@ </span> </div> <div class="input"> - <input name="name" disabled="" required="required" type="text" maxlength="50" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class=""> + <input name="name" required="required" type="text" maxlength="50" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class=""> </input> </div> </div> diff --git a/modules/cms-ui/themes/default/html/views/element/properties.php b/modules/cms-ui/themes/default/html/views/element/properties.php @@ -12,7 +12,7 @@ </input> <?php } ?> <?php $if8=!(isset($subtypes)); if($if8) { ?> - <input name="subtype" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$subtype)) ?>" class=""> + <input name="subtype" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$subtype)) ?>" class=""> </input> <?php } ?> </td> @@ -25,7 +25,7 @@ </span> </td> <td class=""> - <input type="checkbox" name="with_icon" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$with_icon)) ?>" class=""> + <input type="checkbox" name="with_icon" value="1" <?php if(''.@$with_icon.''){ ?>checked="1"<?php } ?> class=""> </input> </td> </tr> @@ -37,7 +37,7 @@ </span> </td> <td class=""> - <input type="checkbox" name="all_languages" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$all_languages)) ?>" class=""> + <input type="checkbox" name="all_languages" value="1" <?php if(''.@$all_languages.''){ ?>checked="1"<?php } ?> class=""> </input> </td> </tr> @@ -49,7 +49,7 @@ </span> </td> <td class=""> - <input type="checkbox" name="writable" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$writable)) ?>" class=""> + <input type="checkbox" name="writable" value="1" <?php if(''.@$writable.''){ ?>checked="1"<?php } ?> class=""> </input> </td> </tr> @@ -61,7 +61,7 @@ </span> </td> <td class=""> - <input name="width" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$width)) ?>" class=""> + <input name="width" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$width)) ?>" class=""> </input> </td> </tr> @@ -73,7 +73,7 @@ </span> </td> <td class=""> - <input name="height" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$height)) ?>" class=""> + <input name="height" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$height)) ?>" class=""> </input> </td> </tr> @@ -109,7 +109,7 @@ </span> </td> <td class=""> - <input name="decimals" disabled="" type="text" maxlength="2" value="<?php echo encodeHtml(htmlentities(@$decimals)) ?>" class=""> + <input name="decimals" type="text" maxlength="2" value="<?php echo encodeHtml(htmlentities(@$decimals)) ?>" class=""> </input> </td> </tr> @@ -121,7 +121,7 @@ </span> </td> <td class=""> - <input name="dec_point" disabled="" type="text" maxlength="5" value="<?php echo encodeHtml(htmlentities(@$dec_point)) ?>" class=""> + <input name="dec_point" type="text" maxlength="5" value="<?php echo encodeHtml(htmlentities(@$dec_point)) ?>" class=""> </input> </td> </tr> @@ -133,7 +133,7 @@ </span> </td> <td class=""> - <input name="thousand_sep" disabled="" type="text" maxlength="1" value="<?php echo encodeHtml(htmlentities(@$thousand_sep)) ?>" class=""> + <input name="thousand_sep" type="text" maxlength="1" value="<?php echo encodeHtml(htmlentities(@$thousand_sep)) ?>" class=""> </input> </td> </tr> @@ -145,7 +145,7 @@ </span> </td> <td class=""> - <input name="default_text" disabled="" type="text" maxlength="255" value="<?php echo encodeHtml(htmlentities(@$default_text)) ?>" class=""> + <input name="default_text" type="text" maxlength="255" value="<?php echo encodeHtml(htmlentities(@$default_text)) ?>" class=""> </input> </td> </tr> diff --git a/modules/cms-ui/themes/default/html/views/element/remove.php b/modules/cms-ui/themes/default/html/views/element/remove.php @@ -17,7 +17,7 @@ <div class="label"> </div> <div class="input"> - <input type="checkbox" name="confirm" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$confirm)) ?>" required="required" class=""> + <input type="checkbox" name="confirm" value="1" <?php if(''.@$confirm.''){ ?>checked="1"<?php } ?> required="required" class=""> </input> <label class="label"> <span class=""><?php echo encodeHtml(htmlentities(@lang('CONFIRM_DELETE'))) ?> diff --git a/modules/cms-ui/themes/default/html/views/file/advanced.php b/modules/cms-ui/themes/default/html/views/file/advanced.php @@ -1,6 +1,6 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> <form name="" target="_self" data-target="view" action="./" data-method="advanced" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form file"> - <label class="or-form-row or-form-input"><input name="extension" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$extension)) ?>" class="extension"> + <label class="or-form-row or-form-input"><input name="extension" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$extension)) ?>" class="extension"> </input></label> <label class="or-form-row or-form-input"><input name="type" value="<?php echo encodeHtml(htmlentities(@$type)) ?>" size="1" class=""> </input></label> diff --git a/modules/cms-ui/themes/default/html/views/file/remove.php b/modules/cms-ui/themes/default/html/views/file/remove.php @@ -2,6 +2,6 @@ <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form file"> <label class="or-form-row"><span class="or-form-input"><span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> </span></span></label> - <label class="or-form-row or-form-checkbox"><input type="checkbox" name="delete" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$delete)) ?>" class=""> + <label class="or-form-row or-form-checkbox"><input type="checkbox" name="delete" value="1" <?php if(''.@$delete.''){ ?>checked="1"<?php } ?> class=""> </input></label> </form> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/advanced.php b/modules/cms-ui/themes/default/html/views/folder/advanced.php @@ -3,7 +3,7 @@ <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> <td class="help"> - <input type="checkbox" name="checkall" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$checkall)) ?>" class=""> + <input type="checkbox" name="checkall" value="1" <?php if(''.@$checkall.''){ ?>checked="1"<?php } ?> class=""> </input> </td> <td class="help"> @@ -19,7 +19,7 @@ <tr class="data"> <td width="1%" class=""> <?php $if7=($writable); if($if7) { ?> - <input type="checkbox" name="<?php echo encodeHtml(htmlentities(@$id)) ?>" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$${id)) ?>}" class=""> + <input type="checkbox" name="<?php echo encodeHtml(htmlentities(@$id)) ?>" value="1" <?php if(''.@$${id.'}'){ ?>checked="1"<?php } ?> class=""> </input> <?php } ?> <?php $if7=(!'writable'); if($if7) { ?> @@ -89,7 +89,7 @@ <div class="input"> <span class=""> </span> - <input type="checkbox" name="confirm" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$confirm)) ?>" required="required" class=""> + <input type="checkbox" name="confirm" value="1" <?php if(''.@$confirm.''){ ?>checked="1"<?php } ?> required="required" class=""> </input> <label class="label"> <span class=""><?php echo encodeHtml(htmlentities(@lang('CONFIRM_DELETE'))) ?> diff --git a/modules/cms-ui/themes/default/html/views/folder/createfile.php b/modules/cms-ui/themes/default/html/views/folder/createfile.php @@ -36,7 +36,7 @@ </span> </div> <div class="input"> - <input name="url" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$url)) ?>" class=""> + <input name="url" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$url)) ?>" class=""> </input> </div> </div> @@ -48,7 +48,7 @@ </span> </div> <div class="input"> - <input name="name" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class=""> + <input name="name" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class=""> </input> </div> </div> diff --git a/modules/cms-ui/themes/default/html/views/folder/createfolder.php b/modules/cms-ui/themes/default/html/views/folder/createfolder.php @@ -8,7 +8,7 @@ </span> </div> <div class="input"> - <input name="name" disabled="" type="text" maxlength="256" value="" class=""> + <input name="name" type="text" maxlength="256" value="" class=""> </input> </div> </div> diff --git a/modules/cms-ui/themes/default/html/views/folder/createimage.php b/modules/cms-ui/themes/default/html/views/folder/createimage.php @@ -36,7 +36,7 @@ </span> </div> <div class="input"> - <input name="url" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$url)) ?>" class=""> + <input name="url" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$url)) ?>" class=""> </input> </div> </div> @@ -48,7 +48,7 @@ </span> </div> <div class="input"> - <input name="name" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class=""> + <input name="name" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class=""> </input> </div> </div> diff --git a/modules/cms-ui/themes/default/html/views/folder/createlink.php b/modules/cms-ui/themes/default/html/views/folder/createlink.php @@ -6,7 +6,7 @@ </span> </div> <div class="input"> - <input name="name" disabled="" type="text" maxlength="256" value="" class=""> + <input name="name" type="text" maxlength="256" value="" class=""> </input> </div> </div> diff --git a/modules/cms-ui/themes/default/html/views/folder/createpage.php b/modules/cms-ui/themes/default/html/views/folder/createpage.php @@ -16,7 +16,7 @@ </span> </div> <div class="input"> - <input name="name" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class="focus,name"> + <input name="name" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class="focus,name"> </input> </div> </div> diff --git a/modules/cms-ui/themes/default/html/views/folder/createtext.php b/modules/cms-ui/themes/default/html/views/folder/createtext.php @@ -34,7 +34,7 @@ </span> </div> <div class="input"> - <input name="url" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$url)) ?>" class=""> + <input name="url" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$url)) ?>" class=""> </input> </div> </div> @@ -46,7 +46,7 @@ </span> </div> <div class="input"> - <input name="name" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class=""> + <input name="name" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class=""> </input> </div> </div> diff --git a/modules/cms-ui/themes/default/html/views/folder/createurl.php b/modules/cms-ui/themes/default/html/views/folder/createurl.php @@ -6,7 +6,7 @@ </span> </div> <div class="input"> - <input name="url" disabled="" type="text" maxlength="256" value="" class=""> + <input name="url" type="text" maxlength="256" value="" class=""> </input> </div> </div> @@ -16,7 +16,7 @@ </span> </div> <div class="input"> - <input name="name" disabled="" type="text" maxlength="256" value="" class=""> + <input name="name" type="text" maxlength="256" value="" class=""> </input> </div> </div> diff --git a/modules/cms-ui/themes/default/html/views/folder/inherit.php b/modules/cms-ui/themes/default/html/views/folder/inherit.php @@ -8,7 +8,7 @@ <div class="input"> <?php { $inherit= '1'; ?> <?php } ?> - <input name="inherit" disabled="" type="checkbox" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$inherit)) ?>" class=""> + <input name="inherit" type="checkbox" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$inherit)) ?>" class=""> </input> <label class="label"> <span class=""><?php echo encodeHtml(htmlentities(@lang('inherit_rights'))) ?> diff --git a/modules/cms-ui/themes/default/html/views/folder/pub.php b/modules/cms-ui/themes/default/html/views/folder/pub.php @@ -11,7 +11,7 @@ <div class="label"> </div> <div class="input"> - <input type="checkbox" name="pages" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$pages)) ?>" class=""> + <input type="checkbox" name="pages" value="1" <?php if(''.@$pages.''){ ?>checked="1"<?php } ?> class=""> </input> <label class="label"> <span class=""> @@ -27,7 +27,7 @@ <div class="label"> </div> <div class="input"> - <input type="checkbox" name="files" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$files)) ?>" class=""> + <input type="checkbox" name="files" value="1" <?php if(''.@$files.''){ ?>checked="1"<?php } ?> class=""> </input> <label class="label"> <span class=""> @@ -44,7 +44,7 @@ <div class="label"> </div> <div class="input"> - <input type="checkbox" name="subdirs" disabled="<?php echo encodeHtml(htmlentities(@$subdirs)) ?>" value="1" checked="<?php echo encodeHtml(htmlentities(@$subdirs)) ?>" class=""> + <input type="checkbox" name="subdirs" disabled="disabled" value="1" <?php if(''.@$subdirs.''){ ?>checked="1"<?php } ?> class=""> </input> <label class="label"> <span class=""> @@ -60,7 +60,7 @@ <div class="label"> </div> <div class="input"> - <input type="checkbox" name="clean" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$clean)) ?>" class=""> + <input type="checkbox" name="clean" value="1" <?php if(''.@$clean.''){ ?>checked="1"<?php } ?> class=""> </input> <label class="label"> <span class=""> diff --git a/modules/cms-ui/themes/default/html/views/folder/remove.php b/modules/cms-ui/themes/default/html/views/folder/remove.php @@ -2,8 +2,8 @@ <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form folder"> <label class="or-form-row"><span class="or-form-input"><span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> </span></span></label> - <label class="or-form-row or-form-checkbox"><input type="checkbox" name="delete" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$delete)) ?>" class=""> + <label class="or-form-row or-form-checkbox"><input type="checkbox" name="delete" value="1" <?php if(''.@$delete.''){ ?>checked="1"<?php } ?> class=""> </input></label> - <label class="or-form-row or-form-checkbox"><input type="checkbox" name="withChildren" disabled="not:var:hasChildren" value="1" checked="<?php echo encodeHtml(htmlentities(@$withChildren)) ?>" class=""> + <label class="or-form-row or-form-checkbox"><input type="checkbox" name="withChildren" disabled="disabled" value="1" <?php if(''.@$withChildren.''){ ?>checked="1"<?php } ?> class=""> </input></label> </form> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/group/add.php b/modules/cms-ui/themes/default/html/views/group/add.php @@ -6,7 +6,7 @@ </label> </div> <div class="input"> - <input name="name" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class="focus"> + <input name="name" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class="focus"> </input> </div> </div> diff --git a/modules/cms-ui/themes/default/html/views/group/memberships.php b/modules/cms-ui/themes/default/html/views/group/memberships.php @@ -12,7 +12,7 @@ <?php foreach($memberships as $list_key=>$list_value) { extract($list_value); ?> <tr class="data"> <td class=""> - <input type="checkbox" name="<?php echo encodeHtml(htmlentities(@$var)) ?>" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$${var)) ?>}" class=""> + <input type="checkbox" name="<?php echo encodeHtml(htmlentities(@$var)) ?>" value="1" <?php if(''.@$${var.'}'){ ?>checked="1"<?php } ?> class=""> </input> </td> <td class=""> diff --git a/modules/cms-ui/themes/default/html/views/group/prop.php b/modules/cms-ui/themes/default/html/views/group/prop.php @@ -8,7 +8,7 @@ </label> </div> <div class="input"> - <input name="name" disabled="" type="text" maxlength="100" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class="name focus"> + <input name="name" type="text" maxlength="100" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class="name focus"> </input> </div> </div> diff --git a/modules/cms-ui/themes/default/html/views/group/remove.php b/modules/cms-ui/themes/default/html/views/group/remove.php @@ -16,7 +16,7 @@ <div class="label"> </div> <div class="input"> - <input type="checkbox" name="confirm" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$confirm)) ?>" required="required" class=""> + <input type="checkbox" name="confirm" value="1" <?php if(''.@$confirm.''){ ?>checked="1"<?php } ?> required="required" class=""> </input> <label class="label"><?php echo encodeHtml(htmlentities(@lang('GROUP_DELETE'))) ?> </label> diff --git a/modules/cms-ui/themes/default/html/views/group/rights.php b/modules/cms-ui/themes/default/html/views/group/rights.php @@ -72,7 +72,7 @@ <td class=""> <?php { $$list_value= $bits[$list_value]; ?> <?php } ?> - <input type="checkbox" name="<?php echo encodeHtml(htmlentities(@$list_value)) ?>" disabled="1" value="1" checked="<?php echo encodeHtml(htmlentities(@$${list_value)) ?>}" class=""> + <input type="checkbox" name="<?php echo encodeHtml(htmlentities(@$list_value)) ?>" disabled="disabled" value="1" <?php if(''.@$${list_value.'}'){ ?>checked="1"<?php } ?> class=""> </input> </td> <?php } ?> diff --git a/modules/cms-ui/themes/default/html/views/grouplist/add.php b/modules/cms-ui/themes/default/html/views/grouplist/add.php @@ -6,7 +6,7 @@ </label> </div> <div class="input"> - <input name="name" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class="focus"> + <input name="name" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class="focus"> </input> </div> </div> diff --git a/modules/cms-ui/themes/default/html/views/image/remove.php b/modules/cms-ui/themes/default/html/views/image/remove.php @@ -16,7 +16,7 @@ </span> </td> <td class=""> - <input type="checkbox" name="delete" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$delete)) ?>" class=""> + <input type="checkbox" name="delete" value="1" <?php if(''.@$delete.''){ ?>checked="1"<?php } ?> class=""> </input> </td> </tr> diff --git a/modules/cms-ui/themes/default/html/views/image/size.php b/modules/cms-ui/themes/default/html/views/image/size.php @@ -46,11 +46,11 @@ <div class="label"> </div> <div class="input"> - <input name="width" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$width)) ?>" class=""> + <input name="width" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$width)) ?>" class=""> </input> <span class=""> * </span> - <input name="height" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$height)) ?>" class=""> + <input name="height" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$height)) ?>" class=""> </input> </div> </div> @@ -86,7 +86,7 @@ <div class="label"> </div> <div class="input"> - <input type="checkbox" name="copy" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$copy)) ?>" class=""> + <input type="checkbox" name="copy" value="1" <?php if(''.@$copy.''){ ?>checked="1"<?php } ?> class=""> </input> <label class="label"> <span class=""><?php echo encodeHtml(htmlentities(@lang('copy'))) ?> diff --git a/modules/cms-ui/themes/default/html/views/language/prop.php b/modules/cms-ui/themes/default/html/views/language/prop.php @@ -6,7 +6,7 @@ </span> </div> <div class="input"> - <input name="name" disabled="" type="text" maxlength="50" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class="focus"> + <input name="name" type="text" maxlength="50" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class="focus"> </input> </div> </div> @@ -16,7 +16,7 @@ </span> </div> <div class="input"> - <input name="isocode" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$isocode)) ?>" class=""> + <input name="isocode" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$isocode)) ?>" class=""> </input> </div> </div> @@ -24,7 +24,7 @@ <div class="label"> </div> <div class="input"> - <input type="checkbox" name="is_default" disabled="<?php echo encodeHtml(htmlentities(@$is_default)) ?>" value="1" checked="<?php echo encodeHtml(htmlentities(@$is_default)) ?>" class=""> + <input type="checkbox" name="is_default" disabled="disabled" value="1" <?php if(''.@$is_default.''){ ?>checked="1"<?php } ?> class=""> </input> <label class="label"><?php echo encodeHtml(htmlentities(@lang('GLOBAL_is_default'))) ?> </label> diff --git a/modules/cms-ui/themes/default/html/views/language/remove.php b/modules/cms-ui/themes/default/html/views/language/remove.php @@ -17,7 +17,7 @@ <div class="label"> </div> <div class="input"> - <input type="checkbox" name="confirm" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$confirm)) ?>" required="required" class=""> + <input type="checkbox" name="confirm" value="1" <?php if(''.@$confirm.''){ ?>checked="1"<?php } ?> required="required" class=""> </input> <label class="label"> <span class=""><?php echo encodeHtml(htmlentities(@lang('CONFIRM_DELETE'))) ?> diff --git a/modules/cms-ui/themes/default/html/views/link/remove.php b/modules/cms-ui/themes/default/html/views/link/remove.php @@ -2,6 +2,6 @@ <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="link" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form link"> <label class="or-form-row"><span class="or-form-input"><span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> </span></span></label> - <label class="or-form-row or-form-checkbox"><input type="checkbox" name="delete" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$delete)) ?>" class=""> + <label class="or-form-row or-form-checkbox"><input type="checkbox" name="delete" value="1" <?php if(''.@$delete.''){ ?>checked="1"<?php } ?> class=""> </input></label> </form> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/login/login.php b/modules/cms-ui/themes/default/html/views/login/login.php @@ -40,7 +40,7 @@ </div> <div class="input"> <?php $if6=!(isset($force_username)); if($if6) { ?> - <input name="login_name" disabled="" required="required" placeholder="<?php echo encodeHtml(htmlentities(@lang('USER_USERNAME'))) ?>" autofocus="autofocus" type="text" maxlength="128" value="<?php echo encodeHtml(htmlentities(@$login_name)) ?>" class="name"> + <input name="login_name" required="required" placeholder="<?php echo encodeHtml(htmlentities(@lang('USER_USERNAME'))) ?>" autofocus="autofocus" type="text" maxlength="128" value="<?php echo encodeHtml(htmlentities(@$login_name)) ?>" class="name"> </input> <?php } ?> <?php if(!$if6) { ?> @@ -67,7 +67,7 @@ <div class="label"> </div> <div class="input"> - <input type="checkbox" name="remember" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$remember)) ?>" class=""> + <input type="checkbox" name="remember" value="1" <?php if(''.@$remember.''){ ?>checked="1"<?php } ?> class=""> </input> <label class="label"> <span class=""><?php echo encodeHtml(htmlentities(@lang('REMEMBER_ME'))) ?> @@ -111,7 +111,7 @@ </label> </div> <div class="input"> - <input name="user_token" disabled="" type="text" maxlength="30" value="" class=""> + <input name="user_token" type="text" maxlength="30" value="" class=""> </input> </div> </div> diff --git a/modules/cms-ui/themes/default/html/views/login/openid.php b/modules/cms-ui/themes/default/html/views/login/openid.php @@ -17,7 +17,7 @@ <?php $if7=($openid_user_identity); if($if7) { ?> <input type="radio" name="openid_provider" disabled="" value="identity" checked="<?php echo encodeHtml(htmlentities(@$openid_provider)) ?>" class=""> </input> - <input name="openid_url" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$openid_url)) ?>" class="name"> + <input name="openid_url" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$openid_url)) ?>" class="name"> </input> <?php } ?> </div> diff --git a/modules/cms-ui/themes/default/html/views/login/password.php b/modules/cms-ui/themes/default/html/views/login/password.php @@ -9,7 +9,7 @@ </span> </div> <div class="input"> - <input name="username" disabled="" autofocus="autofocus" type="text" maxlength="128" value="<?php echo encodeHtml(htmlentities(@$username)) ?>" class=""> + <input name="username" autofocus="autofocus" type="text" maxlength="128" value="<?php echo encodeHtml(htmlentities(@$username)) ?>" class=""> </input> </div> </div> diff --git a/modules/cms-ui/themes/default/html/views/login/passwordcode.php b/modules/cms-ui/themes/default/html/views/login/passwordcode.php @@ -11,7 +11,7 @@ </span> </td> <td class=""> - <input name="code" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$code)) ?>" class=""> + <input name="code" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$code)) ?>" class=""> </input> </td> </tr> diff --git a/modules/cms-ui/themes/default/html/views/login/register.php b/modules/cms-ui/themes/default/html/views/login/register.php @@ -11,7 +11,7 @@ </label> </div> <div class="input"> - <input name="mail" disabled="" type="text" maxlength="256" value="" class="focus"> + <input name="mail" type="text" maxlength="256" value="" class="focus"> </input> </div> </div> diff --git a/modules/cms-ui/themes/default/html/views/login/registercode.php b/modules/cms-ui/themes/default/html/views/login/registercode.php @@ -8,7 +8,7 @@ </span> </div> <div class="input"> - <input name="code" disabled="" type="text" maxlength="256" value="" class="focus"> + <input name="code" type="text" maxlength="256" value="" class="focus"> </input> </div> </div> @@ -18,7 +18,7 @@ </span> </div> <div class="input"> - <input name="username" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$username)) ?>" class=""> + <input name="username" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$username)) ?>" class=""> </input> </div> </div> diff --git a/modules/cms-ui/themes/default/html/views/model/prop.php b/modules/cms-ui/themes/default/html/views/model/prop.php @@ -6,7 +6,7 @@ </span> </div> <div class="input"> - <input name="name" disabled="" autofocus="autofocus" type="text" maxlength="50" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class=""> + <input name="name" autofocus="autofocus" type="text" maxlength="50" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class=""> </input> </div> </div> @@ -14,7 +14,7 @@ <div class="label"> </div> <div class="input"> - <input type="checkbox" name="is_default" disabled="<?php echo encodeHtml(htmlentities(@$is_default)) ?>" value="1" checked="<?php echo encodeHtml(htmlentities(@$is_default)) ?>" class=""> + <input type="checkbox" name="is_default" disabled="disabled" value="1" <?php if(''.@$is_default.''){ ?>checked="1"<?php } ?> class=""> </input> <label class="label"><?php echo encodeHtml(htmlentities(@lang('GLOBAL_is_default'))) ?> </label> diff --git a/modules/cms-ui/themes/default/html/views/model/remove.php b/modules/cms-ui/themes/default/html/views/model/remove.php @@ -17,7 +17,7 @@ <div class="label"> </div> <div class="input"> - <input type="checkbox" name="confirm" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$confirm)) ?>" required="required" class=""> + <input type="checkbox" name="confirm" value="1" <?php if(''.@$confirm.''){ ?>checked="1"<?php } ?> required="required" class=""> </input> <label class="label"> <span class=""><?php echo encodeHtml(htmlentities(@lang('CONFIRM_DELETE'))) ?> diff --git a/modules/cms-ui/themes/default/html/views/modellist/add.php b/modules/cms-ui/themes/default/html/views/modellist/add.php @@ -6,7 +6,7 @@ </span> </div> <div class="input"> - <input name="name" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class="focus"> + <input name="name" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class="focus"> </input> </div> </div> diff --git a/modules/cms-ui/themes/default/html/views/object/aclform.php b/modules/cms-ui/themes/default/html/views/object/aclform.php @@ -68,13 +68,13 @@ <?php $if8=($t=='read'); if($if8) { ?> <?php { $$t= true; ?> <?php } ?> - <input type="checkbox" name="<?php echo encodeHtml(htmlentities(@$t)) ?>" disabled="1" value="1" checked="<?php echo encodeHtml(htmlentities(@$${t)) ?>}" class=""> + <input type="checkbox" name="<?php echo encodeHtml(htmlentities(@$t)) ?>" disabled="disabled" value="1" <?php if(''.@$${t.'}'){ ?>checked="1"<?php } ?> class=""> </input> <?php } ?> <?php if(!$if8) { ?> <?php { unset($$t) ?> <?php } ?> - <input type="checkbox" name="<?php echo encodeHtml(htmlentities(@$t)) ?>" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$${t)) ?>}" class=""> + <input type="checkbox" name="<?php echo encodeHtml(htmlentities(@$t)) ?>" value="1" <?php if(''.@$${t.'}'){ ?>checked="1"<?php } ?> class=""> </input> <?php } ?> <label class="label"> diff --git a/modules/cms-ui/themes/default/html/views/object/inherit.php b/modules/cms-ui/themes/default/html/views/object/inherit.php @@ -8,7 +8,7 @@ <div class="input"> <?php { $inherit= '1'; ?> <?php } ?> - <input type="checkbox" name="inherit" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$inherit)) ?>" class=""> + <input type="checkbox" name="inherit" value="1" <?php if(''.@$inherit.''){ ?>checked="1"<?php } ?> class=""> </input> <label class="label"> <span class=""><?php echo encodeHtml(htmlentities(@lang('inherit_rights'))) ?> diff --git a/modules/cms-ui/themes/default/html/views/object/name.php b/modules/cms-ui/themes/default/html/views/object/name.php @@ -3,7 +3,7 @@ <input type="hidden" name="languageid" value="<?php echo encodeHtml(htmlentities(@$languageid)) ?>" class=""> </input> <fieldset class="or-group toggle-open-close open show"><div class="closable"> - <label class="or-form-row or-form-input"><input name="name" disabled="" required="required" type="text" maxlength="255" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class=""> + <label class="or-form-row or-form-input"><input name="name" required="required" type="text" maxlength="255" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class=""> </input></label> <label class="or-form-row or-form-checkbox"><textarea name="description" disabled="" maxlength="255" class="description"><?php echo encodeHtml(htmlentities(@$description)) ?> </textarea></label> diff --git a/modules/cms-ui/themes/default/html/views/object/prop.php b/modules/cms-ui/themes/default/html/views/object/prop.php @@ -1,9 +1,9 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> <form name="" target="_self" data-target="view" action="./" data-method="prop" data-action="object" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form object"> <fieldset class="or-group toggle-open-close open show"><div class="closable"> - <label class="or-form-row or-form-input"><input name="filename" disabled="" autofocus="autofocus" type="text" maxlength="150" value="<?php echo encodeHtml(htmlentities(@$filename)) ?>" class="filename"> + <label class="or-form-row or-form-input"><input name="filename" autofocus="autofocus" type="text" maxlength="150" value="<?php echo encodeHtml(htmlentities(@$filename)) ?>" class="filename"> </input></label> - <label class="or-form-row or-form-input"><input name="alias_filename" disabled="" type="text" maxlength="150" value="<?php echo encodeHtml(htmlentities(@$alias_filename)) ?>" class="filename"> + <label class="or-form-row or-form-input"><input name="alias_filename" type="text" maxlength="150" value="<?php echo encodeHtml(htmlentities(@$alias_filename)) ?>" class="filename"> </input></label> <label class="or-form-row or-form-input"><input name="alias_folderid" value="<?php echo encodeHtml(htmlentities(@$alias_folderid)) ?>" size="1" class=""> </input></label> diff --git a/modules/cms-ui/themes/default/html/views/object/settings.php b/modules/cms-ui/themes/default/html/views/object/settings.php @@ -9,9 +9,9 @@ </label> </div> <div class="input"> - <input name="valid_from_date" disabled="" type="date" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$valid_from_date)) ?>" class=""> + <input name="valid_from_date" type="date" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$valid_from_date)) ?>" class=""> </input> - <input name="valid_from_time" disabled="" type="time" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$valid_from_time)) ?>" class=""> + <input name="valid_from_time" type="time" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$valid_from_time)) ?>" class=""> </input> </div> </div> @@ -23,9 +23,9 @@ </label> </div> <div class="input"> - <input name="valid_until_date" disabled="" type="date" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$valid_until_date)) ?>" class=""> + <input name="valid_until_date" type="date" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$valid_until_date)) ?>" class=""> </input> - <input name="valid_until_time" disabled="" type="time" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$valid_until_time)) ?>" class=""> + <input name="valid_until_time" type="time" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$valid_until_time)) ?>" class=""> </input> </div> </div> diff --git a/modules/cms-ui/themes/default/html/views/page/form.php b/modules/cms-ui/themes/default/html/views/page/form.php @@ -35,12 +35,12 @@ </label> </td> <td class=""> - <input type="checkbox" name="<?php echo encodeHtml(htmlentities(@$saveid)) ?>" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$${saveid)) ?>}" class=""> + <input type="checkbox" name="<?php echo encodeHtml(htmlentities(@$saveid)) ?>" value="1" <?php if(''.@$${saveid.'}'){ ?>checked="1"<?php } ?> class=""> </input> </td> <td class=""> <?php $if10=(in_array($type,explode(",",'text,date,number')); if($if10) { ?> - <input name="<?php echo encodeHtml(htmlentities(@$id)) ?>" disabled="" type="text" maxlength="255" value="<?php echo encodeHtml(htmlentities(@$value)) ?>" class=""> + <input name="<?php echo encodeHtml(htmlentities(@$id)) ?>" type="text" maxlength="255" value="<?php echo encodeHtml(htmlentities(@$value)) ?>" class=""> </input> <?php } ?> <?php $if10=($type=='longtext'); if($if10) { ?> @@ -59,7 +59,7 @@ <fieldset class="or-group toggle-open-close open show"><div class="closable"> <?php $if6=(isset($release)); if($if6) { ?> <div class=""> - <input type="checkbox" name="release" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$release)) ?>" class=""> + <input type="checkbox" name="release" value="1" <?php if(''.@$release.''){ ?>checked="1"<?php } ?> class=""> </input> <label class="label"> <span class=""> @@ -71,7 +71,7 @@ <?php } ?> <?php $if6=(isset($publish)); if($if6) { ?> <div class=""> - <input type="checkbox" name="publish" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$publish)) ?>" class=""> + <input type="checkbox" name="publish" value="1" <?php if(''.@$publish.''){ ?>checked="1"<?php } ?> class=""> </input> <label class="label"> <span class=""> diff --git a/modules/cms-ui/themes/default/html/views/page/name.php b/modules/cms-ui/themes/default/html/views/page/name.php @@ -3,17 +3,17 @@ <input type="hidden" name="languageid" value="<?php echo encodeHtml(htmlentities(@$languageid)) ?>" class=""> </input> <fieldset class="or-group toggle-open-close open show"><div class="closable"> - <label class="or-form-row or-form-input"><input name="name" disabled="" required="required" type="text" maxlength="255" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class=""> + <label class="or-form-row or-form-input"><input name="name" required="required" type="text" maxlength="255" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class=""> </input></label> <label class="or-form-row or-form-checkbox"><textarea name="description" disabled="" maxlength="255" class="description"><?php echo encodeHtml(htmlentities(@$description)) ?> </textarea></label> </div></fieldset> <fieldset class="or-group toggle-open-close open show"><div class="closable"> - <label class="or-form-row or-form-input"><input name="alias_filename" disabled="" type="text" maxlength="150" value="<?php echo encodeHtml(htmlentities(@$alias_filename)) ?>" class="filename"> + <label class="or-form-row or-form-input"><input name="alias_filename" type="text" maxlength="150" value="<?php echo encodeHtml(htmlentities(@$alias_filename)) ?>" class="filename"> </input></label> <label class="or-form-row or-form-input"><input name="alias_folderid" value="<?php echo encodeHtml(htmlentities(@$alias_folderid)) ?>" size="1" class=""> </input></label> - <label class="or-form-row or-form-checkbox"><input type="checkbox" name="leave_link" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$leave_link)) ?>" class=""> + <label class="or-form-row or-form-checkbox"><input type="checkbox" name="leave_link" value="1" <?php if(''.@$leave_link.''){ ?>checked="1"<?php } ?> class=""> </input></label> </div></fieldset> </form> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/page/pub.php b/modules/cms-ui/themes/default/html/views/page/pub.php @@ -11,7 +11,7 @@ <div class="label"> </div> <div class="input"> - <input type="checkbox" name="files" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$files)) ?>" class=""> + <input type="checkbox" name="files" value="1" <?php if(''.@$files.''){ ?>checked="1"<?php } ?> class=""> </input> <label class="label"> <span class=""><?php echo encodeHtml(htmlentities(@lang('global_files'))) ?> diff --git a/modules/cms-ui/themes/default/html/views/page/remove.php b/modules/cms-ui/themes/default/html/views/page/remove.php @@ -2,6 +2,6 @@ <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="page" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form page"> <label class="or-form-row"><span class="or-form-input"><span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> </span></span></label> - <label class="or-form-row or-form-checkbox"><input type="checkbox" name="delete" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$delete)) ?>" class=""> + <label class="or-form-row or-form-checkbox"><input type="checkbox" name="delete" value="1" <?php if(''.@$delete.''){ ?>checked="1"<?php } ?> class=""> </input></label> </form> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/pageelement/link.php b/modules/cms-ui/themes/default/html/views/pageelement/link.php @@ -25,7 +25,7 @@ <?php $if5=(isset($release)); if($if5) { ?> <tr class=""> <td colspan="2" class=""> - <input type="checkbox" name="release" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$release)) ?>" class=""> + <input type="checkbox" name="release" value="1" <?php if(''.@$release.''){ ?>checked="1"<?php } ?> class=""> </input> <label class="label"> <span class=""> @@ -39,7 +39,7 @@ <?php $if5=(isset($publish)); if($if5) { ?> <tr class=""> <td colspan="2" class=""> - <input type="checkbox" name="publish" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$publish)) ?>" class=""> + <input type="checkbox" name="publish" value="1" <?php if(''.@$publish.''){ ?>checked="1"<?php } ?> class=""> </input> <label class="label"> <span class=""> diff --git a/modules/cms-ui/themes/default/html/views/pageelement/pub.php b/modules/cms-ui/themes/default/html/views/pageelement/pub.php @@ -11,7 +11,7 @@ <div class="label"> </div> <div class="input"> - <input type="checkbox" name="files" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$files)) ?>" class=""> + <input type="checkbox" name="files" value="1" <?php if(''.@$files.''){ ?>checked="1"<?php } ?> class=""> </input> <label class="label"> <span class=""><?php echo encodeHtml(htmlentities(@lang('global_files'))) ?> diff --git a/modules/cms-ui/themes/default/html/views/pageelement/value.php b/modules/cms-ui/themes/default/html/views/pageelement/value.php @@ -11,9 +11,9 @@ <?php $if3=($type=='date'); if($if3) { ?> <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> - <label class="or-form-row or-form-input"><input name="date" disabled="" type="date" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$date)) ?>" class=""> + <label class="or-form-row or-form-input"><input name="date" type="date" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$date)) ?>" class=""> </input></label> - <label class="or-form-row or-form-input"><input name="time" disabled="" type="time" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$time)) ?>" class=""> + <label class="or-form-row or-form-input"><input name="time" type="time" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$time)) ?>" class=""> </input></label> </div> </div></fieldset> @@ -21,7 +21,7 @@ <?php $if3=($type=='text'); if($if3) { ?> <tr class=""> <td colspan="2" class=""> - <input name="text" disabled="" type="text" maxlength="255" value="<?php echo encodeHtml(htmlentities(@$text)) ?>" class="text"> + <input name="text" type="text" maxlength="255" value="<?php echo encodeHtml(htmlentities(@$text)) ?>" class="text"> </input> </td> </tr> @@ -166,7 +166,7 @@ </label> </div> <div class="input"> - <input name="linkurl" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$linkurl)) ?>" class=""> + <input name="linkurl" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$linkurl)) ?>" class=""> </input> </div> </div> @@ -193,7 +193,7 @@ <div class=""> <input type="hidden" name="decimals" value="decimals" class=""> </input> - <input name="number" disabled="" type="text" maxlength="20" value="<?php echo encodeHtml(htmlentities(@$number)) ?>" class=""> + <input name="number" type="text" maxlength="20" value="<?php echo encodeHtml(htmlentities(@$number)) ?>" class=""> </input> </div> </div></fieldset> @@ -226,7 +226,7 @@ <?php } ?> <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class=""> - <input type="checkbox" name="preview" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$preview)) ?>" class=""> + <input type="checkbox" name="preview" value="1" <?php if(''.@$preview.''){ ?>checked="1"<?php } ?> class=""> </input> <label class="label"> <span class=""><?php echo encodeHtml(htmlentities(@lang('PAGE_PREVIEW'))) ?> @@ -239,7 +239,7 @@ <fieldset class="or-group toggle-open-close open show"><div class="closable"> <?php $if4=(isset($release)); if($if4) { ?> <div class=""> - <input type="checkbox" name="release" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$release)) ?>" class=""> + <input type="checkbox" name="release" value="1" <?php if(''.@$release.''){ ?>checked="1"<?php } ?> class=""> </input> <label class="label"> <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_RELEASE'))) ?> @@ -249,7 +249,7 @@ <?php } ?> <?php $if4=(isset($publish)); if($if4) { ?> <div class=""> - <input type="checkbox" name="publish" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$publish)) ?>" class=""> + <input type="checkbox" name="publish" value="1" <?php if(''.@$publish.''){ ?>checked="1"<?php } ?> class=""> </input> <label class="label"> <span class=""><?php echo encodeHtml(htmlentities(@lang('PAGE_PUBLISH_AFTER_SAVE'))) ?> diff --git a/modules/cms-ui/themes/default/html/views/profile/confirmmail.php b/modules/cms-ui/themes/default/html/views/profile/confirmmail.php @@ -8,7 +8,7 @@ </label> </div> <div class="input"> - <input name="code" disabled="" required="required" autofocus="autofocus" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$code)) ?>" class=""> + <input name="code" required="required" autofocus="autofocus" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$code)) ?>" class=""> </input> </div> </div> diff --git a/modules/cms-ui/themes/default/html/views/profile/edit.php b/modules/cms-ui/themes/default/html/views/profile/edit.php @@ -41,7 +41,7 @@ </label> </div> <div class="input"> - <input name="fullname" disabled="" type="text" maxlength="128" value="<?php echo encodeHtml(htmlentities(@$fullname)) ?>" class=""> + <input name="fullname" type="text" maxlength="128" value="<?php echo encodeHtml(htmlentities(@$fullname)) ?>" class=""> </input> </div> </div> @@ -51,7 +51,7 @@ </label> </div> <div class="input"> - <input name="tel" disabled="" type="text" maxlength="128" value="<?php echo encodeHtml(htmlentities(@$tel)) ?>" class=""> + <input name="tel" type="text" maxlength="128" value="<?php echo encodeHtml(htmlentities(@$tel)) ?>" class=""> </input> </div> </div> @@ -61,7 +61,7 @@ </label> </div> <div class="input"> - <input name="desc" disabled="" type="text" maxlength="128" value="<?php echo encodeHtml(htmlentities(@$desc)) ?>" class=""> + <input name="desc" type="text" maxlength="128" value="<?php echo encodeHtml(htmlentities(@$desc)) ?>" class=""> </input> </div> </div> @@ -115,7 +115,7 @@ <div class="label"> </div> <div class="input"> - <input type="checkbox" name="totp" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$totp)) ?>" class=""> + <input type="checkbox" name="totp" value="1" <?php if(''.@$totp.''){ ?>checked="1"<?php } ?> class=""> </input> <label class="label"><?php echo encodeHtml(htmlentities(@lang('user_totp'))) ?> </label> @@ -127,7 +127,7 @@ <div class="label"> </div> <div class="input"> - <input type="checkbox" name="hotp" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$hotp)) ?>" class=""> + <input type="checkbox" name="hotp" value="1" <?php if(''.@$hotp.''){ ?>checked="1"<?php } ?> class=""> </input> <label class="label"><?php echo encodeHtml(htmlentities(@lang('user_hotp'))) ?> </label> diff --git a/modules/cms-ui/themes/default/html/views/profile/mail.php b/modules/cms-ui/themes/default/html/views/profile/mail.php @@ -11,7 +11,7 @@ </label> </div> <div class="input"> - <input name="mail" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$mail)) ?>" class=""> + <input name="mail" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$mail)) ?>" class=""> </input> </div> </div> diff --git a/modules/cms-ui/themes/default/html/views/project/add.php b/modules/cms-ui/themes/default/html/views/project/add.php @@ -6,7 +6,7 @@ </span> </td> <td class=""> - <input name="name" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class=""> + <input name="name" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class=""> </input> </td> </tr> diff --git a/modules/cms-ui/themes/default/html/views/project/prop.php b/modules/cms-ui/themes/default/html/views/project/prop.php @@ -7,7 +7,7 @@ </label> </div> <div class="input"> - <input name="name" disabled="" type="text" maxlength="128" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class="name"> + <input name="name" type="text" maxlength="128" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class="name"> </input> </div> </div> @@ -17,7 +17,7 @@ </label> </div> <div class="input"> - <input name="url" disabled="" type="text" maxlength="255" value="<?php echo encodeHtml(htmlentities(@$url)) ?>" class=""> + <input name="url" type="text" maxlength="255" value="<?php echo encodeHtml(htmlentities(@$url)) ?>" class=""> </input> </div> </div> @@ -29,7 +29,7 @@ </label> </div> <div class="input"> - <input name="target_dir" disabled="" type="text" maxlength="255" value="<?php echo encodeHtml(htmlentities(@$target_dir)) ?>" class="filename"> + <input name="target_dir" type="text" maxlength="255" value="<?php echo encodeHtml(htmlentities(@$target_dir)) ?>" class="filename"> </input> </div> </div> @@ -40,7 +40,7 @@ </label> </div> <div class="input"> - <input name="cmd_after_publish" disabled="" type="text" maxlength="255" value="<?php echo encodeHtml(htmlentities(@$cmd_after_publish)) ?>" class="filename"> + <input name="cmd_after_publish" type="text" maxlength="255" value="<?php echo encodeHtml(htmlentities(@$cmd_after_publish)) ?>" class="filename"> </input> </div> </div> @@ -49,7 +49,7 @@ <div class="label"> </div> <div class="input"> - <input type="checkbox" name="publishFileExtension" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$publishFileExtension)) ?>" class=""> + <input type="checkbox" name="publishFileExtension" value="1" <?php if(''.@$publishFileExtension.''){ ?>checked="1"<?php } ?> class=""> </input> <label class="label"><?php echo encodeHtml(htmlentities(@lang('PROJECT_publish_File_Extension'))) ?> </label> @@ -59,7 +59,7 @@ <div class="label"> </div> <div class="input"> - <input type="checkbox" name="publishPageExtension" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$publishPageExtension)) ?>" class=""> + <input type="checkbox" name="publishPageExtension" value="1" <?php if(''.@$publishPageExtension.''){ ?>checked="1"<?php } ?> class=""> </input> <label class="label"><?php echo encodeHtml(htmlentities(@lang('PROJECT_publish_page_Extension'))) ?> </label> @@ -78,11 +78,11 @@ </label> </div> <div class="input"> - <input name="ftp_url" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$ftp_url)) ?>" class="filename"> + <input name="ftp_url" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$ftp_url)) ?>" class="filename"> </input> <br> </br> - <input type="checkbox" name="ftp_passive" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$ftp_passive)) ?>" class=""> + <input type="checkbox" name="ftp_passive" value="1" <?php if(''.@$ftp_passive.''){ ?>checked="1"<?php } ?> class=""> </input> <label class="label"><?php echo encodeHtml(htmlentities(@lang('PROJECT_FTP_PASSIVE'))) ?> </label> @@ -95,7 +95,7 @@ <div class="label"> </div> <div class="input"> - <input type="checkbox" name="content_negotiation" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$content_negotiation)) ?>" class=""> + <input type="checkbox" name="content_negotiation" value="1" <?php if(''.@$content_negotiation.''){ ?>checked="1"<?php } ?> class=""> </input> <label class="label"><?php echo encodeHtml(htmlentities(@lang('PROJECT_CONTENT_NEGOTIATION'))) ?> </label> @@ -105,7 +105,7 @@ <div class="label"> </div> <div class="input"> - <input type="checkbox" name="cut_index" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$cut_index)) ?>" class=""> + <input type="checkbox" name="cut_index" value="1" <?php if(''.@$cut_index.''){ ?>checked="1"<?php } ?> class=""> </input> <label class="label"><?php echo encodeHtml(htmlentities(@lang('PROJECT_CUT_INDEX'))) ?> </label> diff --git a/modules/cms-ui/themes/default/html/views/project/remove.php b/modules/cms-ui/themes/default/html/views/project/remove.php @@ -16,7 +16,7 @@ </div> <div class="input"> <div class=""> - <input type="checkbox" name="delete" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$delete)) ?>" required="required" class=""> + <input type="checkbox" name="delete" value="1" <?php if(''.@$delete.''){ ?>checked="1"<?php } ?> required="required" class=""> </input> <label class="label"> <span class=""><?php echo encodeHtml(htmlentities(@lang('CONFIRM_DELETE'))) ?> diff --git a/modules/cms-ui/themes/default/html/views/projectlist/add.php b/modules/cms-ui/themes/default/html/views/projectlist/add.php @@ -6,7 +6,7 @@ </span> </div> <div class="input"> - <input name="name" disabled="" type="text" maxlength="128" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class="focus"> + <input name="name" type="text" maxlength="128" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class="focus"> </input> </div> </div> diff --git a/modules/cms-ui/themes/default/html/views/search/edit.php b/modules/cms-ui/themes/default/html/views/search/edit.php @@ -10,7 +10,7 @@ </br> </div> <div class="input"> - <input name="text" disabled="" placeholder="<?php echo encodeHtml(htmlentities(@lang('search'))) ?>" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$text)) ?>" class=""> + <input name="text" placeholder="<?php echo encodeHtml(htmlentities(@lang('search'))) ?>" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$text)) ?>" class=""> </input> </div> </div> @@ -24,7 +24,7 @@ </br> </div> <div class="input"> - <input type="checkbox" name="id" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(config('search','quicksearch','flag','id'))) ?>" class=""> + <input type="checkbox" name="id" value="1" checked="<?php echo encodeHtml(htmlentities(config('search','quicksearch','flag','id'))) ?>" class=""> </input> <label class="label"> <span class=""><?php echo encodeHtml(htmlentities(@lang('id'))) ?> @@ -32,7 +32,7 @@ </label> <br> </br> - <input type="checkbox" name="name" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(config('search','quicksearch','flag','name'))) ?>" class=""> + <input type="checkbox" name="name" value="1" checked="<?php echo encodeHtml(htmlentities(config('search','quicksearch','flag','name'))) ?>" class=""> </input> <label class="label"> <span class=""><?php echo encodeHtml(htmlentities(@lang('name'))) ?> @@ -40,7 +40,7 @@ </label> <br> </br> - <input type="checkbox" name="filename" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(config('search','quicksearch','flag','filename'))) ?>" class=""> + <input type="checkbox" name="filename" value="1" checked="<?php echo encodeHtml(htmlentities(config('search','quicksearch','flag','filename'))) ?>" class=""> </input> <label class="label"> <span class=""><?php echo encodeHtml(htmlentities(@lang('filename'))) ?> @@ -48,7 +48,7 @@ </label> <br> </br> - <input type="checkbox" name="description" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(config('search','quicksearch','flag','description'))) ?>" class=""> + <input type="checkbox" name="description" value="1" checked="<?php echo encodeHtml(htmlentities(config('search','quicksearch','flag','description'))) ?>" class=""> </input> <label class="label"> <span class=""><?php echo encodeHtml(htmlentities(@lang('description'))) ?> @@ -56,7 +56,7 @@ </label> <br> </br> - <input type="checkbox" name="content" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(config('search','quicksearch','flag','content'))) ?>" class=""> + <input type="checkbox" name="content" value="1" checked="<?php echo encodeHtml(htmlentities(config('search','quicksearch','flag','content'))) ?>" class=""> </input> <label class="label"> <span class=""><?php echo encodeHtml(htmlentities(@lang('content'))) ?> diff --git a/modules/cms-ui/themes/default/html/views/template/addel.php b/modules/cms-ui/themes/default/html/views/template/addel.php @@ -6,7 +6,7 @@ </span> </div> <div class="input"> - <input name="name" disabled="" required="required" autofocus="autofocus" type="text" maxlength="50" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class=""> + <input name="name" required="required" autofocus="autofocus" type="text" maxlength="50" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class=""> </input> </div> </div> @@ -29,7 +29,7 @@ </div> <div class="input"> <label class="label"> - <input type="checkbox" name="addtotemplate" disabled="" value="1" checked="1" class=""> + <input type="checkbox" name="addtotemplate" value="1" checked="1" class=""> </input> <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_template_srcelement'))) ?> </span> diff --git a/modules/cms-ui/themes/default/html/views/template/extension.php b/modules/cms-ui/themes/default/html/views/template/extension.php @@ -4,7 +4,7 @@ <fieldset class="or-group toggle-open-close open show"><div class="closable"> <?php { $$name= $extension; ?> <?php } ?> - <label class="or-form-row or-form-input"><input name="<?php echo encodeHtml(htmlentities(@$name)) ?>" disabled="" required="required" type="text" maxlength="10" value="<?php echo encodeHtml(htmlentities(@$${name)) ?>}" class=""> + <label class="or-form-row or-form-input"><input name="<?php echo encodeHtml(htmlentities(@$name)) ?>" required="required" type="text" maxlength="10" value="<?php echo encodeHtml(htmlentities(@$${name)) ?>}" class=""> </input></label> </div></fieldset> <?php } ?> diff --git a/modules/cms-ui/themes/default/html/views/template/prop.php b/modules/cms-ui/themes/default/html/views/template/prop.php @@ -6,7 +6,7 @@ </span> </div> <div class="input"> - <input name="name" disabled="" type="text" maxlength="50" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class=""> + <input name="name" type="text" maxlength="50" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class=""> </input> </div> </div> diff --git a/modules/cms-ui/themes/default/html/views/template/pub.php b/modules/cms-ui/themes/default/html/views/template/pub.php @@ -11,7 +11,7 @@ <div class="label"> </div> <div class="input"> - <input type="checkbox" name="pages" disabled="1" value="1" checked="1" class=""> + <input type="checkbox" name="pages" disabled="disabled" value="1" checked="1" class=""> </input> <label class="label"> <span class=""><?php echo encodeHtml(htmlentities(@lang('publish'))) ?> diff --git a/modules/cms-ui/themes/default/html/views/template/remove.php b/modules/cms-ui/themes/default/html/views/template/remove.php @@ -17,7 +17,7 @@ <div class="label"> </div> <div class="input"> - <input type="checkbox" name="delete" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$delete)) ?>" required="required" class=""> + <input type="checkbox" name="delete" value="1" <?php if(''.@$delete.''){ ?>checked="1"<?php } ?> required="required" class=""> </input> <label class="label"> <span class=""><?php echo encodeHtml(htmlentities(@lang('CONFIRM_DELETE'))) ?> diff --git a/modules/cms-ui/themes/default/html/views/templatelist/add.php b/modules/cms-ui/themes/default/html/views/templatelist/add.php @@ -6,7 +6,7 @@ </span> </div> <div class="input"> - <input name="name" disabled="" type="text" maxlength="50" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class=""> + <input name="name" type="text" maxlength="50" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class=""> </input> </div> </div> diff --git a/modules/cms-ui/themes/default/html/views/text/remove.php b/modules/cms-ui/themes/default/html/views/text/remove.php @@ -16,7 +16,7 @@ </span> </td> <td class=""> - <input type="checkbox" name="delete" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$delete)) ?>" class=""> + <input type="checkbox" name="delete" value="1" <?php if(''.@$delete.''){ ?>checked="1"<?php } ?> class=""> </input> </td> </tr> diff --git a/modules/cms-ui/themes/default/html/views/text/size.php b/modules/cms-ui/themes/default/html/views/text/size.php @@ -46,11 +46,11 @@ <div class="label"> </div> <div class="input"> - <input name="width" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$width)) ?>" class=""> + <input name="width" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$width)) ?>" class=""> </input> <span class=""> * </span> - <input name="height" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$height)) ?>" class=""> + <input name="height" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$height)) ?>" class=""> </input> </div> </div> @@ -86,7 +86,7 @@ <div class="label"> </div> <div class="input"> - <input type="checkbox" name="copy" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$copy)) ?>" class=""> + <input type="checkbox" name="copy" value="1" <?php if(''.@$copy.''){ ?>checked="1"<?php } ?> class=""> </input> <label class="label"> <span class=""><?php echo encodeHtml(htmlentities(@lang('copy'))) ?> diff --git a/modules/cms-ui/themes/default/html/views/title/show.php b/modules/cms-ui/themes/default/html/views/title/show.php @@ -427,7 +427,7 @@ <div class="toolbar-icon menu search"> <i class="image-icon image-icon--method-search"> </i> - <input name="text" disabled="" placeholder="<?php echo encodeHtml(htmlentities(@lang('search'))) ?>" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$text)) ?>" class=""> + <input name="text" placeholder="<?php echo encodeHtml(htmlentities(@lang('search'))) ?>" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$text)) ?>" class=""> </input> <div class="arrow arrow-down"> </div> diff --git a/modules/cms-ui/themes/default/html/views/url/edit.php b/modules/cms-ui/themes/default/html/views/url/edit.php @@ -7,7 +7,7 @@ </span> </div> <div class="input"> - <input name="url" disabled="" type="text" maxlength="255" value="<?php echo encodeHtml(htmlentities(@$url)) ?>" class=""> + <input name="url" type="text" maxlength="255" value="<?php echo encodeHtml(htmlentities(@$url)) ?>" class=""> </input> </div> </div> diff --git a/modules/cms-ui/themes/default/html/views/url/remove.php b/modules/cms-ui/themes/default/html/views/url/remove.php @@ -2,6 +2,6 @@ <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="url" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form url"> <label class="or-form-row"><span class="or-form-input"><span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> </span></span></label> - <label class="or-form-row or-form-checkbox"><input type="checkbox" name="delete" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$delete)) ?>" class=""> + <label class="or-form-row or-form-checkbox"><input type="checkbox" name="delete" value="1" <?php if(''.@$delete.''){ ?>checked="1"<?php } ?> class=""> </input></label> </form> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/user/add.php b/modules/cms-ui/themes/default/html/views/user/add.php @@ -6,7 +6,7 @@ </label> </div> <div class="input"> - <input name="name" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class="focus"> + <input name="name" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class="focus"> </input> </div> </div> diff --git a/modules/cms-ui/themes/default/html/views/user/info.php b/modules/cms-ui/themes/default/html/views/user/info.php @@ -107,7 +107,7 @@ <div class="label"> </div> <div class="input"> - <input type="checkbox" name="is_admin" disabled="1" value="1" checked="<?php echo encodeHtml(htmlentities(@$is_admin)) ?>" class=""> + <input type="checkbox" name="is_admin" disabled="disabled" value="1" <?php if(''.@$is_admin.''){ ?>checked="1"<?php } ?> class=""> </input> <label class="label"><?php echo encodeHtml(htmlentities(@lang('user_admin'))) ?> </label> @@ -181,7 +181,7 @@ </label> </div> <div class="input"> - <input type="checkbox" name="totp" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$totp)) ?>" class=""> + <input type="checkbox" name="totp" value="1" <?php if(''.@$totp.''){ ?>checked="1"<?php } ?> class=""> </input> <label class="label"><?php echo encodeHtml(htmlentities(@lang('user_totp'))) ?> </label> diff --git a/modules/cms-ui/themes/default/html/views/user/memberships.php b/modules/cms-ui/themes/default/html/views/user/memberships.php @@ -10,7 +10,7 @@ <?php foreach($memberships as $list_key=>$list_value) { extract($list_value); ?> <tr class="data"> <td width="10%" class=""> - <input type="checkbox" name="group<?php echo encodeHtml(htmlentities(@$id)) ?>" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$member)) ?>" class=""> + <input type="checkbox" name="group<?php echo encodeHtml(htmlentities(@$id)) ?>" value="1" checked="<?php echo encodeHtml(htmlentities(@$member)) ?>" class=""> </input> </td> <td class=""> diff --git a/modules/cms-ui/themes/default/html/views/user/prop.php b/modules/cms-ui/themes/default/html/views/user/prop.php @@ -6,7 +6,7 @@ </label> </div> <div class="input"> - <input name="name" disabled="" type="text" maxlength="128" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class="name,focus"> + <input name="name" type="text" maxlength="128" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class="name,focus"> </input> </div> </div> @@ -17,7 +17,7 @@ </label> </div> <div class="input"> - <input name="fullname" disabled="" type="text" maxlength="128" value="<?php echo encodeHtml(htmlentities(@$fullname)) ?>" class=""> + <input name="fullname" type="text" maxlength="128" value="<?php echo encodeHtml(htmlentities(@$fullname)) ?>" class=""> </input> </div> </div> @@ -28,7 +28,7 @@ </label> </div> <div class="input"> - <input name="mail" disabled="" type="text" maxlength="255" value="<?php echo encodeHtml(htmlentities(@$mail)) ?>" class=""> + <input name="mail" type="text" maxlength="255" value="<?php echo encodeHtml(htmlentities(@$mail)) ?>" class=""> </input> <i data-qrcode="mailto:<?php echo encodeHtml(htmlentities(@$mail)) ?>" title="<?php echo encodeHtml(htmlentities(@lang('QRCODE_SHOW'))) ?>" class="image-icon image-icon--menu-qrcode or-qrcode or-info"> </i> @@ -41,7 +41,7 @@ </label> </div> <div class="input"> - <input name="desc" disabled="" type="text" maxlength="255" value="<?php echo encodeHtml(htmlentities(@$desc)) ?>" class=""> + <input name="desc" type="text" maxlength="255" value="<?php echo encodeHtml(htmlentities(@$desc)) ?>" class=""> </input> </div> </div> @@ -51,7 +51,7 @@ </label> </div> <div class="input"> - <input name="tel" disabled="" type="text" maxlength="128" value="<?php echo encodeHtml(htmlentities(@$tel)) ?>" class=""> + <input name="tel" type="text" maxlength="128" value="<?php echo encodeHtml(htmlentities(@$tel)) ?>" class=""> </input> <i data-qrcode="tel:<?php echo encodeHtml(htmlentities(@$tel)) ?>" title="<?php echo encodeHtml(htmlentities(@lang('QRCODE_SHOW'))) ?>" class="image-icon image-icon--menu-qrcode or-qrcode or-info"> </i> @@ -87,7 +87,7 @@ <div class="label"> </div> <div class="input"> - <input type="checkbox" name="is_admin" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$is_admin)) ?>" class=""> + <input type="checkbox" name="is_admin" value="1" <?php if(''.@$is_admin.''){ ?>checked="1"<?php } ?> class=""> </input> <label class="label"><?php echo encodeHtml(htmlentities(@lang('user_admin'))) ?> </label> @@ -95,11 +95,11 @@ </div> <div class="line"> <div class="label"> - <label class="label"><?php echo encodeHtml(htmlentities(@lang(':user_ldapdn'))) ?> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('user_ldapdn'))) ?> </label> </div> <div class="input"> - <input name="ldap_dn" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$ldap_dn)) ?>" class=""> + <input name="ldap_dn" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$ldap_dn)) ?>" class=""> </input> </div> </div> @@ -119,7 +119,7 @@ <div class="label"> </div> <div class="input"> - <input type="checkbox" name="totp" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$totp)) ?>" class=""> + <input type="checkbox" name="totp" value="1" <?php if(''.@$totp.''){ ?>checked="1"<?php } ?> class=""> </input> <label class="label"><?php echo encodeHtml(htmlentities(@lang('user_totp'))) ?> </label> @@ -131,7 +131,7 @@ <div class="label"> </div> <div class="input"> - <input type="checkbox" name="hotp" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$hotp)) ?>" class=""> + <input type="checkbox" name="hotp" value="1" <?php if(''.@$hotp.''){ ?>checked="1"<?php } ?> class=""> </input> <label class="label"><?php echo encodeHtml(htmlentities(@lang('user_hotp'))) ?> </label> diff --git a/modules/cms-ui/themes/default/html/views/user/prop.tpl.src.xml b/modules/cms-ui/themes/default/html/views/user/prop.tpl.src.xml @@ -79,7 +79,7 @@ </part> <part class="line"> <part class="label"> - <label for="ldap_dn" key=":user_ldapdn"></label> + <label for="ldap_dn" key="user_ldapdn"></label> </part> <part class="input"> <input name="ldap_dn"></input> diff --git a/modules/cms-ui/themes/default/html/views/user/pw.php b/modules/cms-ui/themes/default/html/views/user/pw.php @@ -68,7 +68,7 @@ <div class="label"> </div> <div class="input"> - <input type="checkbox" name="email" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$email)) ?>" class=""> + <input type="checkbox" name="email" value="1" <?php if(''.@$email.''){ ?>checked="1"<?php } ?> class=""> </input> <label class="label"><?php echo encodeHtml(htmlentities(@lang('user_mail_new_password'))) ?> </label> @@ -78,7 +78,7 @@ <div class="label"> </div> <div class="input"> - <input type="checkbox" name="timeout" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$timeout)) ?>" class=""> + <input type="checkbox" name="timeout" value="1" <?php if(''.@$timeout.''){ ?>checked="1"<?php } ?> class=""> </input> <label class="label"><?php echo encodeHtml(htmlentities(@lang('user_password_timeout'))) ?> </label> diff --git a/modules/cms-ui/themes/default/html/views/user/remove.php b/modules/cms-ui/themes/default/html/views/user/remove.php @@ -17,7 +17,7 @@ <div class="label"> </div> <div class="input"> - <input type="checkbox" name="confirm" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$confirm)) ?>" required="required" class=""> + <input type="checkbox" name="confirm" value="1" <?php if(''.@$confirm.''){ ?>checked="1"<?php } ?> required="required" class=""> </input> <label class="label"><?php echo encodeHtml(htmlentities(@lang('delete'))) ?> </label> diff --git a/modules/cms-ui/themes/default/html/views/user/rights.php b/modules/cms-ui/themes/default/html/views/user/rights.php @@ -75,7 +75,7 @@ <td class=""> <?php { $$list_value= $bits[$list_value]; ?> <?php } ?> - <input type="checkbox" name="<?php echo encodeHtml(htmlentities(@$list_value)) ?>" disabled="1" value="1" checked="<?php echo encodeHtml(htmlentities(@$${list_value)) ?>}" class=""> + <input type="checkbox" name="<?php echo encodeHtml(htmlentities(@$list_value)) ?>" disabled="disabled" value="1" <?php if(''.@$${list_value.'}'){ ?>checked="1"<?php } ?> class=""> </input> </td> <?php } ?> diff --git a/modules/cms-ui/themes/default/html/views/userlist/add.php b/modules/cms-ui/themes/default/html/views/userlist/add.php @@ -6,7 +6,7 @@ </label> </div> <div class="input"> - <input name="name" disabled="" type="text" maxlength="128" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class="focus"> + <input name="name" type="text" maxlength="128" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class="focus"> </input> </div> </div> diff --git a/modules/template-engine/CMSElement.class.php b/modules/template-engine/CMSElement.class.php @@ -3,24 +3,16 @@ namespace modules\template_engine; - -use template_engine\components\Expression; +use template_engine\components\ConditionalAttribute; class CMSElement extends HtmlElement { - - /* - public function getAttribute($name) - { - $e = new Expression( parent::getAttribute($name) ); - return $e->getHTMLValue(); - }*/ - - - public function __construct( $name ) { parent::__construct( $name ); } + public function addConditionalAttribute($name, $condition, $value ) { + $this->attributes[] = new ConditionalAttribute($condition,$name,$value); + } } \ No newline at end of file diff --git a/modules/template-engine/ConditionalAttribute.php b/modules/template-engine/ConditionalAttribute.php @@ -0,0 +1,31 @@ +<?php + + +namespace template_engine\components; + + +use cms\template_engine\SimpleAttribute; +use modules\template_engine\Value; + +class ConditionalAttribute extends SimpleAttribute +{ + protected $condition; + + /** + * ConditionalAttribute constructor. + * @param $condition + * @param $name + * @param $value + */ + public function __construct($condition,$name,$value) + { + $this->condition = $condition; + parent::__construct($name,$value); + } + + + public function render() + { + return '<?php if('.(new Value($this->condition))->render(Value::CONTEXT_PHP).'){ ?>'.parent::render().'<?php } ?>'; + } +}+ \ No newline at end of file diff --git a/modules/template-engine/Element.class.php b/modules/template-engine/Element.class.php @@ -4,12 +4,17 @@ namespace modules\template_engine; +use cms\template_engine\SimpleAttribute; + class Element { private $name; - private $attributes = []; - private $content = ''; - private $selfClosing = true; + /** + * @var array + */ + protected $attributes = []; + protected $content = ''; + protected $selfClosing = true; /** * @var array @@ -39,8 +44,8 @@ class Element $this->name = $name; } - protected function getAttribute( $name ){ - return (new Value($this->attributes[$name]))->render(Value::CONTEXT_HTML ); + protected function getAttributeValue($name ){ + return $this->attributes[$name]->render(); } public function content( $content ) @@ -61,7 +66,7 @@ class Element if ( $this->name ) $content .= '<'.$this->name. - array_reduce( array_keys($this->attributes),function($carry,$key){return $carry.' '.$key.'="'.$this->getAttribute($key).'"';},'').(($this->selfClosing && !$this->content && !$this->children)?' /':'').'>'; + array_reduce( array_keys($this->attributes),function($carry,$key){return $carry.' '.$this->getAttributeValue($key);},'').(($this->selfClosing && !$this->content && !$this->children)?' /':'').'>'; $content .= $this->getContent(); @@ -86,7 +91,7 @@ class Element } public function addAttribute($key, $value) { - $this->attributes[$key] = $value; + $this->attributes[] = new SimpleAttribute($key,$value); return $this; } diff --git a/modules/template-engine/HtmlElement.class.php b/modules/template-engine/HtmlElement.class.php @@ -28,9 +28,9 @@ class HtmlElement extends Element } - public function getAttribute($name) + public function getAttributeValue($name) { - return parent::getAttribute(htmlspecialchars($name)); + return parent::getAttributeValue(htmlspecialchars($name)); } public function getBegin() diff --git a/modules/template-engine/SimpleAttribute.php b/modules/template-engine/SimpleAttribute.php @@ -0,0 +1,30 @@ +<?php + + +namespace cms\template_engine; + + +use modules\template_engine\Value; + +class SimpleAttribute +{ + + protected $name; + protected $value; + + /** + * SimpleAttribute constructor. + * @param $name + * @param $value + */ + public function __construct($name, $value) + { + $this->name = $name; + $this->value = $value; + } + + + public function render() { + return $this->name.'="'.(new Value($this->value))->render(Value::CONTEXT_HTML).'"'; + } +}+ \ No newline at end of file diff --git a/modules/template-engine/components/html/checkbox/Checkbox.class.php b/modules/template-engine/components/html/checkbox/Checkbox.class.php @@ -27,13 +27,16 @@ class CheckboxComponent extends Component } $checkbox->addAttribute('name',$this->name); - $checkbox->addAttribute('disabled',$this->readonly); + if ( $this->readonly ) + $checkbox->addAttribute('disabled','disabled'); $checkbox->addAttribute('value','1'); if ( $this->default ) $checkbox->addAttribute('checked',$this->default); - else - $checkbox->addAttribute('checked',Value::createExpression(ValueExpression::TYPE_DATA_VAR,$this->name)); + else { + $condition = Value::createExpression(ValueExpression::TYPE_DATA_VAR,$this->name ); + $checkbox->addConditionalAttribute('checked', $condition, '1'); + } if ( $this->required ) $checkbox->addAttribute( 'required','required'); diff --git a/modules/template-engine/components/html/group/Group.class.php b/modules/template-engine/components/html/group/Group.class.php @@ -46,6 +46,8 @@ class GroupComponent extends Component $arrowDown = (new HtmlElement('div'))->addStyleClass('arrow')->addStyleClass('arrow-down' )->addStyleClass('on-open' ); $legend->addChild($arrowDown ); + + $fieldset->addChild( $legend ); } $group = new HtmlElement('div'); diff --git a/modules/template-engine/require.php b/modules/template-engine/require.php @@ -6,3 +6,5 @@ include( dirname(__FILE__) . '/Element.class.php'); include( dirname(__FILE__) . '/HtmlElement.class.php'); include( dirname(__FILE__) . '/CMSElement.class.php'); include( dirname(__FILE__) . '/PHPBlockElement.class.php'); +include( dirname(__FILE__) . '/SimpleAttribute.php'); +include( dirname(__FILE__) . '/ConditionalAttribute.php');