Last Used for Devices

Author: kimbtech

Dockerfile

@@ -5,4 +5,7 @@ COPY --chown=www-data:www-data ./php/ /php-code/
 COPY --chown=www-data:www-data ./start/ /start/
 COPY ./nginx.conf /etc/nginx/more-server-conf.conf 
 COPY ./startup-before.sh  /
-COPY ./VERSION /php-code/VERSION
+COPY ./VERSION /php-code/VERSION
+
+RUN curl -L https://browscap.org/stream?q=Lite_PHP_BrowsCapINI -o /start/lite_php_browscap.ini \
+	&& echo "browscap = /start/lite_php_browscap.ini" > /usr/local/etc/php/conf.d/enable_browscap.ini

VERSION

@@ -1,4 +1,4 @@
 latest
-0.2.6
+0.2.7
 0.2
 0

php/core/Login.php

@@ -35,6 +35,7 @@ private function apiClientLogin(string $group, string $client, string $token) :
 			$did = $this->groupList->searchValue([$group, 'devices'], $client, 'name');
 			if( $did !== false ){
 				if( $this->groupList->getValue([$group, 'devices', $did, 'token']) === $token ){
+					$this->groupList->setValue([$group, 'devices', $did, 'used'], time()); 
 					$this->logUserIn($group, $client);
 					return;
 				}
@@ -131,7 +132,8 @@ public static function createNewGroup(JSONReader $groups, string $group, string
 			return $groups->setValue([$group], array(
 				"passhash"  => self::genHashedPassword($password),
 				"admin" => $admin,
-				"devices" => array()
+				"devices" => array(),
+				"sessions" => array()
 			));
 		}
 	}

php/core/Utilities.php

@@ -85,6 +85,12 @@ public static function deleteDirRecursive(string $dir) : bool {
 		}
 		return $ok && rmdir($dir);
 	}
+
+	public static function getBrowserOS() : string {
+		$b = get_browser();
+		return $b->browser . ' ' . $b->version . ' on ' . $b->platform;
+	}
+
 }
 
 ?>

php/core/WebGUI.php

@@ -154,7 +154,7 @@ public function deviceManage() : void {
 				$did = $r->searchValue([$myGroup, 'devices'], $name, 'name');
 				if( $did === false ){
 					$token = Utilities::randomCode(50, Utilities::ID);
-					if($r->setValue([$myGroup, 'devices', null], array( 'name' => $name, 'token' => $token))){
+					if($r->setValue([$myGroup, 'devices', null], array( 'name' => $name, 'token' => $token, 'used' => 0))){
 						$device->setContent('NOTEMSG','Added device "'. $name .'" with token<br>"<code>'. $token .'</code>"!');
 					}
 					else{
@@ -205,11 +205,22 @@ public function deviceManage() : void {
 		foreach($r->getValue([$this->login->getGroup(), 'devices']) as $d){
 			$dv[] = array(
 				"NAME" => $d['name'],
-				"DID" => $d['name']
+				"DID" => $d['name'],
+				"LASTUSED" => $d['used'] > 0 ? date('Y-m-d H:i', $d['used']) : 'Never'
 			);
 		}
 		$device->setMultipleContent('Devices', $dv);
 
+		$sv = array();
+		foreach($r->getValue([$this->login->getGroup(), 'sessions']) as $k => $d){
+			$sv[] = array(
+				"BROWSEROS" => $d['browseros'],
+				"LASTUSED" => $d['used'] > 0 ? date('Y-m-d H:i', $d['used']) : 'Never',
+				"SID" => $k
+			);
+		}
+		$device->setMultipleContent('Sessions', $sv);
+
 		if( is_dir(API::getStorageDir($myGroup)) ){
 			$ds = array();
 			foreach( scandir(API::getStorageDir($myGroup)) as $d){

php/core/templates/device.json

@@ -4,10 +4,16 @@
 	"multiples" : {
 		"Devices" : {
 			"%%NAME%%" : "Name",
-			"%%DID%%" : "-1"
+			"%%DID%%" : "-1",
+			"%%LASTUSED%%" : "Unknown"
 		},
 		"Data" : {
 			"%%NAME%%" : "Name"
+		},
+		"Sessions" : {
+			"%%BROWSEROS%%" : "Unknown",
+			"%%LASTUSED%%" : "Unknown",
+			"%%SID%%" : "-1"
 		}
 	}
 }

php/core/templates/device_en.html

@@ -7,13 +7,15 @@ <h3>Active devices</h3>
 		<tr>
 			<thead class="thead-dark">
 				<th>Device</th>
+				<th>Last used</th>
 				<th>Regenerate token</th>
 				<th>Delete</th>
 			</thead>
 		</tr>
 		<!--MULTIPLE-Devices-BEGIN-->
 			<tr>
 				<td><code>%%NAME%%</code></td>
+				<td><code>%%LASTUSED%%</code></td>
 				<td><a href="%%SERVERURL%%/?task=devices&regenerate=%%DID%%" class="confirm confirmLink" title="Regenerate Token" content="Regenerate token for device '%%NAME%%'?"><button type="button" class="btn btn-warning">Regenerate</button></a></td>
 				<td><a href="%%SERVERURL%%/?task=devices&delete=%%DID%%" class="confirm confirmLink" title="Delete Device" content="Delete device with name '%%NAME%%'?"><button type="button" class="btn btn-danger">Delete</button></a></td>
 			</tr>
@@ -47,4 +49,25 @@ <h3>Available data in storage</h3>
 	<!--MULTIPLE-Data-BEGIN-->
 		<li class="list-group-item"><code>%%NAME%%</code></li>
 	<!--MULTIPLE-Data-END-->
-</ul>
+</ul>
+
+<h3>Web session</h3>
+	<p>
+		When a user ticks the box "Stay logged in" the a session will be created and shown here.
+	</p>
+	<table class="accounttable table table-striped table-responsive-sm">
+		<tr>
+			<thead class="thead-dark">
+				<th>Device</th>
+				<th>Last used</th>
+				<th>Remove</th>
+			</thead>
+		</tr>
+		<!--MULTIPLE-Sessions-BEGIN-->
+			<tr>
+				<td><code>%%BROWSEROS%%</code></td>
+				<td><code>%%LASTUSED%%</code></td>
+				<td><a href="%%SERVERURL%%/?task=devices&remove=%%SID%%" class="confirm confirmLink" title="Delete Device" content="Delete session on '%%BROWSEROS%%'?"><button type="button" class="btn btn-danger">Remove</button></a></td>
+			</tr>
+		<!--MULTIPLE-Sessions-END-->
+	</table>