Index: indexforms-user.inc.php =================================================================== --- indexforms-user.inc.php (revision 617) +++ indexforms-user.inc.php (working copy) @@ -1012,12 +1012,12 @@ // TODO - prob better to have these actions in user_admin instead. /* add a macro? */ - if (!empty($_GET['macroNewName'])) - user_macro_create($_GET['macroUsername'], $_GET['macroNewName'],$_GET['macroNewBody']); + if (!empty($_GET['macroNewName']) && !empty($_GET['macroNewBody']) ) + user_macro_create($User->username, $_GET['macroNewName'],$_GET['macroNewBody']); /* delete a macro? */ - if (!empty($_GET['macroDelete'])) - user_macro_delete($_GET['macroUsername'], $_GET['macroDelete'],$_GET['macroDeleteNArgs']); + if (!empty($_GET['macroDelete']) && !empty($_GET['macroDeleteNArgs'])) + user_macro_delete($User->username, $_GET['macroDelete'], $_GET['macroDeleteNArgs']); // TODO use ID field instead ?> @@ -1067,7 +1067,6 @@ , '' , '' , '' - , '' , '' , '' , ''; @@ -1103,7 +1102,7 @@ - + Index: indexforms-saved.inc.php =================================================================== --- indexforms-saved.inc.php (revision 620) +++ indexforms-saved.inc.php (working copy) @@ -788,7 +788,7 @@ Date created: - create_time); ?> + create_time); ?> @@ -829,6 +829,9 @@ foreach($variable_list as $v) echo "\n\t\t" , '' , $v->label , '' + + // TODO if source_info is too long, shorten it and add a Jquery "click for more" that will un-hide it. + , '' , cqpweb_htmlspecialchars($v->source_info) , '' , "\n" ;