 >  * @author Herbert Yeung
 >  * @date  17th June 2010
 >  * Modification: Added permission so that a user can access the LabConnector and index pages
-75c79,80
-<                                   				  'delete', 'deletesession')
+72c76,77
+<                                   'primitive' => array('json', 'echo', 'file')
 ---
->                                   				  'delete', 'deletesession'),
->                                   'labconnector' => array('index', 'error', 'experiment', 'results', 'refreshresults', 'submitexperiment')
-184c189
-< }
-\ No newline at end of file
----
-> }
+>                                   'primitive' => array('json', 'echo', 'file'),
+>     							  'labconnector' => array('index', 'error', 'experiment', 'results', 'refreshresults', 'submitexperiment')
 Index: library/Sahara/Soap.php
 ===================================================================
 36a37,40

> db.params.password = saharapasswdaustria101
> db.params.dbname = sahara
> db.params.port = 3306
> 
> logger.level = DEBUG
Index: application/views/layouts/_navbar.phtml
===================================================================
36a37,41

>             }
Index: application/configs/config.ini
===================================================================
12c12
< logger.filename = /home/mdiponio/workspace/WI/webinterface.log
---
> logger.filename = /var/www/sahara/public/webinterface.log
38c38
< 
---
> camera.rcjpeg = /primitive/file/pc/FileTransferController/pa/binaryFile/tf/base64/filename/<FILE>
40a41
> cameradesc.rcjpeg = Rig Client Cam
70,94c71,80
< ; Database configuration
< database.adapter = Pdo_Mysql
< database.params.host = 127.0.0.1
< database.params.dbname = sahara
< database.params.username = sahara
< database.params.password = saharapasswd
< 
< ; LDAP connection parameters
< ldap.params.host = 138.25.47.106
< ldap.params.username = "cn=Directory Manager"
< ldap.params.password = dmpasswd
< ldap.params.baseDn = "o=UTS"
< 
< ; Authentication configuration
< auth.type[] = Database
< auth.type[] = Ldap
< ;auth.session[] = SaharaAccount{Ldap}
< auth.session[] = LdapPermission{Ldap}
< 
< ; LDAP auth required attributes and values
< auth.ldap.objectclass = utsperson
< 
< ; LDAP permissions
< session.ldappermission.rule[] = "utsaccounttype=Staff{Physical Modelling}"
< session.ldappermission.rule[] = "objectclass=utsperson{Dynamics and Control}"
---
> ; LabConnector Experiment Storage root directory
> experiment.storage.dir = /home/saharausrs
> 
> ;Database for user password information
> db.adapter = PDO_MYSQL
> db.params.host = localhost
