_binary From 671976ce822e62976dbaaa12cd9de9bbb1edb621 Mon Sep 17 00:00:00 2001
From: MALLIKA <keertimaantenneti@keertimaan-tennetis-macbook.local>
Date: Tue, 14 May 2013 07:49:44 -0700
Subject: [PATCH 1/2] manage patch1

---
 configs/config.php                      |   97 ++++--
 controllers/admin_controller.php        |   65 +---
 css/search.css                          |   13 +
 locale/en-US/configure.ini              |  555 ++++++++++++++-----------------
 models/group_model.php                  |  183 ++++-------
 views/elements/managegroups_element.php |   72 +++--
 6 files changed, 461 insertions(+), 524 deletions(-)

diff --git a/configs/config.php b/configs/config.php
index a4aeb8f..d2ba0ac 100755
--- a/configs/config.php
+++ b/configs/config.php
@@ -79,9 +79,9 @@ if(MAINTENANCE_MODE && $_SERVER["SERVER_ADDR"] != $_SERVER["REMOTE_ADDR"]) {
 }
 
 if(!defined('WORK_DIRECTORY')) {
-/*+++ The next block of code is machine edited, change at 
+/*+++ The next block of code is machine edited, change at
 your own risk, please use configure web page instead +++*/
-define('WORK_DIRECTORY', '/Applications/XAMPP/xamppfiles/htdocs/ydata');
+define('WORK_DIRECTORY', '');
 /*++++++*/
 // end machine edited code
 }
@@ -115,13 +115,15 @@ if(file_exists(WORK_DIRECTORY.PROFILE_FILE_NAME)) {
     if(defined('QUEUE_SERVER') && !defined('NAME_SERVER')) {
         define('NAME_SERVER', QUEUE_SERVER); //for backward compatibility
     }
+    if(NAME_SERVER == 'http://' || NAME_SERVER == 'https://') {
+        define("FIX_NAME_SERVER", true);
+    }
 } else {
     if((!isset( $_SERVER['SERVER_NAME'])||$_SERVER['SERVER_NAME']!=='localhost')
         && !defined("NO_LOCAL_CHECK") && php_sapi_name() != 'cli' ) {
         echo "SERVICE AVAILABLE ONLY VIA LOCALHOST UNTIL CONFIGURED";
         exit();
     }
-    error_reporting(-1);
     /** @ignore */
     define('PROFILE', false);
     define('DBMS', 'sqlite3');
@@ -131,9 +133,9 @@ if(file_exists(WORK_DIRECTORY.PROFILE_FILE_NAME)) {
     define('RSS_ACCESS', true);
     define('API_ACCESS', true);
     define('DB_NAME', "default");
-    define('DB_USER', 'root');
+    define('DB_USER', '');
     define('DB_PASSWORD', '');
-    define('DB_HOST', 'localhost');
+    define('DB_HOST', '');
     /** @ignore */
     define('CRAWL_DIR', BASE_DIR);
     /** @ignore */
@@ -151,6 +153,7 @@ if(file_exists(WORK_DIRECTORY.PROFILE_FILE_NAME)) {
     define('IN_LINK', true);
     define('IP_LINK', true);
     define('SIGNIN_LINK', true);
+    define('NEWS_MODE', 'news_off');
     /** BM25F weight for title text */
     define ('TITLE_WEIGHT', 4);
     /** BM25F weight for other text within doc*/
@@ -243,6 +246,47 @@ define('MAXIMUM_CRAWL_DELAY', 64);
 /** maximum number of active crawl-delayed hosts */
 define('MAX_WAITING_HOSTS', 250);
 
+/** Minimum weight in priority queue before rebuilt */
+define('MIN_QUEUE_WEIGHT', 1/100000);
+
+/**  largest sized object allowed in a web archive (used to sanity check
+     reading data out of a web archive)
+*/
+define('MAX_ARCHIVE_OBJECT_SIZE', 100000000);
+
+/**
+ * Code to determine how much memory current machine has
+ */
+$memory = 4000000000; //assume have at least 4GB on a Mac (could use vm_stat)
+if(strstr(PHP_OS, "WIN")) {
+    exec('wmic memorychip get capacity', $memory_array);
+    $memory = array_sum($memory_array);
+} else if(stristr(PHP_OS, "LINUX")) {
+    $data = preg_split("/\s+/", file_get_contents("/proc/meminfo"));
+    $memory = 1024 * intval($data[1]);
+}
+
+/**
+ *  Factor to multiply sizes of Yioop data structures with in low ram memory
+ *  setting (2GB)
+ */
+define('MEMORY_LOW', 1);
+/**
+ *  Factor to multiply sizes of Yioop data structures with if have more than
+ * (2GB)
+ */
+define('MEMORY_STANDARD', 4);
+if($memory < 2000000000) {
+    /**
+     *  Based on system memory, either the low or high memory factor
+     */
+    define('MEMORY_PROFILE', MEMORY_LOW);
+} else {
+    /**
+     * @ignore
+     */
+    define('MEMORY_PROFILE', MEMORY_STANDARD);
+}
 
 /**
  * bloom filters are used to keep track of which urls are visited,
@@ -250,33 +294,28 @@ define('MAX_WAITING_HOSTS', 250);
  * urls will be stored in a single filter. Additional filters are
  * read to and from disk.
  */
-define('URL_FILTER_SIZE', 20000000);
+define('URL_FILTER_SIZE', MEMORY_PROFILE * 5000000);
 
 /**
  * maximum number of urls that will be held in ram
  * (as opposed to in files) in the priority queue
  */
-define('NUM_URLS_QUEUE_RAM', 300000);
-
-/** Minimum weight in priority queue before rebuilt*/
-define('MIN_QUEUE_WEIGHT', 1/100000);
-
-/**  largest sized object allowedin a web archive (used to sanity check
-     reading data out of a web archive)
-*/
-define('MAX_ARCHIVE_OBJECT_SIZE', 100000000);
+define('NUM_URLS_QUEUE_RAM', MEMORY_PROFILE * 80000);
 
 /** number of documents before next gen */
-define('NUM_DOCS_PER_GENERATION', 50000);
+define('NUM_DOCS_PER_GENERATION', MEMORY_PROFILE *10000);
 
 /** precision to round floating points document scores */
 define('PRECISION', 10);
 
-/** maximum number of links to consider on any given page */
+/** maximum number of links to extract from a page on an initial pass*/
+define('MAX_LINKS_TO_EXTRACT', MEMORY_PROFILE * 80);
+
+/** maximum number of links to keep after initial extraction*/
 define('MAX_LINKS_PER_PAGE', 50);
 
 /** maximum number of links to consider from a sitemap page */
-define('MAX_LINKS_PER_SITEMAP', 200);
+define('MAX_LINKS_PER_SITEMAP', MEMORY_PROFILE * 80);
 
 /**  maximum number of words from links to consider on any given page */
 define('MAX_LINKS_WORD_TEXT', 100);
@@ -311,14 +350,6 @@ define('NUM_MULTI_CURL_PAGES', 100);
 /** number of pages to extract from an archive in one go */
 define('ARCHIVE_BATCH_SIZE', 100);
 
-/**
- *  Time in seconds to wait to acquire an exclusive lock before we're no longer
- *  allowed to extract the next batch of pages for an archive crawl. This is
- *  intended to prevent a fetcher from waiting to acquire the lock, then
- *  getting it just before cURL gives up and times out the request.
- */
-define('ARCHIVE_LOCK_TIMEOUT', 8);
-
 /** time in seconds before we give up on multi page requests*/
 define('PAGE_TIMEOUT', 30);
 
@@ -344,13 +375,16 @@ define('NORMALIZE_FREQUENCY', 10000);
  */
 $INDEXED_FILE_TYPES =
     array(
+            "unknown",
             "asp",
             "aspx",
+            "atom",
             "bmp",
             "cgi",
             "cfm",
             "cfml",
             "csv",
+            "do",
             "doc",
             "epub",
             "gif",
@@ -394,7 +428,7 @@ $PAGE_PROCESSORS = array(   "text/html" => "HtmlProcessor",
                             "application/xhtml+xml" => "HtmlProcessor",
 
                             "application/rss+xml" => "RssProcessor",
-
+                            "application/atom+xml" => "RssProcessor",
                             "application/pdf" => "PdfProcessor",
 
                             "application/msword" => "DocProcessor",
@@ -408,6 +442,7 @@ $PAGE_PROCESSORS = array(   "text/html" => "HtmlProcessor",
                             "text/rtf" => "RtfProcessor",
                             "text/plain" => "TextProcessor",
                             "text/csv" => "TextProcessor",
+                            "text/x-java-source" => "TextProcessor",
                             "text/tab-separated-values" => "TextProcessor",
                             "image/jpeg" => "JpgProcessor",
                             "image/gif" => "GifProcessor",
@@ -449,7 +484,9 @@ define ('EN_RATIO', 0.9);
 /** Number of total description deemed title */
 define ('AD_HOC_TITLE_LENGTH', 10);
 
-/** Used to say number of bytes in histogram bar for file download sizes*/
+/** Used to say number of bytes in histogram bar (stats page) for file 
+    download sizes
+ */
 define('DOWNLOAD_SIZE_INTERVAL', 5000);
 
 /** Used to say number of secs in histogram bar for file download times*/
@@ -459,10 +496,10 @@ define('DOWNLOAD_TIME_INTERVAL', 0.5);
  * How many non robot urls the fetcher successfully downloads before
  * between times data sent back to queue server
  */
-define ('SEEN_URLS_BEFORE_UPDATE_SCHEDULER', 500);
+define ('SEEN_URLS_BEFORE_UPDATE_SCHEDULER', MEMORY_PROFILE * 95);
 
 /** maximum number of urls to schedule to a given fetcher in one go */
-define ('MAX_FETCH_SIZE', 5000);
+define ('MAX_FETCH_SIZE', MEMORY_PROFILE * 1000);
 
 /** fetcher must wait at least this long between multi-curl requests */
 define ('MINIMUM_FETCH_LOOP_TIME', 5);
diff --git a/controllers/admin_controller.php b/controllers/admin_controller.php
index fd55685..01f60af 100755
--- a/controllers/admin_controller.php
+++ b/controllers/admin_controller.php
@@ -733,7 +733,6 @@ class AdminController extends Controller implements CrawlConstants
         }
         return $data;
     }
-    
     /**
      * Used to handle the manage group activity.
      *
@@ -748,7 +747,7 @@ class AdminController extends Controller implements CrawlConstants
     {
         $possible_arguments = array("addgroup", "deletegroup", 
         "viewgroups", "selectgroup", "adduser", "deleteuser", 
-        "addrole", "deleterole");
+        "addrole", "deleterole", "updategroup");
             
         $data["ELEMENT"] = "managegroupsElement";
          $data['SCRIPT'] =
@@ -758,8 +757,6 @@ class AdminController extends Controller implements CrawlConstants
         if(isset($_REQUEST['groupname'])) {
             $groupname = $this->clean($_REQUEST['groupname'], "string" );
         }
-        
-        // VIEW GROUP LIST - START
         if($_SESSION['USER_ID'] == '1'){
         	$groups = $this->groupModel->getGroupList();
         }else {
@@ -776,8 +773,6 @@ class AdminController extends Controller implements CrawlConstants
             $data['GROUP_NAMES'][$group['GROUP_ID']]= $group['GROUP_NAME'];
             $group_ids[] = $group['GROUP_ID'];
         }
-        
-		// DELETE GROUP LIST - START
         if($_SESSION['USER_ID'] == '1'){
         	$groups = $this->groupModel->getGroupList();
         }else {
@@ -790,32 +785,25 @@ class AdminController extends Controller implements CrawlConstants
         if(isset($_REQUEST['groupname'])) {
             $groupname = $this->clean($_REQUEST['groupname'], "string" );
         }
-         foreach($groups as $viewgroup) {
-            $data['DELETE_GROUP_NAMES'][$viewgroup['GROUP_ID']]= $viewgroup['GROUP_NAME'];
-            $group_ids[] = $viewgroup['GROUP_ID'];
+         foreach($groups as $deletegroup) {
+            $data['DELETE_GROUP_NAMES'][$deletegroup['GROUP_ID']]= $deletegroup['GROUP_NAME'];
+            $group_ids[] = $deletegroup['GROUP_ID'];
         }
-        
         $data['SELECT_GROUP'] = -1;
         $data['SELECT_USER'] = -1;
-        
         if(isset($_REQUEST['selectgroup'])) {
             $select_group = $this->clean($_REQUEST['selectgroup'], "string" );
         } else {
             $select_group = "";
         }
-        
         if(isset($_REQUEST['arg']) &&
         	 	!($_REQUEST['arg'] == 'deletegroup'
         	 	|| $_REQUEST['arg'] == 'addgroup')){
             $data['SELECT_GROUP'] = $select_group;
-           
             $grouproles = $this->groupModel->getGroupRoles($select_group);
             $data['GROUP_ROLES']= $grouproles;
-            
             $rolenames = $this->roleModel->getRoleList();
-            
         	$base_option = tl('admin_controller_select_rolename');
-        	
         	if(isset($_REQUEST['arg']) &&
         	 	!($_REQUEST['arg'] == 'deletegroup'
         	 	|| $_REQUEST['arg'] == 'addgroup')){
@@ -827,16 +815,13 @@ class AdminController extends Controller implements CrawlConstants
                 	$role_ids[] = $rolename['ROLE_ID'];
            	 	}
         	}
-           
             if(isset($_REQUEST['selectrole'])) {
                 $select_role = $this->clean($_REQUEST['selectrole'], "string" );
             } else {
                 $select_role = "";
             }
-            
             $usergroups = $this->groupModel->getGroupUsers($select_group);
             $data['GROUP_USERS'] =$usergroups;
-            
             if($select_group != "-1"){
             	$usernames = $this->userModel->getUserList();
             	$base_option = tl('admin_controller_select_username');
@@ -849,7 +834,6 @@ class AdminController extends Controller implements CrawlConstants
                     	$select_username = $user['USER_NAME'];
                 	}
             	}
-            
             	foreach($usernames as $username){
               		$data['USER_NAMES'] [$username['USER_ID']] = $username['USER_NAME']; 
              		$user_ids[] = $username['USER_ID'];
@@ -860,11 +844,9 @@ class AdminController extends Controller implements CrawlConstants
             } else {
                 $select_user = "";
             }
-        
         if(isset($_REQUEST['selectactivity'])) {
                 $select_activity =
                     $this->clean($_REQUEST['selectactivity'], "int" );
-
             } else {
                 $select_activity = "";
             }
@@ -874,13 +856,11 @@ class AdminController extends Controller implements CrawlConstants
                 $data['SELECT_ACTIVITY'] = -1;
             }
             }
-        
         if(isset($_REQUEST['arg']) &&
             in_array($_REQUEST['arg'], $possible_arguments)) {
             switch($_REQUEST['arg'])
             {
                 case "addgroup":
-                
                     $data['SELECT_GROUP'] = -1;
                     if($this->groupModel->getGroupId($groupname) > 0) {
                         $data['SCRIPT'] .= "doMessage('<h1 class=\"red\" >".
@@ -891,61 +871,50 @@ class AdminController extends Controller implements CrawlConstants
                     $this->groupModel->addGroup($groupname, $_SESSION['USER_ID']);
                     $groupid = $this->groupModel->getGroupId($groupname);
                     $data['GROUP_NAMES'][$groupid] = $groupname;
-
+                    $data['DELETE_GROUP_NAMES'][$groupid] = $groupname;
                     $data['SCRIPT'] .= "doMessage('<h1 class=\"red\" >".
                         tl('admin_controller_groupname_added').
                         "</h1>')";
                 break;
-                
                  case "deletegroup":
-                 
                     if($select_group == -1){
                     	$data['SCRIPT'] .= "doMessage('<h1 class=\"red\" >".
                         tl('admin_controller_groupname_doesnt_exists')."</h1>')"; 
                     }else{
                      $this->groupModel->deleteGroup($select_group);
                     unset($data['GROUP_NAMES'][$select_group]);
+                    unset($data['DELETE_GROUP_NAMES'][$select_group]);
                     $data['SCRIPT'] .= "doMessage('<h1 class=\"red\" >".
                         tl('admin_controller_groupname_deleted')."</h1>')";  
                     }   
                 break;
-                
                 case "adduser":  
-                
                     if(!in_array($select_user, $user_ids)) {
-                
                         $data['SCRIPT'] .= "doMessage('<h1 class=\"red\" >".
                             tl('admin_controller_username_doesnt_exists').
                             "</h1>')";
                         return $data;
                     }
                     $this->groupModel->addUserGroup($select_group, $select_user);
-                  
                     unset($data['AVAILABLE_USERS'][$select_user]);
                       $data['GROUP_USERS'] =
                         $this->groupModel->getGroupUsers($select_group);
-                    
                     $data['SCRIPT'] .= "doMessage('<h1 class=\"red\" >".
                         tl('admin_controller_user_added')."</h1>')";
                 break;
-                
                 case "deleteuser":
-          
-                    $this->groupModel->deleteUserGroup(
-                        $select_group, $select_user);
+                    $this->groupModel->deleteUserGroup($select_group, $select_user);
                     $data['GROUP_USERS'] =
                         $this->groupModel->getGroupUsers($select_group);
                     $data['AVAILABLE_USERS'][$select_user] =
                         $user_names[$select_user];
                     $data['SELECT_USER'] = -1;
-                   
+                   unset($data['GROUP_NAMES'][$select_group]);
+                   unset($data['GROUP_USERS']);
                     $data['SCRIPT'] .= "doMessage('<h1 class=\"red\" >".
-                        tl('admin_controller_user_deleted')."</h1>')";
-                        
+                        tl('admin_controller_user_deleted')."</h1>')";    
                 break;
-                
                 case "addrole":
-                    
                     if(!in_array($select_group, $group_ids)) {
                         $data['SCRIPT'] .= "doMessage('<h1 class=\"red\" >".
                             tl('admin_controller_groupname_doesnt_exists').
@@ -963,21 +932,16 @@ class AdminController extends Controller implements CrawlConstants
                     unset($data['AVAILABLE_ROLES'][$select_role]);
                     $data['GROUP_ROLES'] =
                         $this->groupModel->getGroupRoles($select_group);
-                    
                     $data['SCRIPT'] .= "doMessage('<h1 class=\"red\" >".
-                        tl('admin_controller_rolename_added')."</h1>')";
-                        
+                        tl('admin_controller_rolename_added')."</h1>')"; 
                 break;
-                
                 case "deleterole":
-               
                     if(!in_array($select_group, $group_ids)) {
                         $data['SCRIPT'] .= "doMessage('<h1 class=\"red\" >".
                             tl('admin_controller_groupname_doesnt_exists').
                             "</h1>')";
                         return $data;
                     }
-
                     if(!in_array($select_role, $role_ids)) {
                         $data['SCRIPT'] .= "doMessage('<h1 class=\"red\" >".
                             tl('admin_controller_rolename_doesnt_exists').
@@ -994,13 +958,16 @@ class AdminController extends Controller implements CrawlConstants
                     $data['SCRIPT'] .= "doMessage('<h1 class=\"red\" >".
                         tl('admin_controller_role_deleted')."</h1>')";
                 break;
+                case "updategroup":
+                	$this->groupModel->updateUserGroup(
+                        $select_user, $select_group);
+                
+                
                 
           }      
     }
         return $data;
     }
-    
-
     /**
      * Used to handle the manage crawl activity.
      *
diff --git a/css/search.css b/css/search.css
index 82f34f9..61f16be 100755
--- a/css/search.css
+++ b/css/search.css
@@ -1817,3 +1817,16 @@ ul.in-list li
     height:0.25in;
     width: 0.25in;
 }
+
+.divOverlay 
+{
+	z-index: 10000; 
+    filter: alpha(opacity=50); 
+    filter:progid:DXImageTransform.Microsoft.Alpha(opacity=50);  
+    -moz-opacity: .50; 
+    -khtml-opacity: 0.5;     
+    opacity: 0.7;     
+    background-color:#000000;  
+    position: fixed; align=middle;top:0px; left:0px; width:100%; height:100%; color:#FFFFFF; 
+    text-align:center; vertical-align:middle;visibility:hidden;
+}
diff --git a/locale/en-US/configure.ini b/locale/en-US/configure.ini
index 027791f..fdd3e7c 100755
--- a/locale/en-US/configure.ini
+++ b/locale/en-US/configure.ini
@@ -28,493 +28,475 @@
 ;
 ; /Applications/XAMPP/xamppfiles/htdocs/git/yioop//controllers
 ;
-; admin_controller.php line: 137
+; admin_controller.php line: 138
 admin_controller_login_successful = "Login Successful!!"
 ;
-; admin_controller.php line: 142
+; admin_controller.php line: 143
 admin_controller_login_failed = "Username or Password Incorrect!"
 ;
-; admin_controller.php line: 147
+; admin_controller.php line: 148
 admin_controller_login_to_config = "Login to continue configuration (default: u=root, p=)"
 ;
-; admin_controller.php line: 151
+; admin_controller.php line: 152
 admin_controller_status_updates_stopped = "Status updates have stopped."
 ;
-; admin_controller.php line: 348
+; admin_controller.php line: 333
+admin_controller_news_off = "Updates Off"
+;
+; admin_controller.php line: 334
+admin_controller_news_update_web = "Web Update"
+;
+; admin_controller.php line: 335
+admin_controller_news_process = "News Process"
+;
+; admin_controller.php line: 362
 admin_controller_passwords_dont_match = "Typed passwords do not match."
 ;
-; admin_controller.php line: 360
+; admin_controller.php line: 374
 admin_controller_invalid_old_password = "Current password incorrect."
 ;
-; admin_controller.php line: 367
+; admin_controller.php line: 381
 admin_controller_change_password = "Password change successful!!"
 ;
-; admin_controller.php line: 400
+; admin_controller.php line: 414
 admin_controller_select_username = "Select Name"
 ;
-; admin_controller.php line: 437
+; admin_controller.php line: 451
 admin_controller_select_rolename = "Select Role"
 ;
-; admin_controller.php line: 437
-admin_controller_select_groupname = "Select Group"
-
-; admin_controller.php line: 463
+; admin_controller.php line: 477
 admin_controller_passwords_dont_match = "Typed passwords do not match."
 ;
-; admin_controller.php line: 470
+; admin_controller.php line: 484
 admin_controller_username_exists = "Cannot Create User As Username Exists"
 ;
-; admin_controller.php line: 477
+; admin_controller.php line: 491
 admin_controller_username_added = "User Created"
 ;
-; admin_controller.php line: 486
+; admin_controller.php line: 500
 admin_controller_username_doesnt_exists = "Username Does Not Exist"
 ;
-; admin_controller.php line: 493
+; admin_controller.php line: 507
 admin_controller_username_deleted = "User Deleted"
 ;
-; admin_controller.php line: 500
+; admin_controller.php line: 514
 admin_controller_username_doesnt_exists = "Username Does Not Exist"
 ;
-; admin_controller.php line: 506
+; admin_controller.php line: 520
 admin_controller_rolename_doesnt_exists = "Role Name Does not Exist"
 ;
-; admin_controller.php line: 512
+; admin_controller.php line: 526
 admin_controller_rolename_added = "Role Name Added"
 ;
-; admin_controller.php line: 523
+; admin_controller.php line: 537
 admin_controller_username_doesnt_exists = "Username Does Not Exist"
 ;
-; admin_controller.php line: 529
+; admin_controller.php line: 543
 admin_controller_rolename_doesnt_exists = "Role Name Does not Exist"
 ;
-; admin_controller.php line: 539
+; admin_controller.php line: 553
 admin_controller_rolename_deleted = "Role Name Deleted"
 ;
-; admin_controller.php line: 539
-admin_controller_groupname_deleted = "Group Name Deleted"
-;
-; admin_controller.php line: 569
+; admin_controller.php line: 583
 admin_controller_select_rolename = "Select Role"
 ;
-; admin_controller.php line: 604
+; admin_controller.php line: 618
 admin_controller_select_activityname = "Select Activity"
 ;
-; admin_controller.php line: 604
-admin_controller_select_rolename = "Select Role"
-;
-; admin_controller.php line: 637
+; admin_controller.php line: 651
 admin_controller_rolename_exists = "Role Name Exists"
 ;
-; admin_controller.php line: 637
-admin_controller_groupname_exists = "Group Name Exists"
-;
-; admin_controller.php line: 647
+; admin_controller.php line: 661
 admin_controller_rolename_added = "Role Name Added"
 ;
-; admin_controller.php line: 647
-admin_controller_groupname_added = "Group Name Added"
-;
-; admin_controller.php line: 658
+; admin_controller.php line: 672
 admin_controller_rolename_doesnt_exists = "Role Name Does not Exist"
 ;
-; admin_controller.php line: 658
-admin_controller_groupname_doesnt_exists = "Group Name Does not Exist"
-;
-; admin_controller.php line: 658
-admin_controller_username_doesnt_exists = "Username Does not exists"
-;
-; admin_controller.php line: 666
+; admin_controller.php line: 680
 admin_controller_rolename_deleted = "Role Name Deleted"
 ;
-; manageroles_element.php line: 76
-managegroups_element_delete_role = "Delete Group"
-;
-; admin_controller.php line: 672
+; admin_controller.php line: 686
 admin_controller_rolename_doesnt_exists = "Role Name Does not Exist"
 ;
-; admin_controller.php line: 678
+; admin_controller.php line: 692
 admin_controller_activityname_doesnt_exists = "Activity Name Does not Exist"
 ;
-; admin_controller.php line: 688
+; admin_controller.php line: 702
 admin_controller_activity_added = "Activity Added"
 ;
-; admin_controller.php line: 694
+; admin_controller.php line: 708
 admin_controller_rolename_doesnt_exists = "Role Name Does not Exist"
 ;
-; admin_controller.php line: 701
+; admin_controller.php line: 715
 admin_controller_activityname_doesnt_exists = "Activity Name Does not Exist"
 ;
-; admin_controller.php line: 713
+; admin_controller.php line: 727
 admin_controller_activity_deleted = "Activity Deleted"
 ;
-; admin_controller.php line: 713
-admin_controller_role_deleted = "Role Deleted"
-;
-; admin_controller.php line: 713
-admin_controller_user_added = "User Added"
-;
-; admin_controller.php line: 713
-admin_controller_user_deleted = "User Deleted"
-;
-; admin_controller.php line: 759
+; admin_controller.php line: 773
 admin_controller_stop_crawl = "Stopping crawl. . .This will take a moment to refresh."
 ;
-; admin_controller.php line: 773
+; admin_controller.php line: 787
 admin_controller_resume_crawl = "Resuming crawl. . .This will take a moment to refresh."
 ;
-; admin_controller.php line: 803
+; admin_controller.php line: 817
 admin_controller_delete_crawl_success = "Deleting Crawl. . .This will take a moment to refresh."
 ;
-; admin_controller.php line: 808
+; admin_controller.php line: 822
 admin_controller_delete_crawl_fail = "Delete Crawl Failed!!"
 ;
-; admin_controller.php line: 815
+; admin_controller.php line: 829
 admin_controller_set_index = "Setting Crawl To Use as Index"
 ;
-; admin_controller.php line: 840
+; admin_controller.php line: 854
 admin_controller_starting_new_crawl = "Starting New Crawl!"
 ;
-; admin_controller.php line: 850
+; admin_controller.php line: 864
 admin_controller_no_description = "No Description for Crawl"
 ;
-; admin_controller.php line: 958
+; admin_controller.php line: 973
 admin_controller_use_below = "Use options below"
 ;
-; admin_controller.php line: 959
+; admin_controller.php line: 974
 admin_controller_use_defaults = "Use Yioop! defaults"
 ;
-; admin_controller.php line: 961
+; admin_controller.php line: 976
 admin_controller_use_below = "Use options below"
 ;
-; admin_controller.php line: 965
+; admin_controller.php line: 980
 admin_controller_previous_crawl = "Previous Crawl:"
 ;
-; admin_controller.php line: 1049
+; admin_controller.php line: 1067
 admin_controller_breadth_first = "Breadth First"
 ;
-; admin_controller.php line: 1051
+; admin_controller.php line: 1069
 admin_controller_page_importance = "Page Importance"
 ;
-; admin_controller.php line: 1117
+; admin_controller.php line: 1135
 admin_controller_urls_injected = "Urls Injected!"
 ;
-; admin_controller.php line: 1128
+; admin_controller.php line: 1146
 admin_controller_update_seed_info = "Updating Seed Site Info!"
 ;
-; admin_controller.php line: 1222
+; admin_controller.php line: 1238
 admin_controller_select_crawl = "Select Crawl"
 ;
-; admin_controller.php line: 1223
+; admin_controller.php line: 1239
 admin_controller_default_crawl = "Default Crawl"
 ;
-; admin_controller.php line: 1225
+; admin_controller.php line: 1241
 admin_controller_select_crawl = "Select Crawl"
 ;
-; admin_controller.php line: 1227
+; admin_controller.php line: 1243
 admin_controller_default_crawl = "Default Crawl"
 ;
-; admin_controller.php line: 1254
+; admin_controller.php line: 1270
 admin_controller_unnamed = "Unnamed Crawl"
 ;
-; admin_controller.php line: 1259
+; admin_controller.php line: 1275
 admin_controller_mix_created = "Crawl Mix Created!"
 ;
-; admin_controller.php line: 1268
+; admin_controller.php line: 1284
 admin_controller_set_index = "Setting Crawl To Use as Index"
 ;
-; admin_controller.php line: 1278
+; admin_controller.php line: 1294
 admin_controller_mix_doesnt_exists = "Mix to Delete Does not Exist!"
 ;
-; admin_controller.php line: 1286
+; admin_controller.php line: 1302
 admin_controller_mix_deleted = "Crawl Mix Deleted!"
 ;
-; admin_controller.php line: 1322
+; admin_controller.php line: 1338
 editmix_element_add_crawls = "Add Crawls"
 ;
-; admin_controller.php line: 1324
+; admin_controller.php line: 1340
 editmix_element_num_results = "Number of Results"
 ;
-; admin_controller.php line: 1325
+; admin_controller.php line: 1341
 editmix_element_del_grp = "Delete Group"
 ;
-; admin_controller.php line: 1326
+; admin_controller.php line: 1342
 editmix_element_weight = "Weight"
 ;
-; admin_controller.php line: 1327
+; admin_controller.php line: 1343
 editmix_element_name = "Name"
 ;
-; admin_controller.php line: 1328
+; admin_controller.php line: 1344
 editmix_add_keywords = "Keywords"
 ;
-; admin_controller.php line: 1329
+; admin_controller.php line: 1345
 editmix_element_actions = "Actions"
 ;
-; admin_controller.php line: 1330
+; admin_controller.php line: 1346
 editmix_add_query = "Add Query"
 ;
-; admin_controller.php line: 1331
+; admin_controller.php line: 1347
 editmix_element_delete = "Delete"
 ;
-; admin_controller.php line: 1383
+; admin_controller.php line: 1399
 admin_controller_mix_saved = "Crawl Mix Changes Saved!"
 ;
-; admin_controller.php line: 1437
+; admin_controller.php line: 1453
 admin_controller_use_below = "Use options below"
 ;
-; admin_controller.php line: 1438
+; admin_controller.php line: 1454
 admin_controller_use_defaults = "Use Yioop! defaults"
 ;
-; admin_controller.php line: 1440
+; admin_controller.php line: 1456
 admin_controller_use_below = "Use options below"
 ;
-; admin_controller.php line: 1444
+; admin_controller.php line: 1460
 admin_controller_previous_crawl = "Previous Crawl:"
 ;
-; admin_controller.php line: 1449
+; admin_controller.php line: 1465
 admin_controller_recrawl_never = "Never"
 ;
-; admin_controller.php line: 1450
+; admin_controller.php line: 1466
 admin_controller_recrawl_1day = "1 days"
 ;
-; admin_controller.php line: 1451
+; admin_controller.php line: 1467
 admin_controller_recrawl_2day = "2 days"
 ;
-; admin_controller.php line: 1452
+; admin_controller.php line: 1468
 admin_controller_recrawl_3day = "3 days"
 ;
-; admin_controller.php line: 1453
+; admin_controller.php line: 1469
 admin_controller_recrawl_7day = "7 days"
 ;
-; admin_controller.php line: 1454
+; admin_controller.php line: 1470
 admin_controller_recrawl_14day = "14 days"
 ;
-; admin_controller.php line: 1642
+; admin_controller.php line: 1657
 admin_controller_page_options_updated = "Page Options Updated!"
 ;
-; admin_controller.php line: 1667
+; admin_controller.php line: 1683
 admin_controller_page_options_running_tests = "Running Tests!"
 ;
-; admin_controller.php line: 1784
+; admin_controller.php line: 1800
 admin_controller_results_editor_update = "Filter Pages Updated!"
 ;
-; admin_controller.php line: 1798
+; admin_controller.php line: 1814
 admin_controller_edited_pages = "Select a Previously Edited URL"
 ;
-; admin_controller.php line: 1811
+; admin_controller.php line: 1827
 admin_controller_results_editor_need_url = "Result Page Update needs to Specify the URL!"
 ;
-; admin_controller.php line: 1817
+; admin_controller.php line: 1833
 admin_controller_results_editor_page_updated = "Result Page Updated!"
 ;
-; admin_controller.php line: 1830
+; admin_controller.php line: 1846
 admin_controller_results_editor_page_loaded = "Page Loaded!"
 ;
-; admin_controller.php line: 1876
+; admin_controller.php line: 1891
 admin_controller_select_machine = "Select Machine"
 ;
-; admin_controller.php line: 1948
+; admin_controller.php line: 1962
 admin_controller_machine_added = "Machine Added!"
 ;
-; admin_controller.php line: 1955
+; admin_controller.php line: 1969
 admin_controller_machine_exists = "Machine Name Already Exists; Please Delete First!"
 ;
-; admin_controller.php line: 1959
+; admin_controller.php line: 1973
 admin_controller_machine_incomplete = "Missing Fields From Machine Form!"
 ;
-; admin_controller.php line: 1968
+; admin_controller.php line: 1982
 admin_controller_machine_doesnt_exists = "Machine Name does not Exists!"
 ;
-; admin_controller.php line: 1985
+; admin_controller.php line: 1999
 admin_controller_stop_service_first = "Machine in use. Please stop the service running on it!"
 ;
-; admin_controller.php line: 1998
+; admin_controller.php line: 2012
 admin_controller_machine_deleted = "Machine Deleted!"
 ;
-; admin_controller.php line: 2057
+; admin_controller.php line: 2033
+admin_controller_news_process_running = "News Updater Seems To Be Running Already"
+;
+; admin_controller.php line: 2041
+admin_controller_news_mode_updated = "News Update Mode Changed!"
+;
+; admin_controller.php line: 2045
+admin_controller_news_update_failed = "News Update Mode Change Failed!"
+;
+; admin_controller.php line: 2108
 admin_controller_no_machine_log = "No Log File Found."
 ;
-; admin_controller.php line: 2086
+; admin_controller.php line: 2137
 admin_controller_machine_servers_updated = "Machine&#039;s Servers Updated!"
 ;
-; admin_controller.php line: 2090
+; admin_controller.php line: 2141
 admin_controller_machine_no_action = "Unable to Perform Action!"
 ;
-; admin_controller.php line: 2123
+; admin_controller.php line: 2174
 admin_controller_select_localename = "Select Locale"
 ;
-; admin_controller.php line: 2167
+; admin_controller.php line: 2218
 admin_controller_locale_added = "Locale Added!"
 ;
-; admin_controller.php line: 2174
+; admin_controller.php line: 2225
 admin_controller_localename_doesnt_exists = "Locale Does Not Exist!"
 ;
-; admin_controller.php line: 2183
+; admin_controller.php line: 2234
 admin_controller_localename_deleted = "Locale Deleted"
 ;
-; admin_controller.php line: 2192
+; admin_controller.php line: 2243
 admin_controller_select_staticpages = "Select a page"
 ;
-; admin_controller.php line: 2211
+; admin_controller.php line: 2262
 admin_controller_staticpage_updated = "Static Page Updated!"
 ;
-; admin_controller.php line: 2238
+; admin_controller.php line: 2289
 admin_controller_localestrings_updated = "Locale Strings Updated!"
 ;
-; admin_controller.php line: 2295
+; admin_controller.php line: 2346
 admin_controller_php_version = "PHP Version 5.3 or Newer"
 ;
-; admin_controller.php line: 2303
+; admin_controller.php line: 2354
 admin_controller_no_write_config_php = "configs/config.php not web server writable."
 ;
-; admin_controller.php line: 2308
+; admin_controller.php line: 2359
 admin_controller_no_write_work_dir = "Work directory needs to be writable by web server. "
 ;
-; admin_controller.php line: 2313
+; admin_controller.php line: 2364
 admin_controller_post_size_small = "php.ini file variable post_max_size should be at least 2M"
 ;
-; admin_controller.php line: 2319
+; admin_controller.php line: 2370
 admin_controller_missing_required = "The following required items were missing: %s"
 ;
-; admin_controller.php line: 2342
+; admin_controller.php line: 2393
 admin_controller_missing_optional = "The following optional items were missing: %s"
 ;
-; admin_controller.php line: 2347
+; admin_controller.php line: 2398
 admin_controller_check_passed = "Check Passed."
 ;
-; admin_controller.php line: 2352
+; admin_controller.php line: 2403
 admin_controller_using_local_config = "Using configs/local_config.php so changing work directory above may not work."
 ;
-; admin_controller.php line: 2377
+; admin_controller.php line: 2428
 admin_controller_media_kind = "Media Kind"
 ;
-; admin_controller.php line: 2378
+; admin_controller.php line: 2429
 admin_controller_video = "Video"
 ;
-; admin_controller.php line: 2379
-admin_controller_rss_feed = "RSS"
+; admin_controller.php line: 2430
+admin_controller_rss_feed = "News Feed"
 ;
-; admin_controller.php line: 2393
+; admin_controller.php line: 2444
 admin_controller_sources_indexes = "Index/Mix to Use"
 ;
-; admin_controller.php line: 2446
+; admin_controller.php line: 2497
 admin_controller_media_source_added = "Media Source Added!"
 ;
-; admin_controller.php line: 2454
+; admin_controller.php line: 2505
 admin_controller_media_source_deleted = "Media Source Deleted!"
 ;
-; admin_controller.php line: 2470
+; admin_controller.php line: 2521
 admin_controller_subsearch_added = "Subsearch Added!"
 ;
-; admin_controller.php line: 2478
+; admin_controller.php line: 2529
 admin_controller_subsearch_deleted = "Subsearch Deleted!"
 ;
-; admin_controller.php line: 2547
+; admin_controller.php line: 2604
 admin_controller_configure_use_absolute_path = "Must use an Absolute path for Work Directory"
 ;
-; admin_controller.php line: 2559
+; admin_controller.php line: 2616
 admin_controller_configure_diff_base_dir = "Work Directory cannot be contained in Yioop folder!"
 ;
-; admin_controller.php line: 2592
+; admin_controller.php line: 2649
 admin_controller_configure_work_dir_set = "Work Directory Set! You may need to re-login!"
 ;
-; admin_controller.php line: 2606
+; admin_controller.php line: 2663
 admin_controller_name_your_bot = "Please Name Your robot"
 ;
-; admin_controller.php line: 2627
+; admin_controller.php line: 2686
 admin_controller_configure_work_profile_made = "Working Directory and Profile Created!"
 ;
-; admin_controller.php line: 2636
+; admin_controller.php line: 2699
 admin_controller_configure_no_set_config = "Unable to Update config.php File!"
 ;
-; admin_controller.php line: 2648
+; admin_controller.php line: 2711
 admin_controller_configure_no_create_profile = "Unable to Create Profile!"
 ;
-; admin_controller.php line: 2659
+; admin_controller.php line: 2722
 admin_controller_configure_work_dir_invalid = "Work Directory is Invalid! Cannot Create Profile!"
 ;
-; admin_controller.php line: 2671
+; admin_controller.php line: 2734
 admin_controller_configure_work_dir_invalid = "Work Directory is Invalid! Cannot Create Profile!"
 ;
-; admin_controller.php line: 2719
+; admin_controller.php line: 2782
 admin_controller_configure_no_change_db = "Problem Updating Database!"
 ;
-; admin_controller.php line: 2734
+; admin_controller.php line: 2797
 admin_controller_configure_profile_change = "Profile Updated!"
 ;
-; admin_controller.php line: 2749
+; admin_controller.php line: 2812
 admin_controller_configure_no_change_profile = "There was a Problem Updating Profile!"
 ;
-; admin_controller.php line: 2787
+; admin_controller.php line: 2850
 admin_controller_describe_robot = "Please Describe Your Robot"
 ;
-; machine_controller.php line: 180
+; machine_controller.php line: 182
 machine_controller_nolines = "No Lines Match Filter!"
 ;
-; search_controller.php line: 306
+; search_controller.php line: 300
 search_controller_logout_successful = "Logout Successful!!"
 ;
-; search_controller.php line: 469
+; search_controller.php line: 492
 search_controller_mix_info = "Using Crawl Mix: %s"
 ;
-; search_controller.php line: 475
+; search_controller.php line: 498
 search_controller_crawl_info = "Index: %s -- Size: %s pages/%s urls"
 ;
-; search_controller.php line: 505
+; search_controller.php line: 528
 search_controller_search = "Search"
 ;
-; search_controller.php line: 604
+; search_controller.php line: 629
 search_controller_no_index_set = "No Search Index Set For Use!"
 ;
-; search_controller.php line: 607
+; search_controller.php line: 632
 search_controller_no_index_set = "No Search Index Set For Use!"
 ;
-; search_controller.php line: 858
-search_controller_news_update_fail = "News Feeds Update Failed!!"
-;
-; search_controller.php line: 1383
+; search_controller.php line: 1430
 search_controller_no_archive_page = "The website in question has requested this page not be archived."
 ;
-; search_controller.php line: 1426
+; search_controller.php line: 1478
 search_controller_original_page = "This image appeared on the page:"
 ;
-; search_controller.php line: 1444
+; search_controller.php line: 1496
 search_controller_extracted_title = "Extracted Title"
 ;
-; search_controller.php line: 1446
+; search_controller.php line: 1498
 search_controller_extracted_description = "Extracted Description"
 ;
-; search_controller.php line: 1448
+; search_controller.php line: 1500
 search_controller_extracted_links = "Extracted Links"
 ;
-; search_controller.php line: 1453
+; search_controller.php line: 1505
 search_controller_extracted_allow_paths = "Extracted Allowed To Crawl Paths"
 ;
-; search_controller.php line: 1459
+; search_controller.php line: 1511
 search_controller_extracted_disallow_paths = "Extracted Disallowed To Crawl Paths"
 ;
-; search_controller.php line: 1465
+; search_controller.php line: 1517
 search_controller_crawl_delay = "YioopBot Crawl Delay"
 ;
-; search_controller.php line: 1535
+; search_controller.php line: 1590
 search_controller_cache_comment = "Yioop Cache Page... This page has been modified to add a robots directive,  make links absolute, add extracted summaries, and to highlight query terms."
 ;
-; search_controller.php line: 1590
+; search_controller.php line: 1636
 search_controller_cached_version = "This cached version of %s was obtained by the Yioop crawler on %s."
 ;
-; search_controller.php line: 1602
+; search_controller.php line: 1751
 search_controller_header_summaries = "Toggle Extracted Headers and Summaries"
 ;
-; search_controller.php line: 1819
+; search_controller.php line: 1875
 search_controller_history = "Toggle History"
 ;
-; search_controller.php line: 1979
+; search_controller.php line: 2051
 search_controller_all_cached = "All Cached Versions - Change Year and/or Months to see Links"
 ;
-; search_controller.php line: 2010
+; search_controller.php line: 2082
 search_controller_year = "Year:"
 ;
-; search_controller.php line: 2011
+; search_controller.php line: 2083
 search_controller_month = "Month:"
 ;
 ; settings_controller.php line: 134
@@ -671,85 +653,85 @@ configure_element_component_check = "Component Check"
 ; configure_element.php line: 105
 configure_element_profile_settings = "Profile Settings"
 ;
-; configure_element.php line: 107
+; configure_element.php line: 108
 configure_element_toggle_advanced = "Toggle Advanced Settings"
 ;
-; configure_element.php line: 112
+; configure_element.php line: 114
 configure_element_default_language = "Default Language:"
 ;
-; configure_element.php line: 119
+; configure_element.php line: 121
 configure_element_debug_display = "Debug Display"
 ;
-; configure_element.php line: 124
+; configure_element.php line: 126
 configure_element_error_info = "Error Info"
 ;
-; configure_element.php line: 129
+; configure_element.php line: 131
 configure_element_query_info = "Query Info"
 ;
-; configure_element.php line: 134
+; configure_element.php line: 136
 configure_element_test_info = "Test Info"
 ;
-; configure_element.php line: 139
+; configure_element.php line: 141
 configure_element_site_access = "Search Access"
 ;
-; configure_element.php line: 144
+; configure_element.php line: 146
 configure_element_web_access = "Web"
 ;
-; configure_element.php line: 149
+; configure_element.php line: 151
 configure_element_rss_access = "RSS"
 ;
-; configure_element.php line: 154
+; configure_element.php line: 156
 configure_element_api_access = "API"
 ;
-; configure_element.php line: 159
+; configure_element.php line: 161
 configure_element_database_setup = "Database Set-up"
 ;
-; configure_element.php line: 161
+; configure_element.php line: 163
 configure_element_database_system = "Database System:"
 ;
-; configure_element.php line: 167
+; configure_element.php line: 169
 configure_element_databasename = "Database Name:"
 ;
-; configure_element.php line: 174
+; configure_element.php line: 176
 configure_element_databasehost = "Hostname:"
 ;
-; configure_element.php line: 180
+; configure_element.php line: 182
 configure_element_databaseuser = "Database User:"
 ;
-; configure_element.php line: 187
+; configure_element.php line: 189
 configure_element_databasepassword = "Database Password:"
 ;
-; configure_element.php line: 196
+; configure_element.php line: 198
 configure_element_name_server = "Name Server Set-up"
 ;
-; configure_element.php line: 198
+; configure_element.php line: 200
 configure_element_name_server_key = "Server Key:"
 ;
-; configure_element.php line: 204
+; configure_element.php line: 206
 configure_element_name_server_url = "Name Server URL:"
 ;
-; configure_element.php line: 211
+; configure_element.php line: 213
 configure_element_use_memcache = "Use Memcache:"
 ;
-; configure_element.php line: 218
+; configure_element.php line: 220
 configure_element_memcache_servers = "Memcache Servers"
 ;
-; configure_element.php line: 227
+; configure_element.php line: 229
 configure_element_use_filecache = "Use Filecache:"
 ;
-; configure_element.php line: 237
+; configure_element.php line: 239
 configure_element_crawl_robot = "Crawl Robot Set-up"
 ;
-; configure_element.php line: 239
+; configure_element.php line: 241
 configure_element_robot_name = "Crawl Robot Name:"
 ;
-; configure_element.php line: 247
+; configure_element.php line: 249
 configure_element_robot_instance = "Robot Instance:"
 ;
-; configure_element.php line: 254
+; configure_element.php line: 256
 configure_element_robot_description = "Robot Description"
 ;
-; configure_element.php line: 263
+; configure_element.php line: 265
 configure_element_submit = "Submit"
 ;
 ; crawloptions_element.php line: 62
@@ -795,15 +777,6 @@ crawloptions_element_reindex_crawl = "Crawl or Arc Folder to Re-index:"
 crawloptions_element_need_api_for_mix = "Yioop API access required for mix archive crawls  "
 ;
 ; crawloptions_element.php line: 167
-crawloptions_element_indexing_plugins = "Indexing Plugins"
-;
-; crawloptions_element.php line: 169
-crawloptions_element_plugin = "Plugin"
-;
-; crawloptions_element.php line: 172
-crawloptions_element_plugin_include = "Use in Crawl"
-;
-; crawloptions_element.php line: 197
 crawloptions_element_save_options = "Save Options"
 ;
 ; editlocales_element.php line: 62
@@ -1021,15 +994,6 @@ manageroles_element_submit = "Submit"
 ;
 ; manageroles_element.php line: 94
 manageroles_element_view_role_activities = "View Role Activities"
-
-; managegroups_element.php line: 94
-managegroups_element_view_groups = "View Groups"
-;
-
-; managegroups_element.php line: 103
-managegroups_element_select_group = "Group Name: "
-;
-
 ;
 ; manageroles_element.php line: 103
 manageusers_element_select_role = "Role Name: "
@@ -1039,26 +1003,6 @@ manageusers_element_add_activity = "Add Activity:"
 ;
 ; manageroles_element.php line: 128
 manageroles_element_submit = "Submit"
-
-;
-;managegroups_element.php line: 58
-managegroups_element_add_user = "Add User: "
-;
-; manageroles_element.php line: 67
-managegroups_element_groupname = "Group Name:"
-;
-; manageroles_element.php line: 71
- managegroups_element_submit = "Submit"
-;
-; manageroles_element.php line: 76
-managegroups_element_delete_groupname = "Delete Group"
-;
-; managegroups_element.php line: 86
-manageusers_element_delete_groupname = "Group Name:"
-;
-; manageroles_element.php line: 90
-managegroups_element_submit = "Submit"
-
 ;
 ; manageusers_element.php line: 57
 manageusers_element_add_user = "Add User"
@@ -1092,16 +1036,6 @@ manageusers_element_select_user = "Username: "
 ;
 ; manageusers_element.php line: 135
 manageusers_element_add_role = "Add Role: "
-
-; managegroups_element.php line: 135
-managegroups_element_add_user = "Add User: "
-
-; managegroups_element.php line: 135
-managegroups_element_add_group_activity = "Add Activity: "
-
-; managegroups_element.php line: 135
-managegroups_element_add_group_role = "Add Role: "
-
 ;
 ; manageusers_element.php line: 140
 manageusers_element_submit = "Submit"
@@ -1166,94 +1100,97 @@ pageoptions_element_allow_recrawl = "Allow Page Recrawl After:"
 ; pageoptions_element.php line: 114
 pageoptions_element_file_types = "Page File Types to Crawl:"
 ;
-; pageoptions_element.php line: 144
+; pageoptions_element.php line: 142
 pageoptions_element_indexing_plugins = "Indexing Plugins"
 ;
-; pageoptions_element.php line: 146
+; pageoptions_element.php line: 145
 pageoptions_element_plugin = "Plugin"
 ;
-; pageoptions_element.php line: 149
+; pageoptions_element.php line: 148
 pageoptions_element_plugin_include = "Use in Crawl"
 ;
-; pageoptions_element.php line: 170
+; pageoptions_element.php line: 168
+pageoptions_element_no_compatible_plugins = "No compatible indexing plugins found!"
+;
+; pageoptions_element.php line: 171
 pageoptions_element_page_rules = "Page Field Extraction Rules"
 ;
-; pageoptions_element.php line: 178
+; pageoptions_element.php line: 179
 page_element_search_page = "Search Page Elements and Links"
 ;
-; pageoptions_element.php line: 183
+; pageoptions_element.php line: 184
 pageoptions_element_wd_suggest = "Word Suggest"
 ;
-; pageoptions_element.php line: 191
+; pageoptions_element.php line: 192
 pageoptions_element_subsearch_link = "Subsearch"
 ;
-; pageoptions_element.php line: 200
+; pageoptions_element.php line: 201
 pageoptions_element_signin_link = "Signin"
 ;
-; pageoptions_element.php line: 207
+; pageoptions_element.php line: 208
 pageoptions_element_cache_link = "Cache"
 ;
-; pageoptions_element.php line: 215
+; pageoptions_element.php line: 216
 pageoptions_element_similar_link = "Similar"
 ;
-; pageoptions_element.php line: 223
+; pageoptions_element.php line: 224
 pageoptions_element_in_link = "Inlinks"
 ;
-; pageoptions_element.php line: 229
+; pageoptions_element.php line: 230
 pageoptions_element_ip_link = "IP Address"
 ;
-; pageoptions_element.php line: 238
+; pageoptions_element.php line: 239
 pageoptions_element_ranking_factors = "Search Ranking Factors"
 ;
-; pageoptions_element.php line: 241
+; pageoptions_element.php line: 242
 pageoptions_element_title_weight = "Title Weight:"
 ;
-; pageoptions_element.php line: 246
+; pageoptions_element.php line: 247
 pageoptions_element_description_weight = "Description Weight:"
 ;
-; pageoptions_element.php line: 251
+; pageoptions_element.php line: 252
 pageoptions_element_link_weight = "Link Weight:"
 ;
-; pageoptions_element.php line: 256
+; pageoptions_element.php line: 257
 pageoptions_element_results_grouping_options = "Search Results Grouping"
 ;
-; pageoptions_element.php line: 259
+; pageoptions_element.php line: 260
 pageoptions_element_min_results_to_group = "Minimum Results to Group:"
 ;
-; pageoptions_element.php line: 264
+; pageoptions_element.php line: 265
 pageoptions_element_server_alpha = "Server Alpha:"
 ;
-; pageoptions_element.php line: 272
+; pageoptions_element.php line: 273
 pageoptions_element_test_page = "Test Page"
 ;
-; pageoptions_element.php line: 274
+; pageoptions_element.php line: 275
 pageoptions_element_page_type = "Type:"
 ;
-; pageoptions_element.php line: 291
+; pageoptions_element.php line: 292
 pageoptions_element_save_options = "Save"
 ;
-; pageoptions_element.php line: 293
+; pageoptions_element.php line: 294
 pageoptions_element_run_tests = "Test Process Page"
 ;
-; pageoptions_element.php line: 299
+; pageoptions_element.php line: 300
 pageoptions_element_test_results = "Test Results"
 ;
-; pageoptions_element.php line: 302
+; pageoptions_element.php line: 303
 pageoptions_element_after_process = "After page processor extracts summary"
 ;
-; pageoptions_element.php line: 306
+; pageoptions_element.php line: 307
 pageoptions_element_after_rules = "After page rules applied"
 ;
-; pageoptions_element.php line: 310
+; pageoptions_element.php line: 311
 pageoptions_element_extracted_words = "Words and positions extracted to index from summary"
 ;
-; pageoptions_element.php line: 314
+; pageoptions_element.php line: 315
 pageoptions_element_extracted_metas = "Extracted meta words"
 ;
-; pageoptions_element.php line: 348
+; pageoptions_element.php line: 349
 pageoptions_element_run_tests = "Test Process Page"
 ;
-; pageoptions_element.php line: 352
+; pageoptions_element.php line: 353
 pageoptions_element_save_options = "Save"
 ;
 ; resultseditor_element.php line: 58
@@ -1446,40 +1383,49 @@ web_layout_description = "PHP Crawler and Search Engine Software"
 ; web_layout.php line: 80
 web_layout_description = "PHP Crawler and Search Engine Software"
 ;
-; web_layout.php line: 106
+; web_layout.php line: 109
 web_layout_query_statistics = "Query Statistics"
 ;
-; web_layout.php line: 110
+; web_layout.php line: 113
 web_layout_total_elapsed_time = "Total Elapsed Time for Queries: %s seconds."
 ;
-; web_layout.php line: 115
+; web_layout.php line: 118
 web_layout_query_time = "Time: %s seconds."
 ;
 ; machinestatus_view.php line: 65
 machinestatus_view_no_monitored = "No Monitored Machines"
 ;
-; machinestatus_view.php line: 84
+; machinestatus_view.php line: 70
+machinestatus_view_news_updater = "Name Server News Updater"
+;
+; machinestatus_view.php line: 80
+machinestatus_view_updates_type = "Update Type:"
+;
+; machinestatus_view.php line: 85
+machinestatus_view_log = "Log"
+;
+; machinestatus_view.php line: 107
 machinestatus_view_mirrors = "Mirrors"
 ;
-; machinestatus_view.php line: 87
+; machinestatus_view.php line: 110
 machinestatus_view_log = "Log"
 ;
-; machinestatus_view.php line: 100
+; machinestatus_view.php line: 123
 machinestatus_view_queue_server = "Queue Server"
 ;
-; machinestatus_view.php line: 102
+; machinestatus_view.php line: 125
 machinestatus_view_log = "Log"
 ;
-; machinestatus_view.php line: 111
+; machinestatus_view.php line: 134
 machinestatus_view_no_queue_server = "Machine has no queue server"
 ;
-; machinestatus_view.php line: 114
+; machinestatus_view.php line: 137
 machinestatus_view_no_fetchers = "Machine has no fetchers"
 ;
-; machinestatus_view.php line: 124
+; machinestatus_view.php line: 147
 machinestatus_view_fetchers = "Fetchers"
 ;
-; machinestatus_view.php line: 134
+; machinestatus_view.php line: 157
 machinestatus_view_log = "Log"
 ;
 ; nocache_view.php line: 65
@@ -1640,4 +1586,3 @@ statistics_view_number_hosts = "Hostnames Seen"
 ;
 ; view.php line: 35
 view_locale_version2 = "version 2"
-
diff --git a/models/group_model.php b/models/group_model.php
index 79a532e..f19e666 100644
--- a/models/group_model.php
+++ b/models/group_model.php
@@ -36,94 +36,77 @@ if(!defined('BASE_DIR')) {echo "BAD REQUEST"; exit();}
 require_once BASE_DIR."/models/model.php";
 /** For crawlHash function */
 require_once BASE_DIR."/lib/utility.php";
-
 /**
- * This is class is used to handle
- * db results related to Role Administration
- *
- * @author Mallika Perepa
- * @package seek_quarry
- * @subpackage model
- */
+* This is class is used to handle
+* db results related to Role Administration
+*
+* @author Mallika Perepa
+* @package seek_quarry
+* @subpackage model
+*/
 
 class GroupModel extends Model
 {
-	/**
-     *  {@inheritdoc}
-     */
+    /**
+    *  {@inheritdoc}
+    */
      
  	function __construct()
     {
         parent::__construct();
     }
-	/**
-	*  Get the users  (name, method, id) that a given group contains
-	*
-	*  @param string $group_id  the group_id to get users for
-	*/
-     
+    /**
+    *  Get the users  (name, method, id) that a given group contains
+    *
+    *  @param string $group_id  the group_id to get users for
+    */ 
     function getGroupUsers($group_id)
     {
     	$this->db->selectDB(DB_NAME);
     	$group_id = $this->db->escapeString($group_id);
     	$users = array();
-    	
-     
-      $sql = "SELECT UG.USER_ID, U.USER_NAME, UG.GROUP_ID, G.CREATER_ID ".
-            "FROM USER_GROUPS UG, USER U, GROUPS G ".
-            "where UG.GROUP_ID = '$group_id' and UG.USER_ID = U.USER_ID and G.GROUP_ID = UG.GROUP_ID";
-
-
+      $sql = "SELECT UG.USER_ID, U.USER_NAME, UG.GROUP_ID, G.CREATER_ID".
+      " FROM USER_GROUPS UG, USER U, GROUPS G".
+      " where UG.GROUP_ID = '$group_id' AND UG.USER_ID = U.USER_ID".
+      " AND G.GROUP_ID = UG.GROUP_ID";
         $result = $this->db->execute($sql);
 		$i = 0;
         while($users[$i] = $this->db->fetchArray($result)) {
         	$i++;
         }
 		unset($users[$i]); //last one will be null
-		
-		return $users;
-		
+		return $users;	
     }
-    
-	/**
+    /**
     *  Get the activities  (name, method, id) that a given group can perform
     *
     *  @param string $group_id  the group_id to get activities for
     */
-    
    	function getGroupActivities($group_id)
     {
     	$this->db->selectDB(DB_NAME);
     	$group_id = $this->db->escapeString($group_id);
     	$activities= array();
     	$locale_tag = getLocaleTag();
-     
  	$sql = "SELECT LOCALE_ID FROM LOCALE ".
-            "WHERE LOCALE_TAG = '$locale_tag' LIMIT 1";
-           
+            "WHERE LOCALE_TAG = '$locale_tag' LIMIT 1";  
     	$result = $this->db->execute($sql);
     	$row = $this->db->fetchArray($result);
     	$locale_id = $row['LOCALE_ID'];
-        
     $sql= "SELECT A.ACTIVITY_ID, T.TRANSLATION, G.GROUP_ID FROM ". 
 		"TRANSLATION_LOCALE T, ACTIVITY A, GROUP_PERMISSIONS G ".
 		"where G.GROUP_ID = '$group_id' AND T.LOCALE_ID = '$locale_id' ".
 		"AND A.ACTIVITY_ID = G.ACTIVITY_ID AND ".
 		"A.TRANSLATION_ID = T.TRANSLATION_ID";
-   
     	$result = $this->db->execute($sql);
-    
 	$i = 0;
     	while($activities[$i] = $this->db->fetchArray($result)) {
         	$i++;
         }
 		unset($activities[$i]); //last one will be null
-		
 		return $activities;
-		
     }
-    
-	/**
+    /**
     * Gets all the roles associated with a group id
     *
     * @param string $group_id  the group_id to get roles of
@@ -134,43 +117,33 @@ class GroupModel extends Model
         $this->db->selectDB(DB_NAME);
 
         $group_id = $this->db->escapeString($group_id);
-
         $roles = array();
         $locale_tag = getLocaleTag();
-
     $sql = "SELECT LOCALE_ID FROM LOCALE ".
-            "WHERE LOCALE_TAG = '$locale_tag' LIMIT 1";
-            
+            "WHERE LOCALE_TAG = '$locale_tag' LIMIT 1";    
         $result = $this->db->execute($sql);
         $row = $this->db->fetchArray($result);
         $locale_id = $row['LOCALE_ID'];
-        
     $sql = "SELECT GR.GROUP_ID, GR.ROLE_ID, R.NAME AS ROLE_NAME ".
             "FROM GROUP_ROLES GR, ROLE R ".
             "where GR.GROUP_ID = '$group_id' and  GR.ROLE_ID= R.ROLE_ID ";
-            
-
         $result = $this->db->execute($sql);
         $i = 0;
         while($roles[$i] = $this->db->fetchArray($result)) {
             $i++;
         }
         unset($roles[$i]); //last one will be null
-
         return $roles;   
-
     }
-    
      function getLocaleTag()
     {
         return $this->locale_tag;
     }
-    
     /**
-     *  Add a groupname to the database using provided string
-     *
-     *  @param string $groupname  the groupname to be added
-     */
+    *  Add a groupname to the database using provided string
+    *
+    *  @param string $groupname  the groupname to be added
+    */
     function addGroup($groupname, $userid)
     {
         $this->db->selectDB(DB_NAME);
@@ -178,20 +151,17 @@ class GroupModel extends Model
 		$timestamp = $date->getTimestamp();
         $sql = "INSERT INTO GROUPS (GROUP_NAME,CREATER_ID,CREATED_TIME) VALUES ('".
             $this->db->escapeString($groupname)."', $userid, $timestamp)";
-	
         $this->db->execute($sql);
         $last_insert_id = mysql_insert_id();
-        $sql= "INSERT INTO USER_GROUPS (USER_ID,GROUP_ID) VALUES ($userid, $last_insert_id)";
-       
+     $sql= "INSERT INTO USER_GROUPS (USER_ID,GROUP_ID) VALUES ($userid, $last_insert_id)";
        $this->db->execute($sql);
     }
-    
-     /**
-     * Get group id associated with groupname (so groupnames better be unique)
-     *
-     * @param string $groupname to use to look up a group_id
-     * @return string  group_id corresponding to the groupname.
-     */
+    /**
+    * Get group id associated with groupname (so groupnames better be unique)
+    *
+    * @param string $groupname to use to look up a group_id
+    * @return string  group_id corresponding to the groupname.
+    */
     function getGroupId($groupname)
     {
         $this->db->selectDB(DB_NAME);
@@ -203,53 +173,42 @@ class GroupModel extends Model
         }
         return $row['GROUP_ID'];
     }
-    
-     /**
-     *  Delete a groupname to the database using provided string
-     *
-     *  @param string $groupname  the groupname to be deleted
-     */
+    /**
+    *  Delete a groupname to the database using provided string
+    *
+    *  @param string $groupname  the groupname to be deleted
+    */
   	function deleteGroup($groupid)
     {
         $this->db->selectDB(DB_NAME);
         $sql = "DELETE FROM GROUPS WHERE GROUP_ID='$groupid'";
-
         $this->db->execute($sql);
         $sql = "DELETE FROM GROUPS WHERE GROUP_ID='".
             $this->db->escapeString($groupid)."'";
         $this->db->execute($sql);
     }
-    
-	/**
+    /**
     *  Get a list of all groups. Group names are not localized since these are
     *  created by end user admins of the search engine
     *
     *  @return array an array of group_id, group_name pairs
     */
-    
     function getGroupList()
     {
         $this->db->selectDB(DB_NAME);
-
         $groups = array();
-
-        $sql = "SELECT G.GROUP_ID AS GROUP_ID, G.GROUP_NAME AS GROUP_NAME ".
-            " FROM GROUPS G";
-
+        $sql = "SELECT G.GROUP_ID AS GROUP_ID, G.GROUP_NAME AS GROUP_NAME FROM GROUPS G";
         $result = $this->db->execute($sql);
         $i = 0;
-
         while($groups[$i] = $this->db->fetchArray($result)) {
             $i++;
         }
         unset($groups[$i]); //last one will be null
-
         return $groups;
-
     }
-    
     /**
-    *  Get a list of all groups which are created by the user_id. Group names are not localized since these are
+    *  Get a list of all groups which are created by the user_id. Group names 
+    *  are not localized since these are
     *  created by end user admins of the search engine
     *
     *  @return array an array of group_id, group_name pairs
@@ -257,26 +216,21 @@ class GroupModel extends Model
     function getGroupListbyUser($userid)
     {
         $this->db->selectDB(DB_NAME);
-
         $groups = array();
-
-        $sql = "SELECT UG.GROUP_ID AS GROUP_ID, UG.USER_ID AS USER_ID, G.GROUP_NAME AS GROUP_NAME ".
-            " FROM USER_GROUPS UG, GROUPS G where USER_ID = $userid and UG.GROUP_ID = G.GROUP_ID";
-            
+        $sql = "SELECT UG.GROUP_ID AS GROUP_ID, UG.USER_ID AS USER_ID,".
+        " G.GROUP_NAME AS GROUP_NAME FROM USER_GROUPS UG, GROUPS G". 
+        " where USER_ID = $userid and UG.GROUP_ID = G.GROUP_ID";  
         $result = $this->db->execute($sql);
         $i = 0;
-
         while($groups[$i] = $this->db->fetchArray($result)) {
             $i++;
         }
         unset($groups[$i]); //last one will be null
-
         return $groups;
-
     }
-    
     /**
-    *  Get a list of all groups which are created by the creater_id. Group names are not localized since these are
+    *  Get a list of all groups which are created by the creater_id. Group names are not 
+    *  localized since these are
     *  created by end user admins of the search engine
     *
     *  @return array an array of group_id, group_name pairs
@@ -284,58 +238,57 @@ class GroupModel extends Model
      function getGroupListbyCreater($userid)
     {
         $this->db->selectDB(DB_NAME);
-
         $groups = array();
-
-        $sql = "SELECT UG.GROUP_ID AS GROUP_ID, UG.USER_ID AS USER_ID, G.GROUP_NAME AS GROUP_NAME ".
-            " FROM USER_GROUPS UG, GROUPS G where CREATER_ID = $userid and UG.GROUP_ID = G.GROUP_ID";
-        
+        $sql = "SELECT G.GROUP_ID AS GROUP_ID, G.CREATER_ID AS USER_ID,".
+        "G.GROUP_NAME AS GROUP_NAME ".
+        " FROM GROUPS G where CREATER_ID = $userid";
         $result = $this->db->execute($sql);
         $i = 0;
-
         while($groups[$i] = $this->db->fetchArray($result)) {
             $i++;
         }
         unset($groups[$i]); //last one will be null
-
         return $groups;
-
     }
-    
-    
+    /**
+    *  To update the CREATER_ID of a group
+    *
+    *  @param string $groupid  the group id of the group to transfer admin privileges
+    *  @param string $userid the id of the user who becomes the admin of the group
+    */
+    function updateUserGroup($userid, $group_id)
+    {
+    	$this->db->selectDB(DB_NAME);
+    	$sql = "UPDATE GROUPS SET CREATER_ID= $userid WHERE GROUP_ID= $group_id;";
+    	$this->db->execute($sql);
+    }
     /**
     *  Add an allowed user to an existing group
     *
     *  @param string $groupid  the group id of the group to add the user to
     *  @param string $userid the id of the user to add
     */
-    
     function addUserGroup($groupid, $userid)
     {
         $this->db->selectDB(DB_NAME);
             $sql = "INSERT INTO USER_GROUPS VALUES ('".
             $this->db->escapeString($userid)."', '".
-            $this->db->escapeString($groupid)."')";
-            
+            $this->db->escapeString($groupid)."')";    
         $this->db->execute($sql);
     }
-    
     /**
     *  Delete a user by its userid
     *
     *  @param string $userid - the userid of the user to delete
     */
-     
     function deleteUserGroup($groupid, $userid)
     {
         $this->db->selectDB(DB_NAME);
         $sql = "DELETE FROM USER_GROUPS WHERE USER_ID='".
             $this->db->escapeString($userid)."' AND GROUP_ID='".
             $this->db->escapeString($groupid)."'";
-
         $this->db->execute($sql);
-    }
-        
+    }   
 	/**
     * Adds a role to a given user
     *
@@ -350,7 +303,6 @@ class GroupModel extends Model
             $this->db->escapeString($roleid)."' ) ";
         $result = $this->db->execute($sql);   
     }
-   
     /**
     * Deletes a role from a given user
     *
@@ -364,7 +316,6 @@ class GroupModel extends Model
             $this->db->escapeString($groupid)."' AND  ROLE_ID='".
             $this->db->escapeString($roleid)."'";
         $result = $this->db->execute($sql);
-    }
-    	
+    }	
     } 
 ?>
\ No newline at end of file
diff --git a/views/elements/managegroups_element.php b/views/elements/managegroups_element.php
index b5f9f52..f3f9176 100644
--- a/views/elements/managegroups_element.php
+++ b/views/elements/managegroups_element.php
@@ -53,7 +53,26 @@ class ManagegroupsElement extends Element
 */
 function render($data)
     {?>
-        
+    
+    <div id="div1" class="divOverlay">
+
+    <div style="margin:100px auto;"><?php
+	foreach($data['GROUP_USERS'] as $group_user) {?>
+		<form id ="groupform" method = "post" action = '#'>
+		<input type="hidden" name="c" value="admin" />
+        <input type="hidden" name="<?php e(CSRF_TOKEN); ?>" value="<?php
+            e($data[CSRF_TOKEN]); ?>" />
+        <input type="hidden" name="arg" value="updategroup" />
+    	<input type="radio" name="selectuser" value="<?php e($group_user['USER_ID'])?>" >
+    	<?php e($group_user['USER_NAME']); ?></input><br/>
+    <?php } ?>
+    <hr/>
+	<input type="submit" value="submit" onclick="return confirm('Are you sure?');"/>
+	<input type="button" value="cancel" onclick="closeoverlay();"/>
+	</form>
+    </div>
+    </div>
+    
         <div class="current-activity">
         <h2><?php e(tl('managegroups_element_add_group'))?></h2>
         <form id="addGroupForm" method="post" action='#'>
@@ -73,9 +92,9 @@ function render($data)
         </tr>
         </table>
         </form>
-        
         <h2><?php e(tl('managegroups_element_delete_group'))?></h2>
-        <form id="deleteGroupForm" method="post" action='#'>
+        <form id="deleteGroupForm" method="post" action='#' 
+        onsubmit="return confirm('Are you sure you want to delete the Group?');">
         <input type="hidden" name="c" value="admin" />
         <input type="hidden" name="<?php e(CSRF_TOKEN); ?>" value="<?php
             e($data[CSRF_TOKEN]); ?>" />
@@ -92,7 +111,6 @@ function render($data)
         </tr>
         </table>
         </form>
-        
         <h2><?php e(tl('managegroups_element_view_groups'))?></h2>
         <form id="viewGroupForm" method="get" action='#' >
         <input type="hidden" name="c" value="admin" />
@@ -100,7 +118,6 @@ function render($data)
             e($data[CSRF_TOKEN]); ?>" />
         <input type="hidden" name="a" value="manageGroups" />
         <input type="hidden" name="arg" value="viewgroups" />
-        
         <table class="name-table">
         <tr><td><label for="select-groups"><?php
             e(tl('managegroups_element_select_group'))?></label></td>
@@ -109,7 +126,6 @@ function render($data)
                 ?></td></tr>
         </table>
         </form>
-        
         <?php
         	if(isset($data['USER_NAMES'])) {
         		if(count($data['USER_NAMES']) > 0) { ?>
@@ -128,11 +144,9 @@ function render($data)
                     "selectuser", $data['USER_NAMES'],
                     $data['SELECT_USER']); ?></td>
                 <td><button class="button-box" type="submit"><?php
-                
                     e(tl('managegroups_element_submit')); ?></button></td></tr>
                 </table>
-                </form>
-                
+                </form>   
         	<?php
         	}
         	?>
@@ -143,21 +157,25 @@ function render($data)
              		e("<tr><td>".$group_user['USER_NAME'].
                     "</td>");
              		}else{
-             			e("<tr><td>".$group_user['USER_NAME'].
-                    	"</td><td><a href='?c=admin&amp;a=manageGroups".
-                    	"&amp;arg=deleteuser&amp;selectgroup=".
-                    	$group_user['GROUP_ID'].
-                    	"&amp;selectuser=".$group_user['USER_ID'].
-                    	"&amp;".CSRF_TOKEN."=".$data[CSRF_TOKEN].
-                    	"'>Delete</a></td>");
+             			if ($group_user['USER_ID'] != $group_user['CREATER_ID']){
+             				e("<tr><td>".$group_user['USER_NAME'].
+                    		"</td><td><a href='?c=admin&amp;a=manageGroups".
+                    		"&amp;arg=deleteuser&amp;selectgroup=".
+                    		$group_user['GROUP_ID'].
+                    		"&amp;selectuser=".$group_user['USER_ID'].
+                    		"&amp;".CSRF_TOKEN."=".$data[CSRF_TOKEN].
+                    		"' onclick='return confirm(&quot;Do you want to remove". 
+                    		"the user from the Group?&quot;);'>Delete</a></td>");
+             			}else{
+                	 		e("<tr><td>".$group_user['USER_NAME'].
+                    		"</td><td><a href='#".
+                    		"' onclick='return ShowOverlay()". 
+                    		";'>Transfer</a></td>");
+                   	 	}
              		}
              		}
     			?>
     			 </table>
-        	<?php
-			}
-			?>
-			
         <?php
         if(isset($data['GROUP_ROLES'])) {
              if(count($data['ROLE_NAMES']) > 0  &&
@@ -171,13 +189,11 @@ function render($data)
                 <input type="hidden" name="selectgroup" value="<?php
                     e($data['SELECT_GROUP']);?>" />
                 <table class="name-table">
-                
                  <tr><td><label for="add-role"><?php
                     e(tl('managegroups_element_add_group_role'))?></label></td>
                     <td><?php $this->view->optionsHelper->render("add-role",
                         "selectrole", $data['ROLE_NAMES'],
                         $data['SELECT_ROLE']); ?></td>
-                        
                     <td><button class="button-box" type="submit"><?php
                     e(tl('managegroups_element_submit')); ?></button></td></tr>
                  </table>
@@ -185,14 +201,13 @@ function render($data)
         	<?php
             }
     		?>
-    		
     	<?php
         if(isset($data['GROUP_ROLES'])) {
              if(count($data['GROUP_ROLES']) > 0  &&
                 $data['GROUP_ROLES'] != -1) { ?>
             <table class="role-table"><?php
              foreach($data['GROUP_ROLES'] as $group_role) {
-                 e("<tr><td>".$group_role['ROLE_NAME'].
+             e("<tr><td>".$group_role['ROLE_NAME'].
                     "</td><td><a href='?c=admin&amp;a=manageGroups".
                     "&amp;arg=deleterole&amp;selectgroup=".
                     $group_role['GROUP_ID'].
@@ -200,6 +215,7 @@ function render($data)
                     "&amp;".CSRF_TOKEN."=".$data[CSRF_TOKEN].
                     "'>Delete</a></td>");
              }
+          }   
              ?>
              </table>
         	<?php
@@ -210,6 +226,14 @@ function render($data)
         {
             elt('viewGroupForm').submit();
         }
+        function ShowOverlay() {
+			var divObject = document.getElementById('div1');
+			divObject.style.visibility = "visible";
+		}
+        function closeoverlay(){
+	    	var divObject = document.getElementById('div1');
+	    	divObject.style.visibility = "hidden";
+        }
         </script>
            </div>
     	<?php
-- 
1.7.5.4


From 6956971aa686d566277b4fc652eeb91f1508251d Mon Sep 17 00:00:00 2001
From: MALLIKA <keertimaantenneti@keertimaan-tennetis-macbook.local>
Date: Tue, 14 May 2013 08:21:58 -0700
Subject: [PATCH 2/2] manage

---
 controllers/admin_controller.php |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/controllers/admin_controller.php b/controllers/admin_controller.php
index 01f60af..69bbe62 100755
--- a/controllers/admin_controller.php
+++ b/controllers/admin_controller.php
@@ -960,10 +960,7 @@ class AdminController extends Controller implements CrawlConstants
                 break;
                 case "updategroup":
                 	$this->groupModel->updateUserGroup(
-                        $select_user, $select_group);
-                
-                
-                
+                        $select_user, $select_group);     
           }      
     }
         return $data;
-- 
1.7.5.4

