updated uc_termsofservice, session_limit

sites/all/modules/contrib/users/session_limit/session_limit.info

@@ -1,14 +1,16 @@
 name = Session Limit
 description = "Limit simultaneous user sessions."
 core = 7.x
+configure = admin/config/people/session_limit
+
 files[] = session_limit.install
 files[] = session_limit.module
 files[] = session_limit.tokens.inc
 files[] = tests/session_limit.test
 
-; Information added by Drupal.org packaging script on 2014-03-04
-version = "7.x-2.0"
+; Information added by Drupal.org packaging script on 2016-02-24
+version = "7.x-2.2"
 core = "7.x"
 project = "session_limit"
-datestamp = "1393949919"
+datestamp = "1456312454"
 

sites/all/modules/contrib/users/session_limit/session_limit.module

@@ -83,7 +83,7 @@ function session_limit_menu() {
     'access callback' => 'user_is_logged_in',
     'type' => MENU_SUGGESTED_ITEM,
   );
-  $items['admin/config/people/session_limit'] = array(
+  $items['admin/config/people/session-limit'] = array(
     'title' => 'Session limit',
     'description' => 'Configure session limits.',
     'page callback' => 'drupal_get_form',
@@ -98,7 +98,7 @@ function session_limit_menu() {
     'access arguments' => array('administer site configuration'),
     'type' => MENU_DEFAULT_LOCAL_TASK,
   );
-  $items['admin/config/people/session_limit/roles'] = array(
+  $items['admin/config/people/session-limit/roles'] = array(
     'title' => 'Role limits',
     'description' => 'Configure session limits by role.',
     'page callback' => 'drupal_get_form',
@@ -106,7 +106,7 @@ function session_limit_menu() {
     'access arguments' => array('administer session limits by role'),
     'type' => MENU_LOCAL_TASK,
   );
-  $items['user/%user/session_limit'] = array(
+  $items['user/%user/session-limit'] = array(
     'title' => 'Session limit',
     'description' => 'Configure session limit for one user.',
     'page callback' => 'drupal_get_form',
@@ -304,6 +304,21 @@ function session_limit_action_info_alter(&$info) {
   }
 }
 
+/**
+ * Implements hook_field_extra_fields().
+ */
+function session_limit_field_extra_fields() {
+  $extra['user']['user']['display'] = array(
+    'session_limit' => array(
+      'label' => t('Session limit'),
+      'description' => t('Session limit.'),
+      'weight' => 10,
+    ),
+  );
+
+  return $extra;
+}
+
 /**
  * Implements hook_user_view().
  */
@@ -312,7 +327,9 @@ function session_limit_user_view($account, $view_mode) {
     $account->content['session_limit'] = array(
       '#title' => t('Session limit'),
       '#type' => 'user_profile_category',
-      'session_limit' => array('#value' => empty($account->data['session_limit']) ? t('Default') : $account->data['session_limit'])
+      'session_limit' => array(
+        '#markup' => empty($account->data['session_limit']) ? t('Default') : $account->data['session_limit'],
+      )
     );
   }
 }
@@ -487,12 +504,14 @@ function session_limit_user_max_sessions_byrole($account) {
   $limits = array();
 
   foreach ($account->roles as $rid => $name) {
-    $limits[] = variable_get("session_limit_rid_$rid", 0);
+    $role_limit = variable_get("session_limit_rid_$rid", FALSE);
+
+    if (!empty($role_limit)) {
+      $limits[] = (int) $role_limit;
+    }
   }
 
-  rsort($limits);
-
-  return (int) $limits[0];
+  return empty($limits) ? 0 : max($limits);
 }
 
 /**
@@ -554,7 +573,7 @@ function session_limit_invoke_session_limit($session, $op) {
       if ($limit > 0) {
         // Secure session ids are seperate rows in the database, but we don't want to kick
         // the user off there http session and not there https session or vice versa. This
-        // is why this query is DISTINCT. 
+        // is why this query is DISTINCT.
         $result = db_select('sessions', 's')
           ->distinct()
           ->fields('s', array('sid'))
@@ -599,7 +618,7 @@ function session_limit_session_limit($sid, $op) {
       }
 
       $fields['uid'] = 0;
-      $query = db_update('sessions')
+      db_update('sessions')
         ->fields($fields)
         ->condition('sid', $sid)
         ->execute();
@@ -665,3 +684,31 @@ function _session_limit_bypass() {
 
   return FALSE;
 }
+
+/**
+ * Implements hook_variable_group_info().
+ */
+function session_limit_variable_group_info() {
+  $groups['session_limit'] = array(
+    'title' => t('Session limit'),
+    'access' => 'administer site configuration',
+    'path' => array('admin/config/people/session_limit/defaults'),
+  );
+  return $groups;
+}
+
+/**
+ * Implements hook_variable_info().
+ */
+function session_limit_variable_info($options) {
+  $variables['session_limit_logged_out_message'] = array(
+    'title' => t('Logged out message', array(), $options),
+    'description' =>  t('The message that is displayed to a user if the workstation has been logged out.<br />
+      @number is replaced with the maximum number of simultaneous sessions.', array(), $options),
+    'type' => 'string',
+    'localize' => TRUE,
+    'group' => 'session_limit',
+  );
+
+  return $variables;
+}