Reverted indexing, deleting and searching to pre-Lucene state (http:/…

…/www.wikidot.org/bug:2).

Added search:* pages to initial dump (http://www.wikidot.org/bug:16).
Updated Makefile and made generate_keys.sh executable (http://www.wikidot.org/bug:9).
Removed sidebar from account category on main site (http://www.wikidot.org/bug:10).

Makefile

@@ -1,5 +1,5 @@
 
-all: db config finish
+all: db keys config finish
 
 prepare_db:
 	bin/prepare_db.php | psql
@@ -9,6 +9,9 @@ db:
 	bin/generate_om.php
 	bin/bootstrap_pages.php files/dump/sites/*
 
+keys:
+	bin/generate_keys.sh
+
 config:
 	bin/configure.php
 

files/dump/db/4-main-site.sql

@@ -56,10 +56,10 @@ INSERT INTO category VALUES (5,
 
 INSERT INTO category VALUES (6,
     1, 'account',
-    true, 20,
+    false, 21,
     false, 'e:;c:;m:;d:;a:;r:;z:;o:',
     true, 1, NULL,
-    true, 'nav:top', 'nav:side',
+    false, 'nav:top', NULL,
     NULL, false, true, NULL, NULL, NULL, true, false, false, NULL
 );;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 

files/dump/sites/www/search.all.page

@@ -0,0 +1,3 @@
+Search All Sites
+
+[[module SearchAll]]

files/dump/sites/www/search.site.page

@@ -0,0 +1,3 @@
+Search
+
+[[module Search]]

php/actions/ManageSiteAction.php

@@ -818,12 +818,7 @@ public function savePrivateSettingsEvent($runData){
 			}
 		}
 
-		$db->commit();
-
-		// update the search index
-		$lucene = new Wikidot_Search_Lucene();
-		$lucene->queueReIndexSite($site->getSiteId());
-
+		$db->commit();	
 		if (GlobalProperties::$UI_SLEEP) { sleep(1); }
 	}
 
@@ -910,10 +905,6 @@ public function deleteSiteEvent($runData){
 			$site->setCustomDomain(null);
 		}
 		$db->commit();
-
-		// update the search index
-		$lucene = new Wikidot_Search_Lucene();
-		$lucene->queueReIndexSite($site->getSiteId());
 
 	}