Merge branch 'master' into 'AllCapping'

# Conflicts:
#   smradius/modules/features/mod_feature_capping.pm

smradius/modules/features/mod_feature_capping.pm

@@ -598,6 +598,65 @@ if (defined ($user->('SMRadius-AutoTopup-TrafficEnable'))){
 
  #We top the user up
 
+sub allowCapping{
+
+	my ($server,$user) = @_;
+
+
+ if (defined($user->{'ConfigAttributes'}->{'SMRadius-Config-Capping-Traffic-Multiplier'})) {
+ my $multiplier = @user;
+ my $newLimit = $trafficLimitWithTopups * $multiplier;
+ $server->log(LOG_INFO,"[MOD_FEATURE_CAPPING] Client cap traffic multiplier '$multiplier' changes limit ".
+	"from '$trafficLimitWithTopups' to '$newLimit'");
+			$trafficLimitWithTopups = $newLimit;
+	}
+
+
+ if (defined($user->{'ConfigAttributes'}->{'SMRadius-Config-Capping-Uptime-Multiplier'})) {
+
+ my $multiplier = @user;
+		my $newLimit = $trafficLimitWithTopups * $multiplier;
+		$server->log(LOG_INFO,"[MOD_FEATURE_CAPPING] Client cap uptime multiplier '$multiplier' changes limit ".
+			"from '$uptimeLimitWithTopups' to '$newLimit'");
+		$uptimeLimitWithTopups = $newLimit;
+	}
+}
+
+
+
+sub AllowOverideCappingByClient{
+	my ($server,$user)=@_;
+ if (defined($user->{'ConfigAttributes'}->{'SMRadius-Config-Capping-Uptime-Multiplier'})) {
+
+ my $multiplier = $user->{'ConfigAttributes'}->{'SMRadius-Config-Capping-Uptime-Multiplier'};
+
+ my $newLimit = $uptimeLimitWithTopups * $multiplier;
+ my $newSessionTime = $accountingUsage->{'TotalSessionTime'} * $multiplier;
+
+				$uptimeLimitWithTopups = $newLimit;
+				$accountingUsage->{'TotalSessionTime'} = $newSessionTime;
+				$server->log(LOG_INFO,"[MOD_FEATURE_CAPPING] Client uptime multiplier '$multiplier' changes ".
+					"uptime limit ('$uptimeLimitWithTopups' => '$newLimit'), ".
+								"uptime usage ('".$accountingUsage->{'TotalSessionTime'}."' => '$newSessionTime')");
+if (defined($user->{'ConfigAttributes'}->{'SMRadius-Config-Capping-Traffic-Multiplier'})) {
+ my $multiplier = $user->{'ConfigAttributes'}->{'SMRadius-Config-Capping-Traffic-Multiplier'};
+ my $newLimit = $trafficLimitWithTopups * $multiplier;
+ my $newDataUsage = $accountingUsage->{'TotalDataUsage'} * $multiplier;
+
+ $trafficLimitWithTopups = $newLimit;
+$accountingUsage->{'TotalDataUsage'} = $newDataUsage;
+
+		$server->log(LOG_INFO,"[MOD_FEATURE_CAPPING] Client traffic multiplier '$multiplier' changes ".
+					"traffic limit ('$trafficLimitWithTopups' => '$newLimit'), ".
+								"traffic usage ('".$accountingUsage->{'iTotalDataUsage'}."' => '$newDataUsage')"
+						);
+		}
+
+
+}
+
+
+
 
 
  }
@@ -607,4 +666,4 @@ if (defined ($user->('SMRadius-AutoTopup-TrafficEnable'))){
 }
 
 1;
-# vim: ts=4
+# vim: ts=4
\ No newline at end of file