Merge pull request knop-project#133 from knop-project/v9.3

Merge v9.3 branch onto master branch

Author: stevepiercy

.gitignore

@@ -1,5 +1,7 @@
+.idea
+.DS_Store
+__assets
 /.buildpath
 /.project
-.DS_Store
 *.bbproject*
 SQLiteDBs/

knop9/INSTALL.md

@@ -73,8 +73,20 @@ Navigation method
 -----------------
 The navigation method for the demo is initially set to 'path', which uses virtual URLs. If you can't use virtual URLs, you can change the default navigation method by configuring the variable `navmethod` and setting it to the value of 'param' in `demo/_config/cfg__global.inc`.
 
+Visit demo site
+---------------
+Once you have configured the Knop demo site, you may visit it in a web browser.
+
+To demonstrate simple authentication, visit the login page, for example:
+
+<http://myhostname/login/>
+
+For `Username` and `Password`, use any `email` and `password` in the `knopdemo` database, for example, `[email protected]` and `demo`.
+
+The demo site does not follow best security practices for authentication, such as hashing of passwords, and its methods should not be used in production. This method is for demonstration of authentication only.
+
 Upgrading Knop
---------------
+==============
 To upgrade Knop, overwrite the Knop libraries in the appropriate location, then either restart the instance or use the Knop type reloader (see "Reload Knop types" above).
 
 Install L-Debug

knop9/databases/knopdemo.sql

@@ -1,6 +1,6 @@
-<?LassoScript
+<?LassoScript
 
-	// process form 
+	// process form
 	// "the more complicated way"
 
 	// first load field data from form submission
@@ -12,18 +12,18 @@ $trace -> insert($f -> updatefields);
 		// do nothing
 	else( $f -> getbutton == 'save' && $f -> isvalid);
 
-		$d -> saverecord( -fields=($f -> updatefields), 
-			-lockvalue=($f -> lockvalue), 
+		$d -> saverecord( -fields=($f -> updatefields),
+			-lockvalue=($f -> lockvalue),
 			-user=$s_user);
 
 	else( $f -> getbutton == 'add' && $f -> isvalid);
 
-		$d -> addrecord( -fields=($f -> updatefields), 
+		$d -> addrecord( -fields=($f -> updatefields),
 			-keyvalue=($f -> keyvalue));
 
 	else( $f -> getbutton == 'delete');
 
-		$d -> deleterecord( -lockvalue=($f -> lockvalue), 
+		$d -> deleterecord( -lockvalue=($f -> lockvalue),
 			-user=$s_user);
 
 	/if;
@@ -38,5 +38,8 @@ $trace -> insert($f -> updatefields);
 
 	if( $d -> error_code);
 		$message -> insert($d -> error_msg + ' ' + $d -> error_code);
+		if( $d -> error_data);
+		    $message -> insert($d -> error_data);
+		/if;
 	/if;
 ?>

knop9/demo/_action/act_advanced_edit.inc

@@ -1,4 +1,4 @@
-<?LassoScript
+<?LassoScript
 
 	// process form 
 	// "the easy way"

knop9/demo/_action/act_customer_edit.inc

@@ -1,13 +1,13 @@
-<?LassoScript
+<?LassoScript
 
 
 // load the field values from the form submission into the form
 $loginform -> loadfields;
 
 
 // authenticate the user
-$s_user -> login(-username=($loginform -> username), 
-	-password=($loginform -> password));
+$s_user -> login(-username=($loginform -> getvalue('username')),
+	-password=($loginform -> getvalue('password')));
 
 // check if authentication was successful
 if($s_user -> auth);

knop9/demo/_action/act_login.inc

@@ -1,4 +1,4 @@
-<?LassoScript
+<?LassoScript
 // Use some kind of security to prevent l-debug running where it should not.
 // Uncomment the next line to activate l-debug, assuming you have installed it.
 // client_getparams >> 'debug' && server_name == 'knop9' ? debug->activate

knop9/demo/_config/cfg__global.inc

@@ -1,4 +1,4 @@
-<?LassoScript
+<?LassoScript
 
 
 // Configure language strings
@@ -144,6 +144,7 @@ else(string($s_lang) -> size > 0);
 
 else;
 	// no specific language has been chosen, use the visitor's preferred language acording to the browser's request header
+	$lang_ui -> setlanguage($lang_ui -> browserlanguage);
 /if;
 
 

knop9/demo/_config/cfg__lang.inc

@@ -1,4 +1,4 @@
-<?LassoScript
+<?LassoScript
 
 	// initiate empty array to hold options for select field
 	var( 'options'=array);

knop9/demo/_config/cfg_advanced_edit.inc

@@ -1,4 +1,4 @@
-<?LassoScript
+<?LassoScript
 
 // create grid object for the record list
 var( 'list'=knop_grid( 
@@ -33,11 +33,11 @@ $list -> addfield(
 		-name='enabled', 
 		-width=80, 
 		-template=map(
-			1='<span style="color: green;">' + $lang_ui -> yes + '</span>', 
--default='<span style="color: red;">&bull;</span>'));
+			'1'='<span style="color: green;">' + $lang_ui -> yes + '</span>',
+			'-default'='<span style="color: red;">&bull;</span>'));
 $list -> addfield( 
-		-label='Compund', 
-		-name='enabled', 
+		-label='Modified',
+		-name='moddate',
 		-width=150, 
 		-template={return  date( field( 'moddate')) -> format( $lang_ui -> dateformat_short)});
 

knop9/demo/_config/cfg_advanced_list.inc

@@ -1,4 +1,4 @@
-<?LassoScript
+<?LassoScript
 
 	// create form object
 	var('f'=knop_form(

knop9/demo/_config/cfg_customer_edit.inc

@@ -1,4 +1,4 @@
-<?LassoScript
+<?LassoScript
 
 // create grid object for records list
 var('list'=knop_grid(

knop9/demo/_config/cfg_customer_list.inc

@@ -1,4 +1,4 @@
-<?LassoScript
+<?LassoScript
 
 // Create login form
 

knop9/demo/_config/cfg_login.inc

@@ -1,2 +1,2 @@
-[/* Show the edit form */]
+[/* Show the edit form */]
 [$f -> renderform]

knop9/demo/_content/cnt_advanced_edit.inc

@@ -1,4 +1,4 @@
-[/* Show record listing */]
+[/* Show record listing */]
 [$list -> renderhtml]
 
 [/* Show button to create new record */]

knop9/demo/_content/cnt_advanced_list.inc

@@ -1,2 +1,2 @@
-[/* Show the edit form */]
+[/* Show the edit form */]
 [$f -> renderform]

knop9/demo/_content/cnt_customer_edit.inc

@@ -1,4 +1,4 @@
-[/* Show record listing */]
+[/* Show record listing */]
 [$list -> renderhtml]
 
 [/* Show button to create new record */]

knop9/demo/_content/cnt_customer_list.inc

@@ -1,5 +1,5 @@
-[if($s_user -> auth)]
-	<p>[$lang_ui -> loggedinas(-replace=array($s_user -> firstname, $s_user -> lastname))]</p>
+[if($s_user -> auth)]
+	<p>[$lang_ui -> loggedinas(-replace=array($s_user -> getdata('firstname'), $s_user -> getdata('lastname')))]</p>
 	<p><a href="[$nav -> url(-urlargs='-action=logout')]">[$lang_ui -> logout]</a></p>
 [else]
 	[$loginform -> renderform]

knop9/demo/_content/cnt_login.inc

@@ -1,2 +1 @@
-
-[$nav -> renderhtml(-renderpath='/', -expand)]
+[$nav -> renderhtml(-renderpath='/', -expand)]

knop9/demo/_content/cnt_sitemap.inc

@@ -1,4 +1,4 @@
-<?LassoScript
+<?LassoScript
 
 // dynamically disable certain nav elements - after action
 

knop9/demo/_library/lib__global.inc

@@ -1,4 +1,4 @@
-<?LassoScript
+<?LassoScript
 
 // initiate form to capture keyvalue, set formmode etc.
 if($f -> error_code == 0);
@@ -7,7 +7,7 @@ if($f -> error_code == 0);
 
 if( $f -> error_code == 0 && $f -> formmode == 'edit');
 	// an existing record is requested, load field data from database
-	$d->getrecord(-keyvalue = $f -> keyvalue, -lock, -user=$s_user);
+	$d->getrecord(-keyvalue = $f -> keyvalue, -lock=true, -user=$s_user);
 	$f -> loadfields( -database);
 
 else;

knop9/demo/_library/lib_advanced_edit.inc

@@ -1,4 +1,4 @@
-<?LassoScript
+<?LassoScript
 
 	// find out the current skiprecords value based on the -page parameter and $maxrecords
 	$skiprecords = $list -> page_skiprecords($maxrecords);
@@ -18,7 +18,7 @@
 
 
 	// get list of records
-	$d -> select($searchparams);
+	$d -> select(-search=$searchparams);
 
 
 	// check if the -page value was out of bounds
@@ -28,7 +28,7 @@
 		$list -> 'page' = $list -> lastpage;
 		$skiprecords = $list -> page_skiprecords($maxrecords);
 		$searchparams -> removeall(-skiprecords) & insert( -skiprecords=$skiprecords);
-		$d -> select($searchparams);
+		$d -> select(-search=$searchparams);
 	/if;
 
 

knop9/demo/_library/lib_advanced_list.inc

@@ -1,4 +1,4 @@
-<?LassoScript
+<?LassoScript
 
 // initiate form to capture keyvalue, set formmode etc. 
 if($f -> error_code == 0); // there was no error in the action

knop9/demo/_library/lib_customer_edit.inc

@@ -1,4 +1,4 @@
-<?LassoScript
+<?LassoScript
 
 	// find out the current skiprecords value based on the -page parameter and $maxrecords
 	$skiprecords = $list -> page_skiprecords($maxrecords);
@@ -17,7 +17,7 @@
 	$searchparams -> merge($list -> quicksearch);
 
 	// get list of records
-	$d -> select($searchparams);
+	$d -> select(-search=$searchparams);
 
 
 

knop9/demo/_library/lib_customer_list.inc

@@ -1,4 +1,4 @@
-fieldset {
+fieldset {
 	background-color: #f7f7f7;
 	padding: 10px;
 	/*width: 600px;*/

knop9/demo/css/form.css

@@ -1,4 +1,4 @@
-body {
+body {
 	margin: 10px;
 	font-family: verdana, arial;
 	font-size: 12px;

knop9/demo/css/general.css

@@ -1,4 +1,4 @@
-table.grid {
+table.grid {
 	border-collapse: collapse;
 	border-bottom: 1px solid #ccc;
 }

knop9/demo/css/grid.css

@@ -1,4 +1,4 @@
-
+
 #menu {
 	font-family: verdana;
 	font-size: 12px;

knop9/demo/css/nav.css

@@ -1,4 +1,4 @@
-<?lassoscript
+<?lassoscript
 
 // Specify the root path to this solution. The path should begin and end with "/".
 // Specify just "/" if the solution is at the virtual host root instead of in a sub folder.
@@ -81,6 +81,11 @@ if( $message -> size);
 			if( $messageitem -> type == 'pair');
 				// if message item is a pair, the left side of the pair is a class name to use to format this message text
 				$messageitem = ('<span class="' + ($messageitem -> name) + '">' + ($messageitem -> value) + '</span>');
+			else( $messageitem -> type == 'map');
+                iterate($messageitem, local(i)) => {^
+                    #i -> first + ': ' + #i -> second
+                    loop_count != $messageitem -> size ? '<br>'
+                ^}
 			else;
 				$messageitem;
 			/if;

knop9/demo/error.lasso

@@ -33,4 +33,4 @@ while(#myregexp -> find) => {
 $myresult -> join('\r')
 '</pre>'
 */
-?>
+?>

knop9/demo/index.lasso

@@ -35,4 +35,4 @@ with reloaditem in #reloadarray do => {
 if(#message -> size > 0)
 	#message -> join('<br>')
 /if
-?>
+?>

knop9/knoplibs/_inc/help.inc

@@ -1,36 +1,38 @@
-[
-	/* =====================================================
-	Pull in core methods
-	This is done in-order so if you wish to load any before others then shuffle the order of the array as desired.
-	===================================================== */
-	local(coremethods = array(
-//			'debug.type',
-			'knop_utils',
-			'knop_base',
-			'knop_cache',
-			'knop_lang',
-			'knop_database',
-			'knop_form',
-			'knop_grid',
-			'knop_nav',
-			'knop_user'
-		)
-	)
+<?lasso
+/*
+Load core methods in order.
+Optionally shuffle the loading order of elements as desired.
+*/
+local(coremethods) = array(
+//    'debug.type.lasso',
+    'knop_utils.lasso',
+    'knop_base.lasso',
+    'knop_cache.lasso',
+    'knop_lang.lasso',
+    'knop_database.lasso',
+    'knop_form.lasso',
+    'knop_grid.lasso',
+    'knop_nav.lasso',
+    'knop_user.lasso'
+)
 
-	(not lasso_tagExists('debug')) ? #coremethods -> insertfirst('debug.type')
-	// Courtesy of Ke Carlton, www.l-debug.org. L-Debug for Lasso 9 All rights reserved — K Carlton 2011-2013
 
-	with i in #coremethods do => {
-		protect => {
-			handle_error => {
-				log_critical('Load failure on ' + #i + ' ' + error_msg)
-			}
-			log_critical('Prepping to load ' + #i)
-			lassoapp_include(#i+'.lasso')
-			log_critical('Done with ' + #i)
-		}
-	}
+(not lasso_tagExists('debug')) ? #coremethods -> insertfirst('debug.type.lasso')
+// Courtesy of Ke Carlton. L-Debug for Lasso 9, https://github.com/zeroloop/l-debug
 
-	error_reset
+with file in #coremethods do protect => {
+    local(s) = micros
+    handle => {
+        stdoutnl(
+            error_msg + ' (' + ((micros - #s) * 0.000001) -> asstring(-precision=3) + ' seconds)'
+        )
+    }
 
-]
+    stdout('\t' + #file + ' - ')
+
+    web_request
+    ? library(include_path + #file)
+    | lassoapp_include(#file)
+
+}
+?>