diff --git a/webtools/uninstall_survey/README b/webtools/uninstall_survey/README index 58259bdadda..e69de29bb2d 100644 --- a/webtools/uninstall_survey/README +++ b/webtools/uninstall_survey/README @@ -1,52 +0,0 @@ -Mozilla Firefox Uninstall Survey -================================ - - -How To Install --------------- - -Assumptions: - 1) You've got a working database with the appropriate schema - 2) You've got cake setup on your server already. The code you're looking at now - is just what is in the /app/ directory - everything else will have to be on your - server already. - -Steps: - -1) Copy config/database.php.default to config/database.php and fill in your database -values (if you're only doing production, just fill in the production area). - -2) Edit /webroot/index.php. - Define ROOT: - If you're installing this in your home directory, ROOT should be: - - DS.'home'.DS.'username'.DS.'public_html' - - Define APP_DIR: - ROOT is the parent directory of the app, this is the actual app. - Continuing the example above, if people are going to go to: - http://server.com/~username/survey/ to get to the app, APP_DIR should be: - - survey - - Define CAKE_CORE_INCLUDE_PATH: - This is the path to the actual cake install on your server. For example: - - DS.'usr'.DS.'local'.DS.'lib'.DS.'php'.DS.'cake' - -3) Edit /webroot/.htaccess. Add a RewriteBase line below the line that says 'RewriteEngine On'. -For our example, we would add the line: - - RewriteBase /~username/survey - -4) Edit /.htaccess. Add the same RewriteBase line from step 3 directly below the -'RewriteEngine On' line. - -5) Go to the webroot/js/ directory and run the following two commands: - ln -s plotkit-0.8/PlotKit/ plotkit - ln -s MochiKit-1.3.1/lib/MochiKit/ mochikit - - - - -Questions? Email clouserw@mozilla.com diff --git a/webtools/uninstall_survey/config/acl.ini.php b/webtools/uninstall_survey/config/acl.ini.php deleted file mode 100644 index 366a7add6f2..00000000000 --- a/webtools/uninstall_survey/config/acl.ini.php +++ /dev/null @@ -1,76 +0,0 @@ -; -; SVN FILE: $Id: acl.ini.php,v 1.1 2006-05-24 19:14:24 uid815 Exp $ -;/** -; * Short description for file. -; * -; * -; * PHP versions 4 and 5 -; * -; * CakePHP : Rapid Development Framework -; * Copyright (c) 2006, Cake Software Foundation, Inc. -; * 1785 E. Sahara Avenue, Suite 490-204 -; * Las Vegas, Nevada 89104 -; * -; * Licensed under The MIT License -; * Redistributions of files must retain the above copyright notice. -; * -; * @filesource -; * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. -; * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project -; * @package cake -; * @subpackage cake.app.config -; * @since CakePHP v 0.10.0.1076 -; * @version $Revision: 1.1 $ -; * @modifiedby $LastChangedBy: phpnut $ -; * @lastmodified $Date: 2006-05-24 19:14:24 $ -; * @license http://www.opensource.org/licenses/mit-license.php The MIT License -; */ - -; acl.ini.php - Cake ACL Configuration -; --------------------------------------------------------------------- -; Use this file to specify user permissions. -; aco = access control object (something in your application) -; aro = access request object (something requesting access) -; -; User records are added as follows: -; -; [uid] -; groups = group1, group2, group3 -; allow = aco1, aco2, aco3 -; deny = aco4, aco5, aco6 -; -; Group records are added in a similar manner: -; -; [gid] -; allow = aco1, aco2, aco3 -; deny = aco4, aco5, aco6 -; -; The allow, deny, and groups sections are all optional. -; NOTE: groups names *cannot* ever be the same as usernames! -; -; ACL permissions are checked in the following order: -; 1. Check for user denies (and DENY if specified) -; 2. Check for user allows (and ALLOW if specified) -; 3. Gather user's groups -; 4. Check group denies (and DENY if specified) -; 5. Check group allows (and ALLOW if specified) -; 6. If no aro, aco, or group information is found, DENY -; -; --------------------------------------------------------------------- - -;------------------------------------- -;Users -;------------------------------------- - -[username-goes-here] -groups = group1, group2 -deny = aco1, aco2 -allow = aco3, aco4 - -;------------------------------------- -;Groups -;------------------------------------- - -[groupname-goes-here] -deny = aco5, aco6 -allow = aco7, aco8 \ No newline at end of file diff --git a/webtools/uninstall_survey/config/sql/sessions.sql b/webtools/uninstall_survey/config/sql/sessions.sql deleted file mode 100644 index 3488faf8e3a..00000000000 --- a/webtools/uninstall_survey/config/sql/sessions.sql +++ /dev/null @@ -1,11 +0,0 @@ --- @copyright Copyright (c) 2006, Cake Software Foundation, Inc. --- @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project --- @since CakePHP v 0.10.8.1997 --- @version $Revision: 1.1 $ - -CREATE TABLE cake_sessions ( - id varchar(255) NOT NULL default '', - data text, - expires int(11) default NULL, - PRIMARY KEY (id) -); \ No newline at end of file diff --git a/webtools/uninstall_survey/controllers/applications_controller.php b/webtools/uninstall_survey/controllers/applications_controller.php index 40c9bf29bef..e69de29bb2d 100644 --- a/webtools/uninstall_survey/controllers/applications_controller.php +++ b/webtools/uninstall_survey/controllers/applications_controller.php @@ -1,7 +0,0 @@ - diff --git a/webtools/uninstall_survey/controllers/choices_controller.php b/webtools/uninstall_survey/controllers/choices_controller.php index 32e819e90d0..e69de29bb2d 100644 --- a/webtools/uninstall_survey/controllers/choices_controller.php +++ b/webtools/uninstall_survey/controllers/choices_controller.php @@ -1,7 +0,0 @@ - diff --git a/webtools/uninstall_survey/controllers/collections_controller.php b/webtools/uninstall_survey/controllers/collections_controller.php index f607536f651..e69de29bb2d 100644 --- a/webtools/uninstall_survey/controllers/collections_controller.php +++ b/webtools/uninstall_survey/controllers/collections_controller.php @@ -1,6 +0,0 @@ - diff --git a/webtools/uninstall_survey/controllers/results_controller.php b/webtools/uninstall_survey/controllers/results_controller.php index c79ea6130ac..e69de29bb2d 100644 --- a/webtools/uninstall_survey/controllers/results_controller.php +++ b/webtools/uninstall_survey/controllers/results_controller.php @@ -1,241 +0,0 @@ -Sanitize = new Sanitize(); - - // Pagination Stuff - $this->pagination_parameters['show'] = empty($_GET['show'])? '10' : $this->Sanitize->paranoid($_GET['show']); - $this->pagination_parameters['sortBy'] = empty($_GET['sort'])? 'created' : $this->Sanitize->paranoid($_GET['sort']); - $this->pagination_parameters['direction'] = empty($_GET['direction'])? 'desc': $this->Sanitize->paranoid($_GET['direction']); - $this->pagination_parameters['page'] = empty($_GET['page'])? '1': $this->Sanitize->paranoid($_GET['page']); - $this->pagination_parameters['order'] = $this->modelClass.'.'.$this->pagination_parameters['sortBy'].' '.strtoupper($this->pagination_parameters['direction']); - } - - /** - * Add a new result. This also means we're going to be adding to several other - * tables (for the many to many relationships). First we'll show a form, then if - * there is a $_POST, we'll process. - */ - function add() - { - // If these are set in $_POST, we'll use that for the query. If this is set - // in $_GET, then use that. If neither are set, make it blank, and we'll - // fail later on - $_input_name = $this->Sanitize->Sql(isset($this->data['application'][0]) ? $this->data['application'][0] : (isset($this->params['url']['application']) ? $this->params['url']['application'] : '')); - $_input_ua = $this->Sanitize->Sql(isset($this->data['ua'][0]) ? $this->data['ua'][0] : (isset($this->params['url']['ua']) ? $this->params['url']['ua'] : '')); - - // The ua comes over $_GET in the form: - // x.x.x.x (aa-bb) - // Where x is the versions and a and b are locale information. We're not - // interested in the locale information, - - $_conditions = "name LIKE '{$_input_name}' AND version LIKE '{$_input_ua}'"; - $_application = $this->Application->findAll($_conditions); - - if (empty($_application)) { - // The application they entered in the URL is not in the db. We'll have - // to put it in the db, but we don't want it to show up (in case they - // just typed something in manually) so we'll flag it as not visible. - $app = new Application(); - $app->set('name', $_input_name); - $app->set('version', $_input_ua); - $app->set('visible', 0); - $app->save(); - - $app_id = $app->getLastInsertID(); - - // The database will handle any combination of questions - // (issues/intentions) and applications+versions. However, since we're - // adding stuff in that comes in over the URL, we kinda have to guess at - // what questions should be associated. So, I'm running a stristr() on - // the $_GET values to get a general set of questions to associate, and - // then manually adding those values to the table. - if (stristr($this->params['url']['application'], 'Firefox') !== false) { - // Intention Id's - $this->Application->query("INSERT INTO applications_collections VALUES ({$app_id}, ".DEFAULT_FIREFOX_INTENTION_SET_ID.")"); - - // Issue Id's - $this->Application->query("INSERT INTO applications_collections VALUES ({$app_id}, ".DEFAULT_FIREFOX_ISSUE_SET_ID.")"); - - } elseif (stristr($this->params['url']['application'], 'Thunderbird') !== false) { - - // Intention Id's - $this->Application->query("INSERT INTO applications_collections VALUES ({$app_id}, ".DEFAULT_THUNDERBIRD_INTENTION_SET_ID.")"); - - // Issue Id's - $this->Application->query("INSERT INTO applications_collections VALUES ({$app_id}, ".DEFAULT_THUNDERBIRD_ISSUE_SET_ID.")"); - - } else { - // Whatever they entered doesn't have firefox or thunderbird in it. - // All they're going to see is a comment box on the other end. - } - - - // We could just get the last inserted id, but we need all the info - // below. Also, cake caches the query, and won't return - // anything if we don't alter it (add 1=1 to the end), since we already - // did the same query earlier - $_conditions = "name LIKE '{$_input_name}' AND version LIKE '{$_input_ua}' AND 1=1"; - $_application = $this->Application->findAll($_conditions); - } - // Pull the information for our radio buttons (only the - // questions for their applications will be shown) - $this->set('intentions', $this->Application->getIntentions($this->Sanitize->sql($_application[0]['Application']['id']))); - - // Checkboxes - $this->set('issues', $this->Application->getIssues($this->Sanitize->sql($_application[0]['Application']['id']))); - - // We'll need the url parameters to put in hidden fields - $this->set('url_params', $this->Sanitize->html($this->params['url'])); - - // If there is no $_POST, show the form, otherwise, process the data and - // forward the user on. - if (empty($this->params['data'])) { - $this->render(); - } else { - // Add the application id from the last cake query - $this->params['data'] = $this->params['data'] + $_application[0]; - if ($this->Result->save($this->params['data'])) { - // Redirect - $this->flash('Thank you.', '/results'); - exit; - } else { - // Saving failed. This probably means a required field wasn't set. - // Should we tell them it failed, or just redirect? Hmm... - $this->flash('Thank you.', '/results'); - exit; - } - } - } - - /** - * Front page will show the graph - */ - function index() - { - // Products dropdown - $this->set('products', $this->Application->findAll('visible=1', null, 'Application.name ASC,Application.version DESC')); - - // Fill in all the data passed in $_GET - $this->set('url_params',$this->decodeAndSanitize($this->params['url'])); - - // Give us some breadcrumbs - $this->set('breadcrumbs', array('Home' => 'http://mozilla.org', 'Uninstall Survey Results' => '')); - - // We'll need to include the graphing libraries - $this->set('include_graph_libraries', true); - - // Fill in our question sets - $this->set('collections',$this->Application->getCollectionsFromUrl($this->params['url'],'issue')); - - // Core data to show on page - $this->set('descriptionAndTotalsData',$this->Result->getDescriptionAndTotalsData($this->params['url'])); - } - - /** - * Display a table of user comments - */ - function comments() - { - // Products dropdown - $this->set('products', $this->Application->findAll('visible=1', null, 'Application.name ASC,Application.version DESC')); - - // Fill in all the data passed in $_GET - $this->set('url_params',$this->decodeAndSanitize($this->params['url'])); - - // Give us some breadcrumbs - $this->set('breadcrumbs', array('Home' => 'http://mozilla.org', 'Uninstall Survey Results' => 'results/', 'Comments' => '')); - - // Fill in our question sets - $this->set('collections',$this->Application->getCollectionsFromUrl($this->params['url'],'issue')); - - // Core data to show on page - $this->set('commentsData',$this->Result->getComments($this->params['url'], $this->pagination_parameters)); - - // Pagination settings - $paging['count'] = $this->Result->getCommentCount(); - $paging['style'] = 'html'; - $paging['link'] = "/results/comments/?collection=".urlencode($this->params['url']['collection'])."&product=".urlencode($this->params['url']['product'])."&start_date=".urlencode($this->params['url']['start_date'])."&end_date=".urlencode($this->params['url']['end_date'])."&show={$this->pagination_parameters['show']}&sort={$this->pagination_parameters['sortBy']}&direction={$this->pagination_parameters['direction']}&page="; - $paging['page'] = $this->pagination_parameters['page']; - $paging['limit'] = $this->pagination_parameters['show']; - $paging['show'] = array('10','25','50'); - - // No point in showing them an error if they click on "show 50" but they are - // already on the last page. - if ($paging['count'] < ($this->pagination_parameters['page'] * ($this->pagination_parameters['show']/2))) { - $this->pagination_parameters['page'] = $paging['page'] = 1; - } - - // Set pagination array - $this->set('paging',$paging); - - - - } - - /** - * Display a csv - */ - function csv() - { - // Get rid of the header/footer/etc. - $this->layout = null; - - // Auto generated .csv's are turned off since they were taking too much - // cpu/ram. If you turn them back on, be sure to check the code - there was - // a substantial database change between the time they were disabled and now. - return false; - - $csv = new csv(); - - $csv->loadDataFromArray($this->Result->getCsvExportData($this->params['url'], false)); - - // Our CSV library sends headers and everything. Keep the view empty! - $csv->sendCSV(); - - // I'm not exiting here in case someone is going to use post callback stuff. - // In development, that means extra lines get added to our CSVs, but in - // production it should be clean. - } - - -} -?> diff --git a/webtools/uninstall_survey/models/application.php b/webtools/uninstall_survey/models/application.php index 29770ce41e1..c1e80fc74ac 100644 --- a/webtools/uninstall_survey/models/application.php +++ b/webtools/uninstall_survey/models/application.php @@ -1,4 +1,41 @@ (Original Author) + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + uses('Sanitize'); class Application extends AppModel { var $name = 'Application'; diff --git a/webtools/uninstall_survey/models/choice.php b/webtools/uninstall_survey/models/choice.php index 5685b1c6c75..e69de29bb2d 100644 --- a/webtools/uninstall_survey/models/choice.php +++ b/webtools/uninstall_survey/models/choice.php @@ -1,10 +0,0 @@ - array('className' => 'Result', 'uniq' => true ), - 'Collection' => array('className' => 'Collection', 'uniq' => true ) - ); -} -?> diff --git a/webtools/uninstall_survey/models/collection.php b/webtools/uninstall_survey/models/collection.php index 5d34381d068..e69de29bb2d 100644 --- a/webtools/uninstall_survey/models/collection.php +++ b/webtools/uninstall_survey/models/collection.php @@ -1,15 +0,0 @@ - array( 'className' => 'Application', - 'joinTable' => 'applications_collections', - 'foreignKey' => 'collection_id', - 'associationForeignKey' => 'application_id' - ), - 'Choice' => array('className' => 'Choice') - ); - -} -?> diff --git a/webtools/uninstall_survey/models/result.php b/webtools/uninstall_survey/models/result.php index de3c1161f89..4875b19de4c 100644 --- a/webtools/uninstall_survey/models/result.php +++ b/webtools/uninstall_survey/models/result.php @@ -1,4 +1,41 @@ (Original Author) + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + class Result extends AppModel { var $name = 'Result'; diff --git a/webtools/uninstall_survey/vendors/csv/csv.php b/webtools/uninstall_survey/vendors/csv/csv.php index 2bf206671a8..e69de29bb2d 100644 --- a/webtools/uninstall_survey/vendors/csv/csv.php +++ b/webtools/uninstall_survey/vendors/csv/csv.php @@ -1,78 +0,0 @@ -filename = $name; - - if (empty($this->filename)) { - $this->filename = 'export-'.date('Y-m-d').'.csv'; - } - } - - - /** - * Function to load data from an array into the object - * @param array a 2 dimensional array - */ - function loadDataFromArray(&$array) - { - $this->data = $array; - } - - /** - * Will send the CSV to the browser (including headers) - */ - function sendCSV() - { - $this->_sendHeaders(); - - $this->_cleanData(); - - foreach ($this->data as $var => $val) { - // We put quotes around each value here - $line = implode('","',$val); - echo "\"{$line}\"\n"; - } - } - - /** - * Cleans data for export into a csv (quotes and newlines) - * @access private - */ - function _cleanData() - { - foreach ($this->data as $var => $val) { - // escape the quotes by doubling them - $val = str_replace('"','""',$val); - - // fix newlines - $val = str_replace("\n\r", "\n", str_replace("\r", "\n", $val)); - } - } - - /** - * Sends headers for a .csv - * @access private - */ - function _sendHeaders() - { - header("Content-type: application/x-csv"); - header('Content-disposition: inline; filename="'.$this->filename.'"'); - header('Cache-Control: private'); - header('Pragma: public'); - } - -} diff --git a/webtools/uninstall_survey/views/elements/footer.thtml b/webtools/uninstall_survey/views/elements/footer.thtml index c76320ac211..e69de29bb2d 100644 --- a/webtools/uninstall_survey/views/elements/footer.thtml +++ b/webtools/uninstall_survey/views/elements/footer.thtml @@ -1,25 +0,0 @@ - - - - - - - - diff --git a/webtools/uninstall_survey/views/elements/header.thtml b/webtools/uninstall_survey/views/elements/header.thtml index 9aba596a657..e191b985984 100644 --- a/webtools/uninstall_survey/views/elements/header.thtml +++ b/webtools/uninstall_survey/views/elements/header.thtml @@ -1,3 +1,41 @@ + (Original Author) + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + ?> diff --git a/webtools/uninstall_survey/views/helpers/breadcrumb.php b/webtools/uninstall_survey/views/helpers/breadcrumb.php index d172cf59550..e69de29bb2d 100644 --- a/webtools/uninstall_survey/views/helpers/breadcrumb.php +++ b/webtools/uninstall_survey/views/helpers/breadcrumb.php @@ -1,66 +0,0 @@ - 'url' - */ - function addlink($newlink) - { - array_push($this->links,$newlink); - } - - /** - * Bulk add some links to the array - * @param array in the form 'name' => 'url', ... , 'name' => 'url' - */ - function addlinks($newlinks) - { - $this->links = $this->links + $newlinks; - } - - /** - * Walk through the links and build an html string to echo. Note: this doesn't - * actually echo the string, despite being a show* function. I did this to be - * inline with the rest of cake. - * - * @return string html to echo - */ - function showLinks() - { - $_ret = ''; - - foreach ($this->links as $name => $link) { - $name = htmlspecialchars($name); - $link = htmlspecialchars($link); - - if (empty($link)) { - $_ret .= (empty($_ret)) ? "{$name}\n" : "» {$name}\n"; - } else { - /* This should really check for any protocol */ - if (strpos($link,'http') === 0) { - $href = $link; - } else { - $href = $this->webroot.$link; - } - $_ret .= (empty($_ret)) ? ''.$name.''."\n" : '» '.$name.''."\n"; - } - } - - return $_ret; - } - - -} - -?> diff --git a/webtools/uninstall_survey/views/helpers/export.php b/webtools/uninstall_survey/views/helpers/export.php index 0e6281ac49f..e69de29bb2d 100644 --- a/webtools/uninstall_survey/views/helpers/export.php +++ b/webtools/uninstall_survey/views/helpers/export.php @@ -1,56 +0,0 @@ -sanitize->html($url_parameters); - * @param string string to put between url and arguments (probably either '?' or - * '&') - * @param array array of strings which will be ignored - * @return string string with the url variables appeneded to it - */ - function buildUrlString($url, $params, $seperator='?', $ignore=array('url')) - { - $arguments = ''; - - foreach ($params as $var => $val) { - if (!in_array($var, $ignore)) { - $arguments .= empty($arguments) ? "{$var}={$val}" : "&{$var}={$val}"; - } - } - - return "{$this->webroot}{$url}{$seperator}{$arguments}"; - } - - function buildCsvExportString($params) - { - if (array_key_exists('product', $params)) { - $filename = $params['product']; - } else { - $filename = DEFAULT_APP_NAME.' '.DEFAULT_APP_VERSION; - } - - // Our filenames have underscores - $filename = str_replace(' ','_',$filename); - - $filename = "export-{$filename}.csv"; - - if (is_readable(ROOT.DS.APP_DIR.DS.WEBROOT_DIR.DS.'export'.DS.$filename)) { - return "{$this->webroot}export/{$filename}"; - } else { - return ''; - } - } -} -?> diff --git a/webtools/uninstall_survey/views/helpers/pagination.php b/webtools/uninstall_survey/views/helpers/pagination.php index 2ba50583d77..e69de29bb2d 100644 --- a/webtools/uninstall_survey/views/helpers/pagination.php +++ b/webtools/uninstall_survey/views/helpers/pagination.php @@ -1,211 +0,0 @@ -link = $paging['link']; - $this->show = $paging['show']; - $this->page = $paging['page']; - $this->style = $paging['style']; - - $pageCount = ceil($paging['count'] / $paging['limit'] ); - - $this->_pageDetails = array( - 'page'=>$paging['page'], - 'recordCount'=>$paging['count'], - 'pageCount' =>$pageCount, - 'nextPage'=> ($paging['page'] < $pageCount) ? $paging['page']+1 : '', - 'previousPage'=> ($paging['page']>1) ? $paging['page']-1 : '', - 'limit'=>$paging['limit'] - ); - - return true; - } - return false; - } - /** - * Displays limits for the query - * - * @param string $text - text to display before limits - * @param string $separator - display a separate between limits - * - **/ - function show($text=null, $separator=null) - { - if (empty($this->_pageDetails)) { return false; } - if ( !empty($this->_pageDetails['recordCount']) ) - { - $t = ''; - if(is_array($this->show)) - { - $t = $text.$separator; - foreach($this->show as $value) - { - $link = preg_replace('/show=(.*?)&/','show='.$value.'&',$this->link); - if($this->_pageDetails['limit'] == $value) - { - $t .= ''.$value.''.$separator; - } - else - { - if($this->style == 'ajax') - { - $t .= $this->Ajax->linkToRemote($value, array("fallback"=>$this->action."#","url" => $link.$this->_pageDetails['page'],"update" => "ajax_update","method"=>"get")).$separator; - } - else - { - $t .= $this->Html->link($value,$link.$this->_pageDetails['page']).$separator; - } - } - } - } - return $t; - } - return false; - - } - /** - * Displays current result information - * - * @param string $text - text to preceeding the number of results - * - **/ - function result($text) - { - if (empty($this->_pageDetails)) { return false; } - if ( !empty($this->_pageDetails['recordCount']) ) - { - if($this->_pageDetails['recordCount'] > $this->_pageDetails['limit']) - { - $start_row = $this->_pageDetails['page'] > 1 ? (($this->_pageDetails['page']-1)*$this->_pageDetails['limit'])+1:'1'; - $end_row = ($this->_pageDetails['recordCount'] < ($start_row + $this->_pageDetails['limit']-1)) ? $this->_pageDetails['recordCount'] : ($start_row + $this->_pageDetails['limit']-1); - $t = $text.$start_row.'-'.$end_row.' of '.$this->_pageDetails['recordCount']; - } - else - { - $t = $text.$this->_pageDetails['recordCount']; - } - return $t; - } - return false; - } - /** - * Returns a "Google style" list of page numbers - * - * @param string $separator - defaults to null - * @param string $prefix - defaults to null. If set, displays prefix before page links. - * @param int $pageSetLength - defaults to 10. Maximum number of pages to show. - * @param string $prevLabel - defaults to null. If set, displays previous link. - * @param string $nextLabel - defaults to null. If set, displays next link. - * - **/ - function pageNumbers($separator=null, $prefix=null, $pageSetLength=10, $prevLabel=null, $nextLabel=null) - { - - if (empty($this->_pageDetails) || $this->_pageDetails['pageCount'] == 1) { return false; } - - $t = array(); - - $modulo = $this->_pageDetails['page'] % $pageSetLength; - if ($modulo) - { // any number > 0 - $prevSetLastPage = $this->_pageDetails['page'] - $modulo; - } else { // 0, last page of set - $prevSetLastPage = $this->_pageDetails['page'] - $pageSetLength; - } - //$nextSetFirstPage = $prevSetLastPage + $pageSetLength + 1; - - if ($prevLabel) $t[] = $this->prevPage($prevLabel); - - // loops through each page number - $pageSet = $prevSetLastPage + $pageSetLength; - if ($pageSet > $this->_pageDetails['pageCount']) $pageSet = $this->_pageDetails['pageCount']; - for ($pageIndex = $prevSetLastPage+1; $pageIndex <= $pageSet; $pageIndex++) - { - if ($pageIndex == $this->_pageDetails['page']) - { - $t[] = ''.$pageIndex.''; - } - else - { - if($this->style == 'ajax') - { - $t[] = $this->Ajax->linkToRemote($pageIndex, array("fallback"=>$this->action."#","url" =>$this->link.$pageIndex,"update" => "ajax_update","method"=>"get")); - } else { - $t[] = $this->Html->link($pageIndex,$this->link.$pageIndex); - } - } - } - - if ($nextLabel) $t[] = $this->nextPage($nextLabel); - - $t = implode($separator, $t); - - return $prefix.$t; - } - /** - * Displays a link to the previous page, where the page doesn't exist then - * display the $text - * - * @param string $text - text display: defaults to next - * - **/ - function prevPage($text='prev') - { - if (empty($this->_pageDetails)) { return false; } - if ( !empty($this->_pageDetails['previousPage']) ) - { - if($this->style == 'ajax') - { - $t = $this->Ajax->linkToRemote($text, array("fallback"=>$this->action."#","url" => $this->link.$this->_pageDetails['previousPage'],"update" => "ajax_update","method"=>"get")); - } - else - { - $t = $this->Html->link($text,$this->link.$this->_pageDetails['previousPage']); - } - return $t; - } - return false; - } - /** - * Displays a link to the next page, where the page doesn't exist then - * display the $text - * - * @param string $text - text to display: defaults to next - * - **/ - function nextPage($text='next') - { - if (empty($this->_pageDetails)) { return false; } - if (!empty($this->_pageDetails['nextPage'])) - { - if($this->style == 'ajax') - { - $t = $this->Ajax->linkToRemote($text, array("fallback"=>$this->action."#","url" => $this->link.$this->_pageDetails['nextPage'],"update" => "ajax_update","method"=>"get")); - } - else - { - $t = $this->Html->link($text,$this->link.$this->_pageDetails['nextPage']); - } - return $t; - } - return false; - } - -} -?> diff --git a/webtools/uninstall_survey/views/layouts/default.thtml b/webtools/uninstall_survey/views/layouts/default.thtml index e9faa778af4..e69de29bb2d 100644 --- a/webtools/uninstall_survey/views/layouts/default.thtml +++ b/webtools/uninstall_survey/views/layouts/default.thtml @@ -1,3 +0,0 @@ -renderElement( 'header' ); ?> - -renderElement( 'footer'); ?> diff --git a/webtools/uninstall_survey/views/results/add.thtml b/webtools/uninstall_survey/views/results/add.thtml index 7c6a42e9b8a..e69de29bb2d 100644 --- a/webtools/uninstall_survey/views/results/add.thtml +++ b/webtools/uninstall_survey/views/results/add.thtml @@ -1,44 +0,0 @@ -formTag('/results/add'); ?> - -
-Please note that all data entered on this page may be viewable by the public. -
- - -

How did you intend to use when you installed it?

- $val) : ?> - - input('Intention/text'); - } - - ?> -
- - - - -

Why did you uninstall ? (select all that apply)

- $val) : ?> - - input('Issue/text'); - } - ?> -
- - - -

How can we improve ?

-

Please share your ideas, suggestions or details about any issues below.

-

textarea('Result/comments',array('id'=>'comments'));?>

- -hidden('version', 'value="'.$url_params['version'].'"') ?> -hidden('application', 'value="'.$url_params['application'].'"') ?> -hidden('ua', 'value="'.$url_params['ua'].'"') ?> -hidden('lang', 'value="'.$url_params['lang'].'"') ?> - -

submit('Save') ?>

- diff --git a/webtools/uninstall_survey/views/results/comments.thtml b/webtools/uninstall_survey/views/results/comments.thtml index 5cc69fe50d6..e69de29bb2d 100644 --- a/webtools/uninstall_survey/views/results/comments.thtml +++ b/webtools/uninstall_survey/views/results/comments.thtml @@ -1,72 +0,0 @@ -

name); ?>

- -
- formTag('/results/comments/','get'); ?> - - - - - - - - - - - - - - - - - - - -
- Date format is yyyy-mm-dd. A blank date will use the largest possible range. -
- - - - - - $val) : ?> - - -
Date RecordedComment
niceShort($val['Result']['created']); ?>
- - setPaging($paging)):?> - - - - - -
There is no data available for your parameters. Please review your search criteria.
- - diff --git a/webtools/uninstall_survey/views/results/index.thtml b/webtools/uninstall_survey/views/results/index.thtml index 0e65211e605..e69de29bb2d 100644 --- a/webtools/uninstall_survey/views/results/index.thtml +++ b/webtools/uninstall_survey/views/results/index.thtml @@ -1,116 +0,0 @@ -

name); ?>

- -
- formTag('/results/','get');?> - - - - - - - - - - - - - - - - -
-
- (Date format is yyyy-mm-dd. A blank date will use the largest possible range.) -
-
- - - $val) { - $_total += $val[0]['total']; - } - foreach ($descriptionAndTotalsData as $var => $val) { - // We're putting this in a js string, so escape the double quotes - $_description = str_replace('"','\"',$val['choices']['description']); - $_percentage = intval(($val[0]['total'] / $_total)*100); - - $_dataset .= "[{$_count}, {$val[0]['total']}, \"{$_description} (n={$val[0]['total']}, {$_percentage}%)\"], "; - $_count++; - } - $_dataset = "[{$_dataset}]"; - ?> -
- - - - $val) : ?> - - -
Reason for uninstallingTotal
- -
- - - -
- View Any Associated Comments»
- buildCsvExportString($url_params); - if (!empty($export_url)): - ?> - Download the Complete Dataset»
- -
- - - -
There is no data available for your parameters. Please review your search criteria.
- - diff --git a/webtools/uninstall_survey/webroot/index.php b/webtools/uninstall_survey/webroot/index.php index 2f86ddfeb53..bdcf057b1d0 100644 --- a/webtools/uninstall_survey/webroot/index.php +++ b/webtools/uninstall_survey/webroot/index.php @@ -1,5 +1,5 @@ "; } -?> \ No newline at end of file +?> diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/tests/demo.js b/webtools/uninstall_survey/webroot/js/plotkit-0.8/tests/demo.js deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/tests/svg-sweet.html b/webtools/uninstall_survey/webroot/js/plotkit-0.8/tests/svg-sweet.html deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/tests/svg-sweet.js b/webtools/uninstall_survey/webroot/js/plotkit-0.8/tests/svg-sweet.js deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/tests/svg.html b/webtools/uninstall_survey/webroot/js/plotkit-0.8/tests/svg.html deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/tests/svg.js b/webtools/uninstall_survey/webroot/js/plotkit-0.8/tests/svg.js deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/tests/sweet.html b/webtools/uninstall_survey/webroot/js/plotkit-0.8/tests/sweet.html deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/tests/sweet.js b/webtools/uninstall_survey/webroot/js/plotkit-0.8/tests/sweet.js deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/tests/tests.css b/webtools/uninstall_survey/webroot/js/plotkit-0.8/tests/tests.css deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/tests/testsvg.html b/webtools/uninstall_survey/webroot/js/plotkit-0.8/tests/testsvg.html deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/tests/testsvg.js b/webtools/uninstall_survey/webroot/js/plotkit-0.8/tests/testsvg.js deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/COPYING b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/COPYING similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/COPYING rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/COPYING diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/PlotKit/Base.js b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/PlotKit/Base.js similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/PlotKit/Base.js rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/PlotKit/Base.js diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/PlotKit/Canvas.js b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/PlotKit/Canvas.js similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/PlotKit/Canvas.js rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/PlotKit/Canvas.js diff --git a/webtools/uninstall_survey/config/sql/db_acl.sql b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/PlotKit/EasyPlot.js similarity index 100% rename from webtools/uninstall_survey/config/sql/db_acl.sql rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/PlotKit/EasyPlot.js diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/PlotKit/Layout.js b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/PlotKit/Layout.js similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/PlotKit/Layout.js rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/PlotKit/Layout.js diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/.htaccess b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/PlotKit/PlotKit.js similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/.htaccess rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/PlotKit/PlotKit.js diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/PlotKit/SVG.js b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/PlotKit/PlotKit_Packed.js similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/PlotKit/SVG.js rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/PlotKit/PlotKit_Packed.js diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/PlotKit/SweetCanvas.js b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/PlotKit/SVG.js similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/PlotKit/SweetCanvas.js rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/PlotKit/SVG.js diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/PlotKit/SweetSVG.js b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/PlotKit/SweetCanvas.js similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/PlotKit/SweetSVG.js rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/PlotKit/SweetCanvas.js diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/PlotKit/dummy.svg b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/PlotKit/SweetSVG.js similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/PlotKit/dummy.svg rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/PlotKit/SweetSVG.js diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/PlotKit/iecanvas.htc b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/PlotKit/dummy.svg similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/PlotKit/iecanvas.htc rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/PlotKit/dummy.svg diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/README b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/PlotKit/excanvas.js old mode 100644 new mode 100755 similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/README rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/PlotKit/excanvas.js diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/MochiKitAdditions.html b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/README similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/MochiKitAdditions.html rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/README diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/MochiKitAdditions.txt b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/MochiKitAdditions.html similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/MochiKitAdditions.txt rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/MochiKitAdditions.html diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/PlotKit.Base.html b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/MochiKitAdditions.txt similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/PlotKit.Base.html rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/MochiKitAdditions.txt diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/PlotKit.Base.txt b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/PlotKit.Base.html similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/PlotKit.Base.txt rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/PlotKit.Base.html diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/PlotKit.Canvas.html b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/PlotKit.Base.txt similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/PlotKit.Canvas.html rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/PlotKit.Base.txt diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/PlotKit.Canvas.txt b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/PlotKit.Canvas.html similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/PlotKit.Canvas.txt rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/PlotKit.Canvas.html diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/PlotKit.Layout.html b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/PlotKit.Canvas.txt similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/PlotKit.Layout.html rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/PlotKit.Canvas.txt diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/PlotKit.Layout.txt b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/PlotKit.EasyPlot.html similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/PlotKit.Layout.txt rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/PlotKit.EasyPlot.html diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/PlotKit.QuickStart.html b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/PlotKit.EasyPlot.txt similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/PlotKit.QuickStart.html rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/PlotKit.EasyPlot.txt diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/PlotKit.QuickStart.txt b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/PlotKit.Layout.html similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/PlotKit.QuickStart.txt rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/PlotKit.Layout.html diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/PlotKit.Renderer.html b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/PlotKit.Layout.txt similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/PlotKit.Renderer.html rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/PlotKit.Layout.txt diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/PlotKit.Renderer.txt b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/PlotKit.QuickStart.html similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/PlotKit.Renderer.txt rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/PlotKit.QuickStart.html diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/PlotKit.SVG.html b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/PlotKit.QuickStart.txt similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/PlotKit.SVG.html rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/PlotKit.QuickStart.txt diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/PlotKit.SVG.txt b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/PlotKit.Renderer.html similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/PlotKit.SVG.txt rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/PlotKit.Renderer.html diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/PlotKit.SweetCanvas.html b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/PlotKit.Renderer.txt similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/PlotKit.SweetCanvas.html rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/PlotKit.Renderer.txt diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/PlotKit.SweetCanvas.txt b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/PlotKit.SVG.html similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/PlotKit.SweetCanvas.txt rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/PlotKit.SVG.html diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/PlotKit.SweetSVG.html b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/PlotKit.SVG.txt similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/PlotKit.SweetSVG.html rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/PlotKit.SVG.txt diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/PlotKit.SweetSVG.txt b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/PlotKit.SweetCanvas.html similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/PlotKit.SweetSVG.txt rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/PlotKit.SweetCanvas.html diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/PlotKit.html b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/PlotKit.SweetCanvas.txt similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/PlotKit.html rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/PlotKit.SweetCanvas.txt diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/PlotKit.txt b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/PlotKit.SweetSVG.html similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/PlotKit.txt rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/PlotKit.SweetSVG.html diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/SVGCanvasCompat.html b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/PlotKit.SweetSVG.txt similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/SVGCanvasCompat.html rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/PlotKit.SweetSVG.txt diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/SVGCanvasCompat.txt b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/PlotKit.html similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/SVGCanvasCompat.txt rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/PlotKit.html diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/barsample.png b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/PlotKit.txt similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/barsample.png rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/PlotKit.txt diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/black.png b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/SVGCanvasCompat.html similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/black.png rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/SVGCanvasCompat.html diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/blue.png b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/SVGCanvasCompat.txt similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/blue.png rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/SVGCanvasCompat.txt diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/cyan.png b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/barsample.png similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/cyan.png rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/barsample.png diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/doc.css b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/black.png similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/doc.css rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/black.png diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/generate.py b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/blue.png similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/generate.py rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/blue.png diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/green.png b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/cyan.png similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/green.png rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/cyan.png diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/orange.png b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/doc.css similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/orange.png rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/doc.css diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/piesample.png b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/generate.py similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/piesample.png rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/generate.py diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/purple.png b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/green.png similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/purple.png rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/green.png diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/red.png b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/orange.png similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/doc/red.png rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/orange.png diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/tests/basic.html b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/piesample.png similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/tests/basic.html rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/piesample.png diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/tests/basic.js b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/purple.png similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/tests/basic.js rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/purple.png diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/tests/demo-svg.html b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/red.png similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/tests/demo-svg.html rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/doc/red.png diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/tests/demo-svg.js b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/scripts/custom_rhino.jar similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/tests/demo-svg.js rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/scripts/custom_rhino.jar diff --git a/webtools/uninstall_survey/webroot/js/plotkit-0.8/tests/demo.html b/webtools/uninstall_survey/webroot/js/plotkit-0.9.1/scripts/pack.py similarity index 100% rename from webtools/uninstall_survey/webroot/js/plotkit-0.8/tests/demo.html rename to webtools/uninstall_survey/webroot/js/plotkit-0.9.1/scripts/pack.py