From aabd37bd1aba6590cee55bb50acb140b645d68cb Mon Sep 17 00:00:00 2001 From: Thomas Hooge Date: Sat, 11 Mar 2023 17:29:44 +0100 Subject: [PATCH] Improved image-buttons and colored image creation --- config.php-sample | 3 + header.php | 2 +- image.php | 96 +++++------------- images/{page_add.png => add.png} | Bin images/{page_delete.png => delete.png} | Bin images/{page_edit.png => edit.png} | Bin ...l_fastforward_blue.png => fastforward.png} | Bin .../{control_rewind_blue.png => rewind.png} | Bin images/{page_save.png => save.png} | Bin includes.php | 12 +-- lib/functions.php | 21 +--- nat.php | 8 +- tpl/asset.tpl | 2 +- tpl/assetadd.tpl | 2 +- tpl/assetclass.tpl | 2 +- tpl/assetclassadd.tpl | 4 +- tpl/assetclassdel.tpl | 2 +- tpl/assetclassedit.tpl | 2 +- tpl/assetclassgroup.tpl | 2 +- tpl/assetclassgroupadd.tpl | 2 +- tpl/assetclassgroupdel.tpl | 2 +- tpl/assetclassgroupedit.tpl | 2 +- tpl/assetclassgroupview.tpl | 6 +- tpl/assetclassview.tpl | 6 +- tpl/assetdel.tpl | 2 +- tpl/assetedit.tpl | 2 +- tpl/assetview.tpl | 8 +- tpl/assigniptonode.tpl | 4 +- tpl/assignnodetoasset.tpl | 4 +- tpl/cable.tpl | 2 +- tpl/cableadd.tpl | 6 +- tpl/cabledel.tpl | 2 +- tpl/cableedit.tpl | 4 +- tpl/cableview.tpl | 4 +- tpl/header.tpl | 4 +- tpl/location.tpl | 2 +- tpl/locationadd.tpl | 4 +- tpl/locationdel.tpl | 4 +- tpl/locationedit.tpl | 4 +- tpl/locationsubnetadd.tpl | 4 +- tpl/locationsubnetdel.tpl | 4 +- tpl/locationsubnetedit.tpl | 8 +- tpl/locationview.tpl | 8 +- tpl/login.tpl | 2 +- tpl/natadd.tpl | 4 +- tpl/natedit.tpl | 6 +- tpl/node.tpl | 2 +- tpl/nodeadd.tpl | 4 +- tpl/nodedel.tpl | 4 +- tpl/nodeedit.tpl | 4 +- tpl/nodeview.tpl | 6 +- tpl/optionseditdisplay.tpl | 4 +- tpl/optionseditpassword.tpl | 4 +- tpl/search.tpl | 2 +- tpl/subnet.tpl | 2 +- tpl/subnetadd.tpl | 4 +- tpl/subnetdel.tpl | 4 +- tpl/subnetedit.tpl | 4 +- tpl/subnetlocationadd.tpl | 4 +- tpl/subnetlocationdel.tpl | 4 +- tpl/subnetlocationedit.tpl | 4 +- tpl/subnetview.tpl | 8 +- tpl/subnetvlanadd.tpl | 4 +- tpl/subnetvlandel.tpl | 4 +- tpl/subnetvlanedit.tpl | 8 +- tpl/user.tpl | 2 +- tpl/useradd.tpl | 4 +- tpl/userdel.tpl | 4 +- tpl/useredit.tpl | 4 +- tpl/userview.tpl | 4 +- tpl/vlan.tpl | 2 +- tpl/vlanadd.tpl | 4 +- tpl/vlandel.tpl | 4 +- tpl/vlanedit.tpl | 4 +- tpl/vlansubnetadd.tpl | 4 +- tpl/vlansubnetdel.tpl | 4 +- tpl/vlansubnetedit.tpl | 4 +- tpl/vlanview.tpl | 6 +- tpl/zone.tpl | 2 +- tpl/zoneadd.tpl | 4 +- tpl/zonedel.tpl | 4 +- tpl/zoneedit.tpl | 4 +- tpl/zoneview.tpl | 4 +- 83 files changed, 181 insertions(+), 235 deletions(-) rename images/{page_add.png => add.png} (100%) rename images/{page_delete.png => delete.png} (100%) rename images/{page_edit.png => edit.png} (100%) rename images/{control_fastforward_blue.png => fastforward.png} (100%) rename images/{control_rewind_blue.png => rewind.png} (100%) rename images/{page_save.png => save.png} (100%) diff --git a/config.php-sample b/config.php-sample index 916bced..19d0390 100644 --- a/config.php-sample +++ b/config.php-sample @@ -7,6 +7,9 @@ Copyright (C) 2011-2023 Thomas Hooge SPDX-License-Identifier: GPL-3.0-or-later *****************************************************************************/ +// application settings +$config_app_session = 'ipreg'; + // db connection $config_mysql_host = 'localhost'; $config_mysql_username = 'ipreg'; diff --git a/header.php b/header.php index baf3507..95a57b0 100644 --- a/header.php +++ b/header.php @@ -58,4 +58,4 @@ if ($_SESSION['suser_menu_zones']) { $smarty->assign("menu", implode(' | ', $menu)); $smarty->display("header.tpl"); -?> + diff --git a/image.php b/image.php index cd92df5..f64fcdc 100644 --- a/image.php +++ b/image.php @@ -7,75 +7,33 @@ Copyright (C) 2011-2023 Thomas Hooge SPDX-License-Identifier: GPL-3.0-or-later *****************************************************************************/ -include("includes.php"); +include('config.php'); -if(isset($_GET['icon'])) { - $icon = sanitize($_GET['icon']); - - switch($icon) { - case ("add") : - $png = 'page_add'; - break; - case ("back") : - $png = 'control_rewind_blue'; - break; - case ("cancel") : - $png = 'control_rewind_blue'; - break; - case ("comment") : - $png = 'comment'; - break; - case ("delete") : - $png = 'page_delete'; - break; - case ("shred") : - $png = 'bin'; - break; - case ("edit") : - $png = 'page_edit'; - break; - case ("error") : - $png = 'error'; - break; - case ("help") : - $png = 'help'; - break; - case ("logo") : - $png = 'logo'; - break; - case ("next") : - $png = 'control_fastforward_blue'; - break; - case ("save") : - $png = 'page_save'; - break; - case ("search") : - $png = 'magnifier'; - break; - } - - $image = imagecreatefrompng("images/" . $png . ".png"); - - imagealphablending($image, true); - - imagesavealpha($image, true); - - header('Content-type: image/png'); - imagepng($image); - imagedestroy($image); -} +session_name($config_app_session); +session_start(); -if(isset($_GET['color'])) { - $color = sanitize($_GET['color']); - - $image = imagecreatetruecolor($_SESSION['suser_imagesize'], $_SESSION['suser_imagesize']); - - $color = imagecolorallocate($image, hexdec(substr($color,0,2)), hexdec(substr($color,2,2)), hexdec(substr($color,4,2))); - - imagefill($image, 0, 0, $color); - - header('Content-type: image/png'); - imagepng($image); - imagedestroy($image); +function valid_color($color, $default='888888') { + // safe return a 6 character color string in uppercase + // input can be length of 3 or 6 + if (! isset($color) or ! ctype_xdigit($color)) { + return $default; + } + if(strlen($color) == 3) { + // duplicate characters + $col6 = ''; + for ($i=1; $i<=3; $i++) { + $col6 .= $color[$i].$color[$i]; + } + return strtoupper($col6); + } + return strtoupper($color); } -?> + +$color = valid_color($_GET['color'], '444'); +$image = imagecreatetruecolor($_SESSION['suser_imagesize'], $_SESSION['suser_imagesize']); +$color = imagecolorallocate($image, hexdec(substr($color,0,2)), hexdec(substr($color,2,2)), hexdec(substr($color,4,2))); +imagefill($image, 0, 0, $color); + +header('Content-type: image/png'); +imagepng($image); +imagedestroy($image); diff --git a/images/page_add.png b/images/add.png similarity index 100% rename from images/page_add.png rename to images/add.png diff --git a/images/page_delete.png b/images/delete.png similarity index 100% rename from images/page_delete.png rename to images/delete.png diff --git a/images/page_edit.png b/images/edit.png similarity index 100% rename from images/page_edit.png rename to images/edit.png diff --git a/images/control_fastforward_blue.png b/images/fastforward.png similarity index 100% rename from images/control_fastforward_blue.png rename to images/fastforward.png diff --git a/images/control_rewind_blue.png b/images/rewind.png similarity index 100% rename from images/control_rewind_blue.png rename to images/rewind.png diff --git a/images/page_save.png b/images/save.png similarity index 100% rename from images/page_save.png rename to images/save.png diff --git a/includes.php b/includes.php index 998f4a1..8f359ed 100644 --- a/includes.php +++ b/includes.php @@ -6,11 +6,13 @@ Copyright (C) 2011-2023 Thomas Hooge SPDX-License-Identifier: GPL-3.0-or-later *****************************************************************************/ - -session_name('ipreg'); + +include('config.php'); + +session_name($config_app_session); session_start(); -// check for user_id, if unnkown, redirect to login +// check for user_id, if unknown, redirect to login if (empty($_SESSION['suser_id'])) { if (isset($_SERVER['REQUEST_URI'])) { $_SESSION['prelogin'] = $_SERVER['REQUEST_URI']; @@ -23,8 +25,6 @@ if (empty($_SESSION['suser_id'])) { $config_auth_ldap = false; $config_ext = array(); -include("config.php"); - // connect to database $dbh = new PDO("mysql:host=$config_mysql_host;dbname=$config_mysql_dbname;charset=utf8", $config_mysql_username, $config_mysql_password); $dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); @@ -33,5 +33,3 @@ $dbh->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC); include("lib.php"); $language = lang_getfrombrowser($config_lang, $config_lang_default, null, false); - -?> \ No newline at end of file diff --git a/lib/functions.php b/lib/functions.php index 931ad73..b3ab83f 100644 --- a/lib/functions.php +++ b/lib/functions.php @@ -47,12 +47,9 @@ function write_mac($mac, $user_mac='xx:xx:xx:xx:xx:xx') { return $user_mac; } -// redirect page function header_location($location) { - // send header - header("location: " . $location); - - // exit to be sure + // redirect page + header('location:' . $location); exit; } @@ -79,14 +76,6 @@ function sanitize($input) { return $input; } -function mysql_nullstring($input) { - if (isset($input)) { - return $input; - } else { - return ''; - } -} - function lang_getfrombrowser ($allowed_languages, $default_language, $lang_variable = null, $strict_mode = true) { if ($lang_variable === null) { $lang_variable = $_SERVER['HTTP_ACCEPT_LANGUAGE']; @@ -139,7 +128,6 @@ function print_tree_rec($tree, $level) { return $output; } -//function print_tree($params, &$smarty) { function print_tree($params, Smarty_Internal_Template $template) { if (empty($params['level'])) { $level = 0; @@ -153,12 +141,9 @@ function print_tree($params, Smarty_Internal_Template $template) { } } -function msgout(array $parameters, Smarty_Internal_Template $smarty) -{ +function msgout(array $parameters, Smarty_Internal_Template $smarty) { // This is just a quick hack around missing {php} in Smarty3 $GLOBALS['g_error']->PrintOut(); $GLOBALS['g_warning']->PrintOut(); $GLOBALS['g_message']->PrintOut(); } - -?> diff --git a/nat.php b/nat.php index 2a506ce..13dd32f 100644 --- a/nat.php +++ b/nat.php @@ -54,6 +54,10 @@ switch ($submit = form_get_action()) { include("header.php"); + +if ($action == ACT_DEFAULT): +// ========== VARIANT: default behavior ======================================= + $sql = "SELECT n.nat_id AS id, n.nat_type, n.nat_ext, n.nat_int, n.nat_ext_port AS port_ext, n.nat_int_port AS port_int, n.nat_description AS description, @@ -65,10 +69,8 @@ $sql = "SELECT n.nat_id AS id, n.nat_type, n.nat_ext, n.nat_int, $sth = $dbh->query($sql); $smarty->assign("nats", $sth->fetchAll()); -$smarty->display("nat.tpl"); -if ($action == ACT_DEFAULT): -// ========== VARIANT: default behavior ======================================= +$smarty->display("nat.tpl"); elseif ($action == ACT_ADD): diff --git a/tpl/asset.tpl b/tpl/asset.tpl index 0722efe..cb9adce 100644 --- a/tpl/asset.tpl +++ b/tpl/asset.tpl @@ -6,7 +6,7 @@ {if $suser_add} - {$lang_asset_add} + {$lang_asset_add} {/if} diff --git a/tpl/assetadd.tpl b/tpl/assetadd.tpl index 2a31d73..3706b89 100644 --- a/tpl/assetadd.tpl +++ b/tpl/assetadd.tpl @@ -6,7 +6,7 @@ {$lang_asset_add} - {$lang_cancel} + {$lang_cancel} diff --git a/tpl/assetclass.tpl b/tpl/assetclass.tpl index f264f19..579e255 100644 --- a/tpl/assetclass.tpl +++ b/tpl/assetclass.tpl @@ -6,7 +6,7 @@ {if $suser_add || $suser_admin} - {$lang_assetclass_add} + {$lang_assetclass_add} {/if} diff --git a/tpl/assetclassadd.tpl b/tpl/assetclassadd.tpl index 2d28892..9025703 100644 --- a/tpl/assetclassadd.tpl +++ b/tpl/assetclassadd.tpl @@ -6,8 +6,8 @@ {$lang_assetclass_add} - {$lang_cancel} - + {$lang_cancel} + diff --git a/tpl/assetclassdel.tpl b/tpl/assetclassdel.tpl index 0e03253..ca817ad 100644 --- a/tpl/assetclassdel.tpl +++ b/tpl/assetclassdel.tpl @@ -7,7 +7,7 @@ {$lang_assetclass_del} - {$lang_cancel} + {$lang_cancel} diff --git a/tpl/assetclassedit.tpl b/tpl/assetclassedit.tpl index 24ab6fb..4d63b98 100644 --- a/tpl/assetclassedit.tpl +++ b/tpl/assetclassedit.tpl @@ -8,7 +8,7 @@ {$lang_assetclass_edit} : {$assetclass->name} - {$lang_cancel} + {$lang_cancel} diff --git a/tpl/assetclassgroup.tpl b/tpl/assetclassgroup.tpl index c1e8837..6c58d1f 100644 --- a/tpl/assetclassgroup.tpl +++ b/tpl/assetclassgroup.tpl @@ -6,7 +6,7 @@ {if $suser_add || $suser_admin} - {$lang_assetclassgroup_add} + {$lang_assetclassgroup_add} {/if} diff --git a/tpl/assetclassgroupadd.tpl b/tpl/assetclassgroupadd.tpl index 98edd5a..5c70ff8 100644 --- a/tpl/assetclassgroupadd.tpl +++ b/tpl/assetclassgroupadd.tpl @@ -6,7 +6,7 @@ {$lang_assetclassgroup_add} - {$lang_cancel} + {$lang_cancel} diff --git a/tpl/assetclassgroupdel.tpl b/tpl/assetclassgroupdel.tpl index f0122f7..04516c4 100644 --- a/tpl/assetclassgroupdel.tpl +++ b/tpl/assetclassgroupdel.tpl @@ -7,7 +7,7 @@ {$assetclassgroup->name} - {$lang_cancel} + {$lang_cancel} diff --git a/tpl/assetclassgroupedit.tpl b/tpl/assetclassgroupedit.tpl index 558eb15..81e04c5 100644 --- a/tpl/assetclassgroupedit.tpl +++ b/tpl/assetclassgroupedit.tpl @@ -8,7 +8,7 @@ {$lang_assetclassgroup_edit} : {$assetclassgroup->name} - {$lang_cancel} + {$lang_cancel} diff --git a/tpl/assetclassgroupview.tpl b/tpl/assetclassgroupview.tpl index 8847815..681205b 100644 --- a/tpl/assetclassgroupview.tpl +++ b/tpl/assetclassgroupview.tpl @@ -6,13 +6,13 @@ {if $suser_add} - {$lang_assetclassgroup_add} + {$lang_assetclassgroup_add} {/if} {if $suser_edit} - {$lang_assetclassgroup_edit} + {$lang_assetclassgroup_edit} {/if} {if $suser_delete} - {$lang_assetclassgroup_del} + {$lang_assetclassgroup_del} {/if} diff --git a/tpl/assetclassview.tpl b/tpl/assetclassview.tpl index e04a011..da8dbd1 100644 --- a/tpl/assetclassview.tpl +++ b/tpl/assetclassview.tpl @@ -6,13 +6,13 @@ {if $suser_add} - {$lang_asset_add} + {$lang_asset_add} {/if} {if $suser_edit} - {$lang_assetclass_edit} + {$lang_assetclass_edit} {/if} {if $suser_delete} - {$lang_assetclass_add} + {$lang_assetclass_add} {/if} diff --git a/tpl/assetdel.tpl b/tpl/assetdel.tpl index 494bb96..b8be8d9 100644 --- a/tpl/assetdel.tpl +++ b/tpl/assetdel.tpl @@ -7,7 +7,7 @@ {$lang_asset_del} - {$lang_cancel} + {$lang_cancel} diff --git a/tpl/assetedit.tpl b/tpl/assetedit.tpl index f85ec43..bb680e3 100644 --- a/tpl/assetedit.tpl +++ b/tpl/assetedit.tpl @@ -8,7 +8,7 @@ {$lang_asset_edit} : {$asset->asset_name} - {$lang_cancel} + {$lang_cancel} diff --git a/tpl/assetview.tpl b/tpl/assetview.tpl index dc6ce4f..a4a417a 100644 --- a/tpl/assetview.tpl +++ b/tpl/assetview.tpl @@ -6,13 +6,13 @@ {if $suser_add} - {$lang_assignnodetoasset} + {$lang_assignnodetoasset} {/if} {if $suser_edit} - {$lang_asset_edit} + {$lang_asset_edit} {/if} {if $suser_delete} - {$lang_asset_edit} + {$lang_asset_del} {/if} @@ -96,7 +96,7 @@ {if $suser_edit} - {$lang_assignnodetoasset} + {$lang_assignnodetoasset} {/if} diff --git a/tpl/assigniptonode.tpl b/tpl/assigniptonode.tpl index 9ba7580..c70afbb 100644 --- a/tpl/assigniptonode.tpl +++ b/tpl/assigniptonode.tpl @@ -8,8 +8,8 @@ {$lang_assigniptonode} - {$lang_cancel} - + {$lang_cancel} + diff --git a/tpl/assignnodetoasset.tpl b/tpl/assignnodetoasset.tpl index 78223d9..9dc0847 100644 --- a/tpl/assignnodetoasset.tpl +++ b/tpl/assignnodetoasset.tpl @@ -6,8 +6,8 @@ {$lang_assignnodetoasset} - {$lang_cancel} - + {$lang_cancel} + diff --git a/tpl/cable.tpl b/tpl/cable.tpl index b19aa2c..b3d7746 100644 --- a/tpl/cable.tpl +++ b/tpl/cable.tpl @@ -6,7 +6,7 @@ {if $suser_add || $suser_admin} - {$lang_add} + {$lang_cable_add} {/if} diff --git a/tpl/cableadd.tpl b/tpl/cableadd.tpl index 68cff6c..5ed643d 100644 --- a/tpl/cableadd.tpl +++ b/tpl/cableadd.tpl @@ -7,8 +7,8 @@ {$lang_cable_add} - {$lang_cancel} - + {$lang_cancel} + @@ -76,7 +76,7 @@ - {$lang_info} + {$lang_cable_info} diff --git a/tpl/cabledel.tpl b/tpl/cabledel.tpl index cdf4696..e430c4c 100644 --- a/tpl/cabledel.tpl +++ b/tpl/cabledel.tpl @@ -7,7 +7,7 @@ {$lang_cable_del} - {$lang_cancel} + {$lang_cancel} diff --git a/tpl/cableedit.tpl b/tpl/cableedit.tpl index afb9d14..438cd1b 100644 --- a/tpl/cableedit.tpl +++ b/tpl/cableedit.tpl @@ -8,8 +8,8 @@ {$lang_cable_edit} : {$cable->description} - {$lang_cancel} - + {$lang_cancel} + diff --git a/tpl/cableview.tpl b/tpl/cableview.tpl index 5a0c28b..fbd9e7f 100644 --- a/tpl/cableview.tpl +++ b/tpl/cableview.tpl @@ -5,8 +5,8 @@ {$cable->description} - {$lang_cable_edit} - {$lang_cable_del} + {$lang_cable_edit} + {$lang_cable_del} diff --git a/tpl/header.tpl b/tpl/header.tpl index 8255783..907fe16 100644 --- a/tpl/header.tpl +++ b/tpl/header.tpl @@ -23,7 +23,7 @@
- {$lang_ipreg} + {$lang_ipreg} {$menu} @@ -37,7 +37,7 @@
-   +  
diff --git a/tpl/location.tpl b/tpl/location.tpl index 38a076a..eaa46d0 100644 --- a/tpl/location.tpl +++ b/tpl/location.tpl @@ -6,7 +6,7 @@ {if $suser_add || $suser_admin} - {$lang_location_add} + {$lang_location_add} {/if} diff --git a/tpl/locationadd.tpl b/tpl/locationadd.tpl index ed571ef..cec2bc0 100644 --- a/tpl/locationadd.tpl +++ b/tpl/locationadd.tpl @@ -7,8 +7,8 @@ {$lang_location_add} - {$lang_cancel} - + {$lang_cancel} + diff --git a/tpl/locationdel.tpl b/tpl/locationdel.tpl index 77cc011..c620a68 100644 --- a/tpl/locationdel.tpl +++ b/tpl/locationdel.tpl @@ -8,8 +8,8 @@ {$location->name} - {$lang_cancel} - + {$lang_cancel} + diff --git a/tpl/locationedit.tpl b/tpl/locationedit.tpl index 2d85e32..201dcef 100644 --- a/tpl/locationedit.tpl +++ b/tpl/locationedit.tpl @@ -8,8 +8,8 @@ {$lang_location_edit} : {$location->name} - {$lang_cancel} - + {$lang_cancel} + diff --git a/tpl/locationsubnetadd.tpl b/tpl/locationsubnetadd.tpl index cde2824..6172765 100644 --- a/tpl/locationsubnetadd.tpl +++ b/tpl/locationsubnetadd.tpl @@ -7,8 +7,8 @@ {$lang_locationsubnet} ADD - {$lang_cancel} - + {$lang_cancel} + diff --git a/tpl/locationsubnetdel.tpl b/tpl/locationsubnetdel.tpl index ffd8e37..d145b00 100644 --- a/tpl/locationsubnetdel.tpl +++ b/tpl/locationsubnetdel.tpl @@ -7,9 +7,9 @@ {$lang_locationsubnet} DEL - {$lang_cancel} + {$lang_cancel} {* TODO link und unlink icons! *} - + diff --git a/tpl/locationsubnetedit.tpl b/tpl/locationsubnetedit.tpl index 93732e8..0debd37 100644 --- a/tpl/locationsubnetedit.tpl +++ b/tpl/locationsubnetedit.tpl @@ -8,8 +8,8 @@ {$lang_locationsubnet} - {$lang_cancel} - + {$lang_cancel} + @@ -47,8 +47,8 @@ {$lang_options} -  {$lang_subnet_add}
-  {$lang_subnet_del} +  
+   diff --git a/tpl/locationview.tpl b/tpl/locationview.tpl index da249a0..34d1d59 100644 --- a/tpl/locationview.tpl +++ b/tpl/locationview.tpl @@ -6,13 +6,13 @@ {if $suser_add} - {$lang_sublocation_add} + {$lang_sublocation_add} {/if} {if $suser_edit} - {$lang_location_edit} + {$lang_location_edit} {/if} {if $suser_delete} - {$lang_location_del} + {$lang_location_del} {/if} @@ -79,7 +79,7 @@ {if $suser_edit} - {$lang_locationsubnet_edit} + {$lang_locationsubnet_edit} {/if} diff --git a/tpl/login.tpl b/tpl/login.tpl index 038a12a..a2ab272 100644 --- a/tpl/login.tpl +++ b/tpl/login.tpl @@ -33,7 +33,7 @@ {$lang_ipreg} {$config_version} - + diff --git a/tpl/natadd.tpl b/tpl/natadd.tpl index 082c2d3..35b892f 100644 --- a/tpl/natadd.tpl +++ b/tpl/natadd.tpl @@ -7,8 +7,8 @@ {$lang_nat} - {$lang_cancel} - + {$lang_cancel} + diff --git a/tpl/natedit.tpl b/tpl/natedit.tpl index 1f6da13..c12ddf2 100644 --- a/tpl/natedit.tpl +++ b/tpl/natedit.tpl @@ -7,8 +7,8 @@ {$lang_nat} - {$lang_cancel} - + {$lang_cancel} + @@ -40,7 +40,7 @@ -   +   diff --git a/tpl/node.tpl b/tpl/node.tpl index 5e1bbac..01a3ac9 100644 --- a/tpl/node.tpl +++ b/tpl/node.tpl @@ -6,7 +6,7 @@ {if $suser_add || $suser_admin} - {$lang_node_add} + {$lang_node_add} {/if} diff --git a/tpl/nodeadd.tpl b/tpl/nodeadd.tpl index 53ed570..6a8d0ad 100644 --- a/tpl/nodeadd.tpl +++ b/tpl/nodeadd.tpl @@ -7,8 +7,8 @@ {$lang_node_add} - {$lang_cancel} - + {$lang_cancel} + diff --git a/tpl/nodedel.tpl b/tpl/nodedel.tpl index c65ceba..058733d 100644 --- a/tpl/nodedel.tpl +++ b/tpl/nodedel.tpl @@ -8,8 +8,8 @@ {$node->ip} - {$lang_cancel} - + {$lang_cancel} + diff --git a/tpl/nodeedit.tpl b/tpl/nodeedit.tpl index 58eceeb..fff26dd 100644 --- a/tpl/nodeedit.tpl +++ b/tpl/nodeedit.tpl @@ -8,8 +8,8 @@ {$lang_node_edit} : {$node->ip} - {$lang_cancel} - + {$lang_cancel} + diff --git a/tpl/nodeview.tpl b/tpl/nodeview.tpl index 50fa2d2..ea2c3ac 100644 --- a/tpl/nodeview.tpl +++ b/tpl/nodeview.tpl @@ -6,10 +6,10 @@ {if $suser_edit} - {$lang_node_edit} + {$lang_node_edit} {/if} {if $suser_delete} - {$lang_node_del} + {$lang_node_del} {/if} @@ -135,7 +135,7 @@ {$lang_nat} - {$lang_nat_edit} + {$lang_nat_edit} diff --git a/tpl/optionseditdisplay.tpl b/tpl/optionseditdisplay.tpl index 138dd8b..118527d 100644 --- a/tpl/optionseditdisplay.tpl +++ b/tpl/optionseditdisplay.tpl @@ -7,8 +7,8 @@ {$lang_options} - {$lang_cancel} - + {$lang_cancel} + diff --git a/tpl/optionseditpassword.tpl b/tpl/optionseditpassword.tpl index f1b7a1d..8f9acf7 100644 --- a/tpl/optionseditpassword.tpl +++ b/tpl/optionseditpassword.tpl @@ -7,8 +7,8 @@ {$lang_options} - {$lang_cancel} - + {$lang_cancel} + diff --git a/tpl/search.tpl b/tpl/search.tpl index 1eff91a..79fa6b8 100644 --- a/tpl/search.tpl +++ b/tpl/search.tpl @@ -10,7 +10,7 @@
- {$lang_comments} {$lang_comments_search_nosearch} + {$lang_comments} {$lang_comments_search_nosearch}
diff --git a/tpl/subnet.tpl b/tpl/subnet.tpl index 92da345..73a8b8b 100644 --- a/tpl/subnet.tpl +++ b/tpl/subnet.tpl @@ -6,7 +6,7 @@ {if $suser_add || $suser_admin} - {$lang_subnet_add} + {$lang_subnet_add} {/if} diff --git a/tpl/subnetadd.tpl b/tpl/subnetadd.tpl index fd6d989..0a2bb79 100644 --- a/tpl/subnetadd.tpl +++ b/tpl/subnetadd.tpl @@ -6,8 +6,8 @@ {$lang_subnet_add} - {$lang_cancel} - + {$lang_cancel} + diff --git a/tpl/subnetdel.tpl b/tpl/subnetdel.tpl index 2d98146..cbb149e 100644 --- a/tpl/subnetdel.tpl +++ b/tpl/subnetdel.tpl @@ -7,8 +7,8 @@ {$lang_subnet_del} - {$lang_cancel} - + {$lang_cancel} + diff --git a/tpl/subnetedit.tpl b/tpl/subnetedit.tpl index d168d10..ca63cbe 100644 --- a/tpl/subnetedit.tpl +++ b/tpl/subnetedit.tpl @@ -8,8 +8,8 @@ {$lang_subnet_edit} : {$subnet->address}/{$subnet->mask} - {$lang_cancel} - + {$lang_cancel} + diff --git a/tpl/subnetlocationadd.tpl b/tpl/subnetlocationadd.tpl index 3b59ceb..a44196e 100644 --- a/tpl/subnetlocationadd.tpl +++ b/tpl/subnetlocationadd.tpl @@ -7,8 +7,8 @@ {$lang_subnetlocation} - {$lang_cancel} - + {$lang_cancel} + diff --git a/tpl/subnetlocationdel.tpl b/tpl/subnetlocationdel.tpl index 738dd1c..0aadf80 100644 --- a/tpl/subnetlocationdel.tpl +++ b/tpl/subnetlocationdel.tpl @@ -7,8 +7,8 @@ {$lang_subnetlocation} - {$lang_cancel} - + {$lang_cancel} + diff --git a/tpl/subnetlocationedit.tpl b/tpl/subnetlocationedit.tpl index ee61eec..4f7ba81 100644 --- a/tpl/subnetlocationedit.tpl +++ b/tpl/subnetlocationedit.tpl @@ -7,8 +7,8 @@ {$lang_subnetlocation} - {$lang_cancel} - + {$lang_cancel} + diff --git a/tpl/subnetview.tpl b/tpl/subnetview.tpl index 58c8b22..d9a387b 100644 --- a/tpl/subnetview.tpl +++ b/tpl/subnetview.tpl @@ -6,10 +6,10 @@ {if $suser_edit} - {$lang_subnet_edit} + {$lang_subnet_edit} {/if} {if $suser_delete} - {$lang_subnet_del} + {$lang_subnet_del} {/if} @@ -157,7 +157,7 @@ {if $suser_edit} - {$lang_subnetvlan_edit} + {$lang_subnetvlan_edit} {/if} @@ -180,7 +180,7 @@ {if $suser_edit} - {$lang_location_edit} + {$lang_location_edit} {/if} diff --git a/tpl/subnetvlanadd.tpl b/tpl/subnetvlanadd.tpl index ee2b805..8f8b24b 100644 --- a/tpl/subnetvlanadd.tpl +++ b/tpl/subnetvlanadd.tpl @@ -7,8 +7,8 @@ {$lang_subnetvlan} - {$lang_cancel} - + {$lang_cancel} + diff --git a/tpl/subnetvlandel.tpl b/tpl/subnetvlandel.tpl index c3d2f02..90e66a4 100644 --- a/tpl/subnetvlandel.tpl +++ b/tpl/subnetvlandel.tpl @@ -7,8 +7,8 @@ {$lang_subnetvlan} - {$lang_cancel} - + {$lang_cancel} + diff --git a/tpl/subnetvlanedit.tpl b/tpl/subnetvlanedit.tpl index fb89bbf..f8840ba 100644 --- a/tpl/subnetvlanedit.tpl +++ b/tpl/subnetvlanedit.tpl @@ -7,8 +7,8 @@ {$lang_subnetvlan} - {$lang_cancel} - + {$lang_cancel} + @@ -46,8 +46,8 @@ {$lang_options} -  {$lang_vlan_add}
-  {$lang_vlan_del} +  
+   diff --git a/tpl/user.tpl b/tpl/user.tpl index baee6fa..ee107d9 100644 --- a/tpl/user.tpl +++ b/tpl/user.tpl @@ -5,7 +5,7 @@ {$lang_users} ({$users|@count}) - {$lang_user_add} + {$lang_user_add} diff --git a/tpl/useradd.tpl b/tpl/useradd.tpl index 62848ff..223a25e 100644 --- a/tpl/useradd.tpl +++ b/tpl/useradd.tpl @@ -7,8 +7,8 @@ {$lang_user_add} - {$lang_cancel} - + {$lang_cancel} + diff --git a/tpl/userdel.tpl b/tpl/userdel.tpl index 9ac864f..3576451 100644 --- a/tpl/userdel.tpl +++ b/tpl/userdel.tpl @@ -8,8 +8,8 @@ {$lang_user_del} - {$lang_cancel} - + {$lang_cancel} + diff --git a/tpl/useredit.tpl b/tpl/useredit.tpl index 5063764..9c3f2b1 100644 --- a/tpl/useredit.tpl +++ b/tpl/useredit.tpl @@ -8,8 +8,8 @@ {$user_name} - {$lang_cancel} - + {$lang_cancel} + diff --git a/tpl/userview.tpl b/tpl/userview.tpl index a2bc45b..f233a54 100644 --- a/tpl/userview.tpl +++ b/tpl/userview.tpl @@ -5,8 +5,8 @@ {$user->name} - {$lang_user_edit} - {$lang_user_del} + {$lang_user_edit} + {$lang_user_del} diff --git a/tpl/vlan.tpl b/tpl/vlan.tpl index 6f10d07..b7e0877 100644 --- a/tpl/vlan.tpl +++ b/tpl/vlan.tpl @@ -6,7 +6,7 @@ {if $suser_add || $suser_admin} - {$lang_vlan_add} + {$lang_vlan_add} {/if} diff --git a/tpl/vlanadd.tpl b/tpl/vlanadd.tpl index d998f4e..e8bcaef 100644 --- a/tpl/vlanadd.tpl +++ b/tpl/vlanadd.tpl @@ -6,8 +6,8 @@ {$lang_vlan_add} - {$lang_cancel} - + {$lang_cancel} + diff --git a/tpl/vlandel.tpl b/tpl/vlandel.tpl index 1e8e404..ef8328d 100644 --- a/tpl/vlandel.tpl +++ b/tpl/vlandel.tpl @@ -7,8 +7,8 @@ {$vlan->name} - {$lang_cancel} - + {$lang_cancel} + diff --git a/tpl/vlanedit.tpl b/tpl/vlanedit.tpl index bdbe5de..3191df4 100644 --- a/tpl/vlanedit.tpl +++ b/tpl/vlanedit.tpl @@ -8,8 +8,8 @@ {$lang_vlan_edit} : {$vlan->name} - {$lang_cancel} - + {$lang_cancel} + diff --git a/tpl/vlansubnetadd.tpl b/tpl/vlansubnetadd.tpl index 5fc1bfc..3913fcc 100644 --- a/tpl/vlansubnetadd.tpl +++ b/tpl/vlansubnetadd.tpl @@ -7,8 +7,8 @@ {$lang_vlansubnet} - {$lang_cancel} - + {$lang_cancel} + diff --git a/tpl/vlansubnetdel.tpl b/tpl/vlansubnetdel.tpl index 1bb5b46..cdb786e 100644 --- a/tpl/vlansubnetdel.tpl +++ b/tpl/vlansubnetdel.tpl @@ -7,8 +7,8 @@ {$lang_vlansubnet} - {$lang_cancel} - + {$lang_cancel} + diff --git a/tpl/vlansubnetedit.tpl b/tpl/vlansubnetedit.tpl index c834537..6f316c3 100644 --- a/tpl/vlansubnetedit.tpl +++ b/tpl/vlansubnetedit.tpl @@ -7,8 +7,8 @@ {$lang_vlansubnet} - {$lang_cancel} - + {$lang_cancel} + diff --git a/tpl/vlanview.tpl b/tpl/vlanview.tpl index 1f14c7f..abceb80 100644 --- a/tpl/vlanview.tpl +++ b/tpl/vlanview.tpl @@ -6,13 +6,13 @@ {if $suser_add} - {$lang_assignvlantosubnet} + {$lang_assignvlantosubnet} {/if} {if $suser_edit} - {$lang_vlan_edit} + {$lang_vlan_edit} {/if} {if $suser_delete} - {$lang_vlan_del} + {$lang_vlan_del} {/if} diff --git a/tpl/zone.tpl b/tpl/zone.tpl index 810b0dd..bf9e0bc 100644 --- a/tpl/zone.tpl +++ b/tpl/zone.tpl @@ -6,7 +6,7 @@ {if $suser_add || $suser_admin} - {$lang_zone_add} + {$lang_zone_add} {/if} diff --git a/tpl/zoneadd.tpl b/tpl/zoneadd.tpl index 50fed7c..3e58db1 100644 --- a/tpl/zoneadd.tpl +++ b/tpl/zoneadd.tpl @@ -6,8 +6,8 @@ {$lang_zone_add} - {$lang_cancel} - + {$lang_cancel} + diff --git a/tpl/zonedel.tpl b/tpl/zonedel.tpl index 8822fee..d64b642 100644 --- a/tpl/zonedel.tpl +++ b/tpl/zonedel.tpl @@ -7,8 +7,8 @@ {$zone_origin} - {$lang_cancel} - + {$lang_cancel} + diff --git a/tpl/zoneedit.tpl b/tpl/zoneedit.tpl index 3930376..39f17f5 100644 --- a/tpl/zoneedit.tpl +++ b/tpl/zoneedit.tpl @@ -8,8 +8,8 @@ {$lang_zone_edit} : {$zone->zone_origin} - {$lang_cancel} - + {$lang_cancel} + diff --git a/tpl/zoneview.tpl b/tpl/zoneview.tpl index 7f8e809..a670e53 100644 --- a/tpl/zoneview.tpl +++ b/tpl/zoneview.tpl @@ -6,10 +6,10 @@ {if $suser_edit || $suser_admin} - {$lang_zone_edit} + {$lang_zone_edit} {/if} {if $suser_delete || $suser_admin} - {$lang_zone_del} + {$lang_zone_del} {/if}