Changeset 1274


Ignore:
Timestamp:
01/17/10 22:04:07 (11 years ago)
Author:
alno
Message:

WebIf:

  • Merging revisions 1272-1273 of trunk
  • THX @ Landlord for backport and documentation ;-)
Location:
branches/monitor-improvement
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • branches/monitor-improvement/Distribution/doc/example/oscam.user

    r885 r1274  
    4040caid       = 0200
    4141
    42 # user for group 3 without monitor access, only one connection possible, AU disabled
     42# user for group 3 without monitor access, only one connection possible, AU disabled, account disabled
    4343
    4444[account]
    4545user       = user4
    4646pwd        = password4
     47disabled   = 1
    4748monlevel   = 0
    4849uniq       = 1
  • branches/monitor-improvement/Distribution/doc/man/oscam.server.5

    r1228 r1274  
    9393.RE
    9494.PP
    95 \fBdetect\fP = \fBCD\fP|\fBDSR\fP|\fBCTS\fP|\fBRING\fP|\fBNONE\fP|\fBgpio[2-7]\fP
     95\fBdetect\fP = \fBCD\fP|\fBDSR\fP|\fBCTS\fP|\fBRING\fP|\fBNONE\fP|\fBgpio[1-7]\fP
    9696.RS 3n
    9797status detect of card (NONE = no detection), default:CD
  • branches/monitor-improvement/Distribution/doc/man/oscam.user.5

    r1078 r1274  
    112112.RE
    113113.PP
     114\fBdisabled\fP = \fB0\fP|\fB1\fP
     115.RS 3n
     1161 = account disabled, default:0
     117.RE
     118.PP
    114119\fBnumusers\fP = \fBquantity\fP \fI(only if anti-cascading enabled)\fR
    115120.RS 3n
  • branches/monitor-improvement/Distribution/doc/txt/oscam.server.txt

    r1228 r1274  
    6969      AES key for Viaccess SCs
    7070
    71        detect = CD|DSR|CTS|RING|NONE|gpio[2-7]
     71       detect = CD|DSR|CTS|RING|NONE|gpio[1-7]
    7272      status detect of card (NONE = no detection), default:CD
    7373
  • branches/monitor-improvement/Distribution/doc/txt/oscam.user.txt

    r1078 r1274  
    8686            expdate = 2002/12/22
    8787
     88       disabled = 0|1
     89      1 = account disabled, default:0
     90
    8891       numusers = quantity (only if anti-cascading enabled)
    8992      anti-cascading:  user per account, 0 = anti-cascading not permitted,
  • branches/monitor-improvement/globals.h

    r1269 r1274  
    321321  time_t    lastecm;
    322322  time_t    expirationdate;
    323   int       disabled;
     323  int       disabled;
    324324  ulong     grp;
    325325  int       crypted;
     
    502502  uchar     dyndns[64];
    503503  time_t    expirationdate;
    504   int       disabled;
     504  int       disabled;
    505505  struct   s_auth *next;
    506506};
  • branches/monitor-improvement/oscam.c

    r1269 r1274  
    18171817      er->rc=11; //expired
    18181818    if(client[cs_idx].disabled != 0)
    1819         er->rc=12; //disabled
     1819      er->rc=12; //disabled
    18201820    if ((client[cs_idx].tosleep) &&
    18211821        (now-client[cs_idx].lastswitch>client[cs_idx].tosleep))
Note: See TracChangeset for help on using the changeset viewer.