From dd94fc3c1abab9bd46bf3411654922a8ce2a8f82 Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Fri, 8 Aug 2014 12:24:12 -0400 Subject: [PATCH] Work on member import Update scripts. Import members to ds4 --- .gitignore | 2 + .htaccess | 2 +- Toolkit/Members/Import/ActionUpload.php | 20 ++++---- Toolkit/Members/Import/ConversionPage.php | 58 +++++++++++------------ Toolkit/Members/Import/ServerPage.php | 37 +++++++-------- config/server.ini | 2 +- 6 files changed, 60 insertions(+), 61 deletions(-) diff --git a/.gitignore b/.gitignore index 4eb2342..a86e0ec 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,5 @@ editimagespng/ .project .svn nbproject +Toolkit/Members/MemberImport/upload +Toolkit/Members/MemberImport/fileHeaders.txt diff --git a/.htaccess b/.htaccess index dbb0c35..01b639b 100644 --- a/.htaccess +++ b/.htaccess @@ -10,7 +10,7 @@ Deny from all Order allow,deny Deny from all -ErrorDocument 404 /404.html +#ErrorDocument 404 /404.html RewriteEngine On AddDefaultCharset utf-8 diff --git a/Toolkit/Members/Import/ActionUpload.php b/Toolkit/Members/Import/ActionUpload.php index 7b79a14..86ca543 100644 --- a/Toolkit/Members/Import/ActionUpload.php +++ b/Toolkit/Members/Import/ActionUpload.php @@ -2,13 +2,13 @@ /** * Short description for file - * + * * Long description (if any) ... - * + * * PHP version 5 - * + * * The license text... - * + * * @category Members * @package Toolkit_Members * @author Jamie Kahgee @@ -21,9 +21,9 @@ /** * Short description for class - * + * * Long description (if any) ... - * + * * @category Members * @package Toolkit_Members * @author Jamie Kahgee @@ -38,13 +38,13 @@ class Toolkit_Members_Import_ActionUpload extends HTML_QuickForm_Action /** * Short description for function - * + * * Long description (if any) ... - * + * * @param object &$page Parameter description (if any) ... * @param unknown $actionName Parameter description (if any) ... - * @return void - * @access public + * @return void + * @access public */ public function perform(&$page, $actionName) { diff --git a/Toolkit/Members/Import/ConversionPage.php b/Toolkit/Members/Import/ConversionPage.php index 1cc3ffe..cda0605 100644 --- a/Toolkit/Members/Import/ConversionPage.php +++ b/Toolkit/Members/Import/ConversionPage.php @@ -2,13 +2,13 @@ /** * Short description for file - * + * * Long description (if any) ... - * + * * PHP version 5 - * + * * The license text... - * + * * @category Members * @package Toolkit_Members * @author Jamie Kahgee @@ -26,9 +26,9 @@ require_once 'HTML/QuickForm/ElementGrid.php'; /** * Short description for class - * + * * Long description (if any) ... - * + * * @category Members * @package Toolkit_Members * @author Jamie Kahgee @@ -46,10 +46,10 @@ class Toolkit_Members_Import_ConversionPage /** * Short description for function - * + * * Long description (if any) ... - * - * @return void + * + * @return void * @access public */ public function buildForm() @@ -68,10 +68,10 @@ class Toolkit_Members_Import_ConversionPage /** * Short description for function - * + * * Long description (if any) ... - * - * @return void + * + * @return void * @access protected */ protected function configureElements() @@ -144,7 +144,7 @@ class Toolkit_Members_Import_ConversionPage 'seperator' => ' ', 'appendName' => false ); - + $this->setupElements($e); $this->configureElementGrid( 'conversions', @@ -161,10 +161,10 @@ class Toolkit_Members_Import_ConversionPage /** * Short description for function - * + * * Long description (if any) ... - * - * @return void + * + * @return void * @access protected */ protected function configureFilters() @@ -185,16 +185,16 @@ class Toolkit_Members_Import_ConversionPage /** * Short description for configureElementGrid() - * + * * Long description (if any) ... - * + * * @param unknown $eName Parameter description (if any) ... * @param unknown $colNames Parameter description (if any) ... * @param unknown $tables Parameter description (if any) ... * @param unknown $columns Parameter description (if any) ... * @param array $cols Parameter description (if any) ... - * - * @return void + * + * @return void * @access protected */ protected function configureElementGrid( @@ -222,14 +222,14 @@ class Toolkit_Members_Import_ConversionPage null, ' > ' ); - + $select =& $this->createElement( 'hierSelect', $i ); $select->setOptions( array( - $tables, + $tables, $columns, ) ); @@ -240,7 +240,7 @@ class Toolkit_Members_Import_ConversionPage "{$i}_group" ); - $e->addRow(&$rec, ' '); + $e->addRow($rec, ' '); } } @@ -250,11 +250,11 @@ class Toolkit_Members_Import_ConversionPage /** * Short description for function - * + * * Long description (if any) ... - * + * * @param PDO $dbh Databse handler - * + * * @return array $tables * @access protected */ @@ -285,12 +285,12 @@ class Toolkit_Members_Import_ConversionPage /** * Short description for function - * + * * Long description (if any) ... - * + * * @param PDO $dbh Database handler * @param string $table Parameter description (if any) ... - * + * * @return array $cols * @access protected */ diff --git a/Toolkit/Members/Import/ServerPage.php b/Toolkit/Members/Import/ServerPage.php index 2e847e4..3e466fe 100644 --- a/Toolkit/Members/Import/ServerPage.php +++ b/Toolkit/Members/Import/ServerPage.php @@ -2,13 +2,13 @@ /** * Short description for file - * + * * Long description (if any) ... - * + * * PHP version 5 - * + * * The license text... - * + * * @category Members * @package Toolkit_Members * @author Jamie Kahgee @@ -22,9 +22,9 @@ /** * Short description for class - * + * * Long description (if any) ... - * + * * @category Members * @package Toolkit_Members * @author Jamie Kahgee @@ -41,10 +41,10 @@ class Toolkit_Members_Import_ServerPage extends Toolkit_Members_Import_Page /** * Short description for function - * + * * Long description (if any) ... - * - * @return void + * + * @return void * @access public */ public function buildForm() @@ -63,10 +63,10 @@ class Toolkit_Members_Import_ServerPage extends Toolkit_Members_Import_Page /** * Short description for function - * + * * Long description (if any) ... - * - * @return void + * + * @return void * @access protected */ protected function configureElements() @@ -74,10 +74,7 @@ class Toolkit_Members_Import_ServerPage extends Toolkit_Members_Import_Page $hosts = array( '' => '-- Select --', 'localhost' => 'Localhost', - 'devsys' => 'Development Server (devsys)', - 'devsys2' => 'Development Server (devsys2)', - 'ds1' => 'Live Server (ds1)', - 'ds3' => 'Live Server (ds3)', + 'devdb' => 'Development Server (devdb)' ); $e = array(); @@ -100,7 +97,7 @@ class Toolkit_Members_Import_ServerPage extends Toolkit_Members_Import_Page 'name' => $this->getButtonName('next'), 'display' => 'Next Step >>' ); - + $this->setupElements($e); } @@ -110,10 +107,10 @@ class Toolkit_Members_Import_ServerPage extends Toolkit_Members_Import_Page /** * Short description for function - * + * * Long description (if any) ... - * - * @return void + * + * @return void * @access protected */ protected function configureFilters() diff --git a/config/server.ini b/config/server.ini index 83ff1da..d6467d3 100644 --- a/config/server.ini +++ b/config/server.ini @@ -288,7 +288,7 @@ google.maps.key = "ABQIAAAAFEik3hTZkksVQYtPm0OFmRT2yXp_ZAY8_ufC3CFXhHIE1NvwkxQ app.base_url = "http://localhost:8080/app.gaslightmedia.com/" app.base_secure_url = "https://localhost:8080/app.gaslightmedia.com/" -database.params.host = "localhost" +database.params.host = "ds4" email.owner = "vagrant+owner@localhost" email.contact = "vagrant+contact@localhost" -- 2.17.1