Fossil SCM

Slightly simplify the previous checkin.

stephan 2025-04-15 10:22 trunk
Commit 6a9c71f391947484987ec561ca942c70436ecd73b7c200a8c96bfed246210d1a
Parent e50a5aac379e700…
1 file changed +9 -9
~ src/setupuser.c
M src/setupuser.c
+9 -9
--- src/setupuser.c
+++ src/setupuser.c
@@ -162,19 +162,19 @@
162162
 /* 5 */"lower(login) AS sortkey, "
163163
 /* 6 */"CASE WHEN info LIKE '%%expires 20%%'"
164164
 " THEN substr(info,instr(lower(info),'expires')+8,10)"
165165
 " END AS exp,"
166166
 /* 7 */"atime,"
167
- /*8,9*/"%s,"
168
- /* 10*/"user.mtime AS sorttime,"
169
- /* 11*/"%s"
167
+ /* 8 */"user.mtime AS sorttime,"
168
+ /*9-11*/"%s"
170169
 " FROM user LEFT JOIN lastAccess ON login=uname"
171170
 " LEFT JOIN subscriber ON login=suname"
172171
 " WHERE login NOT IN ('anonymous','nobody','developer','reader') %s"
173172
 " ORDER BY sorttime DESC",
174
- bHaveAlerts ? "subscriber.ssub, subscriber.subscriberId" : "null, null",
175
- bHaveAlerts ? "subscriber.semail" : "null",
173
+ bHaveAlerts
174
+ ? "subscriber.ssub, subscriber.subscriberId, subscriber.semail"
175
+ : "null, null, null",
176176
 zWith/*safe-for-%s*/
177177
 );
178178
 rNow = db_double(0.0, "SELECT julianday('now');");
179179
 while( db_step(&s)==SQLITE_ROW ){
180180
 int uid = db_column_int(&s, 0);
@@ -185,12 +185,12 @@
185185
 const char *zSortKey = db_column_text(&s,5);
186186
 const char *zExp = db_column_text(&s,6);
187187
 double rATime = db_column_double(&s,7);
188188
 char *zAge = 0;
189189
 const char *zSub;
190
- int sid = db_column_int(&s,9);
191
- sqlite3_int64 sorttime = db_column_int64(&s, 10);
190
+ int sid = db_column_int(&s,10);
191
+ sqlite3_int64 sorttime = db_column_int64(&s, 8);
192192
 if( rATime>0.0 ){
193193
 zAge = human_readable_age(rNow - rATime);
194194
 }
195195
 if( bUbg ){
196196
 @ <tr style='background-color: %h(user_color(zLogin));'>
@@ -202,13 +202,13 @@
202202
 @ <td>%h(zCap)
203203
 @ <td>%h(zInfo)
204204
 @ <td data-sortkey='%09llx(sorttime)'>%h(zDate?zDate:"")
205205
 @ <td>%h(zExp?zExp:"")
206206
 @ <td data-sortkey='%f(rATime)' style='white-space:nowrap'>%s(zAge?zAge:"")
207
- if( db_column_type(&s,8)==SQLITE_NULL ){
207
+ if( db_column_type(&s,9)==SQLITE_NULL ){
208208
 @ <td>
209
- }else if( (zSub = db_column_text(&s,8))==0 || zSub[0]==0 ){
209
+ }else if( (zSub = db_column_text(&s,9))==0 || zSub[0]==0 ){
210210
 @ <td><a href="%R/alerts?sid=%d(sid)"><i>off</i></a>
211211
 }else{
212212
 const char *zEmail = db_column_text(&s, 11);
213213
 char * zAt = zEmail ? mprintf(" &rarr; %h", zEmail) : mprintf("");
214214
 @ <td><a href="%R/alerts?sid=%d(sid)">%h(zSub)</a> %z(zAt)
215215
--- src/setupuser.c
+++ src/setupuser.c
@@ -162,19 +162,19 @@
162 /* 5 */"lower(login) AS sortkey, "
163 /* 6 */"CASE WHEN info LIKE '%%expires 20%%'"
164 " THEN substr(info,instr(lower(info),'expires')+8,10)"
165 " END AS exp,"
166 /* 7 */"atime,"
167 /*8,9*/"%s,"
168 /* 10*/"user.mtime AS sorttime,"
169 /* 11*/"%s"
170 " FROM user LEFT JOIN lastAccess ON login=uname"
171 " LEFT JOIN subscriber ON login=suname"
172 " WHERE login NOT IN ('anonymous','nobody','developer','reader') %s"
173 " ORDER BY sorttime DESC",
174 bHaveAlerts ? "subscriber.ssub, subscriber.subscriberId" : "null, null",
175 bHaveAlerts ? "subscriber.semail" : "null",
 
176 zWith/*safe-for-%s*/
177 );
178 rNow = db_double(0.0, "SELECT julianday('now');");
179 while( db_step(&s)==SQLITE_ROW ){
180 int uid = db_column_int(&s, 0);
@@ -185,12 +185,12 @@
185 const char *zSortKey = db_column_text(&s,5);
186 const char *zExp = db_column_text(&s,6);
187 double rATime = db_column_double(&s,7);
188 char *zAge = 0;
189 const char *zSub;
190 int sid = db_column_int(&s,9);
191 sqlite3_int64 sorttime = db_column_int64(&s, 10);
192 if( rATime>0.0 ){
193 zAge = human_readable_age(rNow - rATime);
194 }
195 if( bUbg ){
196 @ <tr style='background-color: %h(user_color(zLogin));'>
@@ -202,13 +202,13 @@
202 @ <td>%h(zCap)
203 @ <td>%h(zInfo)
204 @ <td data-sortkey='%09llx(sorttime)'>%h(zDate?zDate:"")
205 @ <td>%h(zExp?zExp:"")
206 @ <td data-sortkey='%f(rATime)' style='white-space:nowrap'>%s(zAge?zAge:"")
207 if( db_column_type(&s,8)==SQLITE_NULL ){
208 @ <td>
209 }else if( (zSub = db_column_text(&s,8))==0 || zSub[0]==0 ){
210 @ <td><a href="%R/alerts?sid=%d(sid)"><i>off</i></a>
211 }else{
212 const char *zEmail = db_column_text(&s, 11);
213 char * zAt = zEmail ? mprintf(" &rarr; %h", zEmail) : mprintf("");
214 @ <td><a href="%R/alerts?sid=%d(sid)">%h(zSub)</a> %z(zAt)
215
--- src/setupuser.c
+++ src/setupuser.c
@@ -162,19 +162,19 @@
162 /* 5 */"lower(login) AS sortkey, "
163 /* 6 */"CASE WHEN info LIKE '%%expires 20%%'"
164 " THEN substr(info,instr(lower(info),'expires')+8,10)"
165 " END AS exp,"
166 /* 7 */"atime,"
167 /* 8 */"user.mtime AS sorttime,"
168 /*9-11*/"%s"
 
169 " FROM user LEFT JOIN lastAccess ON login=uname"
170 " LEFT JOIN subscriber ON login=suname"
171 " WHERE login NOT IN ('anonymous','nobody','developer','reader') %s"
172 " ORDER BY sorttime DESC",
173 bHaveAlerts
174 ? "subscriber.ssub, subscriber.subscriberId, subscriber.semail"
175 : "null, null, null",
176 zWith/*safe-for-%s*/
177 );
178 rNow = db_double(0.0, "SELECT julianday('now');");
179 while( db_step(&s)==SQLITE_ROW ){
180 int uid = db_column_int(&s, 0);
@@ -185,12 +185,12 @@
185 const char *zSortKey = db_column_text(&s,5);
186 const char *zExp = db_column_text(&s,6);
187 double rATime = db_column_double(&s,7);
188 char *zAge = 0;
189 const char *zSub;
190 int sid = db_column_int(&s,10);
191 sqlite3_int64 sorttime = db_column_int64(&s, 8);
192 if( rATime>0.0 ){
193 zAge = human_readable_age(rNow - rATime);
194 }
195 if( bUbg ){
196 @ <tr style='background-color: %h(user_color(zLogin));'>
@@ -202,13 +202,13 @@
202 @ <td>%h(zCap)
203 @ <td>%h(zInfo)
204 @ <td data-sortkey='%09llx(sorttime)'>%h(zDate?zDate:"")
205 @ <td>%h(zExp?zExp:"")
206 @ <td data-sortkey='%f(rATime)' style='white-space:nowrap'>%s(zAge?zAge:"")
207 if( db_column_type(&s,9)==SQLITE_NULL ){
208 @ <td>
209 }else if( (zSub = db_column_text(&s,9))==0 || zSub[0]==0 ){
210 @ <td><a href="%R/alerts?sid=%d(sid)"><i>off</i></a>
211 }else{
212 const char *zEmail = db_column_text(&s, 11);
213 char * zAt = zEmail ? mprintf(" &rarr; %h", zEmail) : mprintf("");
214 @ <td><a href="%R/alerts?sid=%d(sid)">%h(zSub)</a> %z(zAt)
215

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button