Diff
Not logged in

Differences From:

File src/diff.c part of check-in [840699ecd9] - Improvements to annotated diffs - now takes into account contributions from other branches. by drh on 2008-02-08 21:23:56. [view]

To:

File src/diff.c part of check-in [2b0d4519dc] - Work toward making the "h" permission mean "hyperlink". Without "h", many pages will display, but there are few hyperlinks. A message invites users to login as anonymous. by drh on 2008-05-05 20:18:32. [view]

@@ -710,10 +710,14 @@
     int pid = db_column_int(&q, 0);
     const char *zUuid = db_column_text(&q, 1);
     const char *zDate = db_column_text(&q, 2);
     const char *zUser = db_column_text(&q, 3);
-    zLabel = mprintf("<a href='%s/info/%s'>%.10s</a> %s %9.9s",
-                     g.zBaseURL, zUuid, zUuid, zDate, zUser);
+    if( g.okHistory ){
+      zLabel = mprintf("<a href='%s/info/%s'>%.10s</a> %s %9.9s",
+                       g.zBaseURL, zUuid, zUuid, zDate, zUser);
+    }else{
+      zLabel = mprintf("%.10s %s %9.9s", zUuid, zDate, zUser);
+    }
     content_get(pid, &step);
     annotation_step(p, &step, zLabel);
     blob_reset(&step);
   }
@@ -734,9 +738,9 @@
   int i;
   Annotator ann;
 
   login_check_credentials();
-  if( !g.okHistory ){ login_needed(); return; }
+  if( !g.okRead ){ login_needed(); return; }
   if( mid==0 || fnid==0 ){ cgi_redirect("index"); }
   if( !db_exists("SELECT 1 FROM mlink WHERE mid=%d AND fnid=%d",mid,fnid) ){
     cgi_redirect("index");
   }