SHA1 Hash:	ef432c201469375de3aa9eb3e81ef384f42cf65c
Date:	2009-08-16 21:22:49
User:	drh
Comment:	Cleanup of the "admin_sql" web page (formerly "admin/sql").
Timelines:	ancestors | descendants | both | trunk
Other Links:	files | ZIP archive | manifest

• branch=trunk inherited from [a28c83647d]
• sym-trunk inherited from [a28c83647d]

Modified src/admin.c from [bf62e8d4f5] to [0490103754].

@@ -41,40 +41,37 @@
   const char *zArg3,
   const char *zArg4
 ){
   int rc = SQLITE_DENY;
   switch( type ){
-    case SQLITE_READ:
+    case SQLITE_READ: {
+      if( strcmp(zArg2,"pw")==0 ){
+        rc = SQLITE_IGNORE;
+      }else{
+        rc = SQLITE_OK;
+      }
+      break;
+    }
+    case SQLITE_FUNCTION:
     case SQLITE_SELECT: {
       rc = SQLITE_OK;
       break;
     }
   }
   return rc;
 }
 
-
-void admin_prepare_submenu(){
-  if( g.okAdmin ){
-    style_submenu_element("Main", "Main admin page", "%s/admin", g.zTop );
-    style_submenu_element("SQL", "SQL page", "%s/admin/sql", g.zTop );
-    style_submenu_element("Setup", "Setup page", "%s/setup", g.zTop );
-  }
-}
-
-
 /*
-** WEBPAGE: /admin/sql
+** WEBPAGE: admin_sql
 */
 void admin_sql_page(void){
   const char *zSql = PD("sql","");
   login_check_credentials();
   if( !g.okAdmin ){
     login_needed();
     return;
   }
-  admin_prepare_submenu();
   style_header("Admin SQL");
   @ <h2>SQL:</h2>
   @ You can enter only SELECT statements here, and some SQL-side functions
   @ are also restricted.<br/>
   @ <form action='' method='post'>
@@ -87,33 +84,7 @@
     login_verify_csrf_secret();
     sqlite3_set_authorizer(g.db, selectOnly, 0);
     db_generic_query_view(zSql, 0);
     sqlite3_set_authorizer(g.db, 0, 0);
   }
-  style_footer();
-}
-
-/*
-** WEBPAGE: /admin
-*/
-void admin_page(void){
-  login_check_credentials();
-  if( !g.okAdmin ){
-    login_needed();
-    return;
-  }
-  if( g.zExtra && g.zExtra[0] ){
-    if(g.zExtra == strstr(g.zExtra,"sql")) admin_sql_page();
-    /* FIXME: ^^^ this ^^^ is an awful lot of work, especially once
-    ** the paths deepen. Figure out a way to simplify dispatching.
-    */
-    return;
-  }
-  admin_prepare_submenu();
-  style_header("Admin");
-  @ <h2>Links:</h2>
-  @ <ul>
-  @ <li><a href='%s(g.zBaseURL)/setup'>Fossil WWW Setup</a></li>
-  @ <li><a href='%s(g.zBaseURL)/admin/sql'>Run SQL queries</a></li>
-  @ </ul>
   style_footer();
 }