Merge branch 'master' of dev.sourcefabric.org:campcaster

.zfproject.xml

@@ -63,6 +63,10 @@
         <controllerFile controllerName="Api">
           <actionMethod actionName="index"/>
         </controllerFile>
+        <controllerFile controllerName="User">
+          <actionMethod actionName="index"/>
+          <actionMethod actionName="addUser"/>
+        </controllerFile>
       </controllersDirectory>
       <formsDirectory>
         <formFile formName="Login"/>
@@ -72,6 +76,7 @@
         <formFile formName="EditAudioMD"/>
         <formFile formName="AddShow"/>
         <formFile formName="ScheduleShow"/>
+        <formFile formName="AddUser"/>
       </formsDirectory>
       <layoutsDirectory enabled="false"/>
       <modelsDirectory/>
@@ -198,6 +203,12 @@
           <viewControllerScriptsDirectory forControllerName="Schedule">
             <viewScriptFile forActionName="clearShow"/>
           </viewControllerScriptsDirectory>
+          <viewControllerScriptsDirectory forControllerName="User">
+            <viewScriptFile forActionName="index"/>
+          </viewControllerScriptsDirectory>
+          <viewControllerScriptsDirectory forControllerName="User">
+            <viewScriptFile forActionName="addUser"/>
+          </viewControllerScriptsDirectory>
         </viewScriptsDirectory>
         <viewHelpersDirectory/>
         <viewFiltersDirectory enabled="false"/>
@@ -239,6 +250,7 @@
           <testApplicationControllerFile filesystemName="LoginControllerTest.php"/>
           <testApplicationControllerFile filesystemName="ScheduleControllerTest.php"/>
           <testApplicationControllerFile filesystemName="ApiControllerTest.php"/>
+          <testApplicationControllerFile filesystemName="UserControllerTest.php"/>
         </testApplicationControllerDirectory>
       </testApplicationDirectory>
       <testLibraryDirectory>

application/configs/ACL.php

@@ -10,6 +10,7 @@ $ccAcl->addRole(new Zend_Acl_Role('guest'))
 
 $ccAcl->add(new Zend_Acl_Resource('library'))
 	  ->add(new Zend_Acl_Resource('index'))
+	  ->add(new Zend_Acl_Resource('user'))
 	  ->add(new Zend_Acl_Resource('error'))
       ->add(new Zend_Acl_Resource('login'))
 	  ->add(new Zend_Acl_Resource('playlist'))
@@ -27,9 +28,12 @@ $ccAcl->allow('guest', 'index')
 	  ->allow('guest', 'api')
       ->allow('host', 'plupload')
 	  ->allow('host', 'playlist')
-      ->allow('host', 'schedule');
+      ->allow('host', 'schedule')
+	  ->allow('admin', 'user');
 
 $aclPlugin = new Zend_Controller_Plugin_Acl($ccAcl);
 
+Zend_View_Helper_Navigation_HelperAbstract::setDefaultAcl($ccAcl);
+
 $front = Zend_Controller_Front::getInstance();
 $front->registerPlugin($aclPlugin);

application/configs/navigation.php

@@ -10,23 +10,31 @@
 $pages = array(
 	array(
 		'label'      => 'Home',
-		'title'      => 'Go Home',
 		'module'     => 'default',
 		'controller' => 'index',
 		'action'     => 'index',
 		'order'      => -100 // make sure home is the first page
 	),
+	array(
+		'label'      => 'Add User',
+		'module'     => 'default',
+		'controller' => 'user',
+		'action'     => 'add-user',
+		'resource'	=>	'user'	
+	),
 	array(
 		'label'      => 'Playlists',
 		'module'     => 'default',
 		'controller' => 'Playlist',
 		'action'     => 'index',
+		'resource'	=>	'playlist',
 		'pages'      => array(
 		    array(
 		        'label'      => 'New',
 		        'module'     => 'default',
 		        'controller' => 'Playlist',
 		        'action'     => 'new',
+				'resource'	=>	'playlist',
 				'visible'    => false
 		    ),
 			array(
@@ -34,6 +42,7 @@ $pages = array(
 		        'module'     => 'default',
 		        'controller' => 'Playlist',
 		        'action'     => 'edit',
+				'resource'	=>	'playlist',
 				'visible'    => false
 		    )
 		)
@@ -43,18 +52,21 @@ $pages = array(
 		'module'     => 'default',
 		'controller' => 'Library',
 		'action'     => 'index',
+		'resource'	=>	'library',
 		'pages'      => array(
 		    array(
 		        'label'      => 'Add Audio',
 		        'module'     => 'default',
 		        'controller' => 'Plupload',
-		        'action'     => 'plupload'
+		        'action'     => 'plupload',
+				'resource'	=>	'plupload'
 		    ),
 			array(
 		        'label'      => 'Search',
 		        'module'     => 'default',
 		        'controller' => 'Search',
-		        'action'     => 'display'
+		        'action'     => 'display',
+				'resource'	=>	'search'
 		    )
 		)
 	),
@@ -68,13 +80,15 @@ $pages = array(
 		'label'      => 'Schedule',
 		'module'     => 'default',
 		'controller' => 'Schedule',
-		'action'     => 'index'
+		'action'     => 'index',
+		'resource'   => 'schedule'
 	),
 	array(
 		'label'      => 'Logout',
 		'module'     => 'default',
 		'controller' => 'Login',
-		'action'     => 'logout'
+		'action'     => 'logout',
+		'resource'	=>	'login'
 	)
 );
  

application/controllers/LoginController.php

@@ -30,25 +30,23 @@ class LoginController extends Zend_Controller_Action
 
                 $authAdapter = $this->getAuthAdapter();
 
-                # get the username and password from the form
+                //get the username and password from the form
                 $username = $form->getValue('username');
                 $password = $form->getValue('password');
 
-                # pass to the adapter the submitted username and password
+                //pass to the adapter the submitted username and password
                 $authAdapter->setIdentity($username)
                             ->setCredential($password);
 
                 $auth = Zend_Auth::getInstance();
                 $result = $auth->authenticate($authAdapter);
 
-                # is the user a valid one?
                 if($result->isValid())
                 {
-                    # all info about this user from the login table
+                    //all info about this user from the login table omit only the password
-                    # omit only the password, we don't need that
                     $userInfo = $authAdapter->getResultRowObject(null, 'password');
 
-                    # the default storage is a session with namespace Zend_Auth
+                    //the default storage is a session with namespace Zend_Auth
                     $authStorage = $auth->getStorage();
                     $authStorage->write($userInfo);
 

application/controllers/ScheduleController.php

@@ -87,6 +87,7 @@ class ScheduleController extends Zend_Controller_Action
 			}     
         }
 		$this->view->form = $form->__toString();
+		$this->view->hosts = User::getHosts();
     }
 
     public function moveShowAction()

application/controllers/UserController.php

@@ -0,0 +1,36 @@
+<?php
+
+class UserController extends Zend_Controller_Action
+{
+
+    public function init()
+    {
+        /* Initialize action controller here */
+    }
+
+    public function indexAction()
+    {
+        // action body
+    }
+
+    public function addUserAction()
+    {
+        $request = $this->getRequest();
+        $form = new Application_Form_AddUser();
+ 
+        if ($request->isPost()) {
+            if ($form->isValid($request->getPost())) {  
+    
+				$formdata = $form->getValues();
+				User::addUser($formdata);
+				$form->reset();
+            }
+        }
+ 
+        $this->view->form = $form;
+    }
+
+}
+
+
+

application/controllers/plugins/Acl_plugin.php

@@ -117,6 +117,8 @@ class Zend_Controller_Plugin_Acl extends Zend_Controller_Plugin_Abstract
 			$this->_roleName = "guest";
 		}
 
+		Zend_View_Helper_Navigation_HelperAbstract::setDefaultRole($this->_roleName);
+
         $resourceName = '';
 
         if ($request->getModuleName() != 'default') {

application/forms/AddShow.php

@@ -91,6 +91,12 @@ class Application_Form_AddShow extends Zend_Form
             'required'   => false,
 		));
 
+		// Add end date element
+        $this->addElement('text', 'hosts_autocomplete', array(
+            'label'      => 'Type a Host:',
+            'required'   => false
+		)); 
+
 		$options = array();
 		$hosts = User::getHosts();
 
@@ -98,7 +104,7 @@ class Application_Form_AddShow extends Zend_Form
 			$options[$host['id']] = $host['login'];
 		}
 
-		$hosts = new Zend_Form_Element_Multiselect('hosts');
+		$hosts = new Zend_Form_Element_MultiCheckbox('hosts');
 		$hosts->setLabel('Hosts:')
 			->setMultiOptions($options)
 			->setRequired(true);

application/forms/AddUser.php

@@ -0,0 +1,60 @@
+<?php
+
+class Application_Form_AddUser extends Zend_Form
+{
+
+    public function init()
+    {
+        // Add login element
+        $this->addElement('text', 'login', array(
+            'label'      => 'Username:',
+            'required'   => true,
+            'filters'    => array('StringTrim'),
+            'validators' => array('NotEmpty')
+        ));
+
+		// Add password element
+        $this->addElement('text', 'password', array(
+            'label'      => 'Password:',
+            'required'   => true,
+            'filters'    => array('StringTrim'),
+            'validators' => array('NotEmpty')
+        ));
+
+		// Add first name element
+        $this->addElement('text', 'first_name', array(
+            'label'      => 'Firstname:',
+            'required'   => true,
+            'filters'    => array('StringTrim'),
+            'validators' => array('NotEmpty')
+        ));
+
+		// Add last name element
+        $this->addElement('text', 'last_name', array(
+            'label'      => 'Lastname:',
+            'required'   => true,
+            'filters'    => array('StringTrim'),
+            'validators' => array('NotEmpty')
+        ));
+
+		//Add type select
+		$this->addElement('select', 'type', array(
+            'required' => true,
+            'multiOptions' => array(
+				"A" => "admin",
+                "H" => "host",
+				"G" => "guest",
+            ), 
+        ));
+
+		// Add the submit button
+        $this->addElement('submit', 'submit', array(
+            'ignore'   => true,
+            'label'    => 'Submit',
+        ));
+
+    }
+
+
+}
+

application/models/Shows.php

@@ -259,10 +259,12 @@ class Show {
 			$sql = $sql_gen ." WHERE ((". $sql_day .") AND (". $sql_range ."))";
 		}
 		if(!is_null($s_time) && !is_null($e_time)) {
-			$sql_time = "(start_time <= '{$s_time}' AND end_time >= '{$e_time}' AND '{$s_time}' < '{$e_time}')
+			$sql_time = "(start_time <= '{$s_time}' AND end_time >= '{$e_time}' AND start_time < end_time AND '{$s_time}' < '{$e_time}')
-				OR (start_time >= '{$s_time}' AND end_time <= '{$e_time}' AND '{$s_time}' > '{$e_time}')
+				OR (start_time >= '{$s_time}' AND end_time <= '{$e_time}' AND start_time > end_time AND '{$s_time}' > '{$e_time}')
 				OR (start_time >= '{$s_time}' AND end_time <= '{$e_time}' AND start_time < end_time)
 				OR (start_time <= '{$s_time}' AND end_time >= '{$e_time}' AND start_time > end_time)
+				OR (start_time <= '{$s_time}' AND end_time <= '{$e_time}' AND start_time > end_time AND '{$s_time}' > '{$e_time}')
+				OR (start_time >= '{$s_time}' AND end_time >= '{$e_time}' AND start_time > end_time AND '{$s_time}' > '{$e_time}')
 				OR (end_time > '{$s_time}' AND end_time <= '{$e_time}')
 				OR (start_time >= '{$s_time}' AND start_time < '{$e_time}')";
 
@@ -371,7 +373,7 @@ class Show {
 		}
 
 		if($this->_user->isAdmin()) {
-			$event["editable"] = true;
+			//$event["editable"] = true;
 		}
 
 		if($this->_user->isHost($show["show_id"])) {

application/models/Users.php

@@ -11,11 +11,11 @@ class User {
 		$this->_userId = $userId;     
     }
 
-	public function getType(){
+	public function getType() {
 		return $this->userRole;
 	}
 
-	public function getId(){
+	public function getId() {
 		return $this->_userId;
 	}
 
@@ -27,12 +27,24 @@ class User {
 		return $this->_userRole === 'A';
 	}
 
+	public static function addUser($data) {
+
+		$user = new CcSubjs();
+		$user->setDbLogin($data['login']);
+		$user->setDbPass(md5($data['password']));
+		$user->setDbFirstName($data['first_name']);
+		$user->setDbLastName($data['last_name']);
+		$user->setDbType($data['type']);
+		$user->save();
+		
+	}
+
 	public static function getUsers($type=NULL) {
 		global $CC_DBC;
 
 		$sql;
 
-		$sql_gen = "SELECT id, login, type FROM cc_subjs";
+		$sql_gen = "SELECT id, login, type FROM cc_subjs ";
 		$sql = $sql_gen;
 
 	
@@ -51,6 +63,8 @@ class User {
 			$sql = $sql_gen ." WHERE ". $sql_type;
 		}
 
+		$sql = $sql . " ORDER BY login";
+	
 		return  $CC_DBC->GetAll($sql);	
 	}
 

application/models/campcaster/map/CcFilesTableMap.php

@@ -39,59 +39,59 @@ class CcFilesTableMap extends TableMap {
 		$this->setPrimaryKeyMethodInfo('cc_files_id_seq');
 		// columns
 		$this->addPrimaryKey('ID', 'DbId', 'INTEGER', true, null, null);
-		$this->addColumn('GUNID', 'Gunid', 'CHAR', true, 32, null);
+		$this->addColumn('GUNID', 'DbGunid', 'CHAR', true, 32, null);
-		$this->addColumn('NAME', 'Name', 'VARCHAR', true, 255, '');
+		$this->addColumn('NAME', 'DbName', 'VARCHAR', true, 255, '');
-		$this->addColumn('MIME', 'Mime', 'VARCHAR', true, 255, '');
+		$this->addColumn('MIME', 'DbMime', 'VARCHAR', true, 255, '');
-		$this->addColumn('FTYPE', 'Ftype', 'VARCHAR', true, 128, '');
+		$this->addColumn('FTYPE', 'DbFtype', 'VARCHAR', true, 128, '');
-		$this->addColumn('FILEPATH', 'filepath', 'LONGVARCHAR', false, null, '');
+		$this->addColumn('FILEPATH', 'DbFilepath', 'LONGVARCHAR', false, null, '');
-		$this->addColumn('STATE', 'State', 'VARCHAR', true, 128, 'empty');
+		$this->addColumn('STATE', 'DbState', 'VARCHAR', true, 128, 'empty');
-		$this->addColumn('CURRENTLYACCESSING', 'Currentlyaccessing', 'INTEGER', true, null, 0);
+		$this->addColumn('CURRENTLYACCESSING', 'DbCurrentlyaccessing', 'INTEGER', true, null, 0);
-		$this->addForeignKey('EDITEDBY', 'Editedby', 'INTEGER', 'cc_subjs', 'ID', false, null, null);
+		$this->addForeignKey('EDITEDBY', 'DbEditedby', 'INTEGER', 'cc_subjs', 'ID', false, null, null);
-		$this->addColumn('MTIME', 'Mtime', 'TIMESTAMP', false, 6, null);
+		$this->addColumn('MTIME', 'DbMtime', 'TIMESTAMP', false, 6, null);
-		$this->addColumn('MD5', 'Md5', 'CHAR', false, 32, null);
+		$this->addColumn('MD5', 'DbMd5', 'CHAR', false, 32, null);
-		$this->addColumn('TRACK_TITLE', 'TrackTitle', 'VARCHAR', false, 512, null);
+		$this->addColumn('TRACK_TITLE', 'DbTrackTitle', 'VARCHAR', false, 512, null);
-		$this->addColumn('ARTIST_NAME', 'ArtistName', 'VARCHAR', false, 512, null);
+		$this->addColumn('ARTIST_NAME', 'DbArtistName', 'VARCHAR', false, 512, null);
-		$this->addColumn('BIT_RATE', 'BitRate', 'VARCHAR', false, 32, null);
+		$this->addColumn('BIT_RATE', 'DbBitRate', 'VARCHAR', false, 32, null);
-		$this->addColumn('SAMPLE_RATE', 'SampleRate', 'VARCHAR', false, 32, null);
+		$this->addColumn('SAMPLE_RATE', 'DbSampleRate', 'VARCHAR', false, 32, null);
-		$this->addColumn('FORMAT', 'Format', 'VARCHAR', false, 128, null);
+		$this->addColumn('FORMAT', 'DbFormat', 'VARCHAR', false, 128, null);
 		$this->addColumn('LENGTH', 'DbLength', 'TIME', false, null, null);
-		$this->addColumn('ALBUM_TITLE', 'AlbumTitle', 'VARCHAR', false, 512, null);
+		$this->addColumn('ALBUM_TITLE', 'DbAlbumTitle', 'VARCHAR', false, 512, null);
-		$this->addColumn('GENRE', 'Genre', 'VARCHAR', false, 64, null);
+		$this->addColumn('GENRE', 'DbGenre', 'VARCHAR', false, 64, null);
-		$this->addColumn('COMMENTS', 'Comments', 'LONGVARCHAR', false, null, null);
+		$this->addColumn('COMMENTS', 'DbComments', 'LONGVARCHAR', false, null, null);
-		$this->addColumn('YEAR', 'Year', 'VARCHAR', false, 16, null);
+		$this->addColumn('YEAR', 'DbYear', 'VARCHAR', false, 16, null);
-		$this->addColumn('TRACK_NUMBER', 'TrackNumber', 'INTEGER', false, null, null);
+		$this->addColumn('TRACK_NUMBER', 'DbTrackNumber', 'INTEGER', false, null, null);
-		$this->addColumn('CHANNELS', 'Channels', 'INTEGER', false, null, null);
+		$this->addColumn('CHANNELS', 'DbChannels', 'INTEGER', false, null, null);
-		$this->addColumn('URL', 'Url', 'VARCHAR', false, 1024, null);
+		$this->addColumn('URL', 'DbUrl', 'VARCHAR', false, 1024, null);
-		$this->addColumn('BPM', 'Bpm', 'VARCHAR', false, 8, null);
+		$this->addColumn('BPM', 'DbBpm', 'VARCHAR', false, 8, null);
-		$this->addColumn('RATING', 'Rating', 'VARCHAR', false, 8, null);
+		$this->addColumn('RATING', 'DbRating', 'VARCHAR', false, 8, null);
-		$this->addColumn('ENCODED_BY', 'EncodedBy', 'VARCHAR', false, 255, null);
+		$this->addColumn('ENCODED_BY', 'DbEncodedBy', 'VARCHAR', false, 255, null);
-		$this->addColumn('DISC_NUMBER', 'DiscNumber', 'VARCHAR', false, 8, null);
+		$this->addColumn('DISC_NUMBER', 'DbDiscNumber', 'VARCHAR', false, 8, null);
-		$this->addColumn('MOOD', 'Mood', 'VARCHAR', false, 64, null);
+		$this->addColumn('MOOD', 'DbMood', 'VARCHAR', false, 64, null);
-		$this->addColumn('LABEL', 'Label', 'VARCHAR', false, 512, null);
+		$this->addColumn('LABEL', 'DbLabel', 'VARCHAR', false, 512, null);
-		$this->addColumn('COMPOSER', 'Composer', 'VARCHAR', false, 512, null);
+		$this->addColumn('COMPOSER', 'DbComposer', 'VARCHAR', false, 512, null);
-		$this->addColumn('ENCODER', 'Encoder', 'VARCHAR', false, 64, null);
+		$this->addColumn('ENCODER', 'DbEncoder', 'VARCHAR', false, 64, null);
-		$this->addColumn('CHECKSUM', 'Checksum', 'VARCHAR', false, 256, null);
+		$this->addColumn('CHECKSUM', 'DbChecksum', 'VARCHAR', false, 256, null);
-		$this->addColumn('LYRICS', 'Lyrics', 'LONGVARCHAR', false, null, null);
+		$this->addColumn('LYRICS', 'DbLyrics', 'LONGVARCHAR', false, null, null);
-		$this->addColumn('ORCHESTRA', 'Orchestra', 'VARCHAR', false, 512, null);
+		$this->addColumn('ORCHESTRA', 'DbOrchestra', 'VARCHAR', false, 512, null);
-		$this->addColumn('CONDUCTOR', 'Conductor', 'VARCHAR', false, 512, null);
+		$this->addColumn('CONDUCTOR', 'DbConductor', 'VARCHAR', false, 512, null);
-		$this->addColumn('LYRICIST', 'Lyricist', 'VARCHAR', false, 512, null);
+		$this->addColumn('LYRICIST', 'DbLyricist', 'VARCHAR', false, 512, null);
-		$this->addColumn('ORIGINAL_LYRICIST', 'OriginalLyricist', 'VARCHAR', false, 512, null);
+		$this->addColumn('ORIGINAL_LYRICIST', 'DbOriginalLyricist', 'VARCHAR', false, 512, null);
-		$this->addColumn('RADIO_STATION_NAME', 'RadioStationName', 'VARCHAR', false, 512, null);
+		$this->addColumn('RADIO_STATION_NAME', 'DbRadioStationName', 'VARCHAR', false, 512, null);
-		$this->addColumn('INFO_URL', 'InfoUrl', 'VARCHAR', false, 512, null);
+		$this->addColumn('INFO_URL', 'DbInfoUrl', 'VARCHAR', false, 512, null);
-		$this->addColumn('ARTIST_URL', 'ArtistUrl', 'VARCHAR', false, 512, null);
+		$this->addColumn('ARTIST_URL', 'DbArtistUrl', 'VARCHAR', false, 512, null);
-		$this->addColumn('AUDIO_SOURCE_URL', 'AudioSourceUrl', 'VARCHAR', false, 512, null);
+		$this->addColumn('AUDIO_SOURCE_URL', 'DbAudioSourceUrl', 'VARCHAR', false, 512, null);
-		$this->addColumn('RADIO_STATION_URL', 'RadioStationUrl', 'VARCHAR', false, 512, null);
+		$this->addColumn('RADIO_STATION_URL', 'DbRadioStationUrl', 'VARCHAR', false, 512, null);
-		$this->addColumn('BUY_THIS_URL', 'BuyThisUrl', 'VARCHAR', false, 512, null);
+		$this->addColumn('BUY_THIS_URL', 'DbBuyThisUrl', 'VARCHAR', false, 512, null);
-		$this->addColumn('ISRC_NUMBER', 'IsrcNumber', 'VARCHAR', false, 512, null);
+		$this->addColumn('ISRC_NUMBER', 'DbIsrcNumber', 'VARCHAR', false, 512, null);
-		$this->addColumn('CATALOG_NUMBER', 'CatalogNumber', 'VARCHAR', false, 512, null);
+		$this->addColumn('CATALOG_NUMBER', 'DbCatalogNumber', 'VARCHAR', false, 512, null);
-		$this->addColumn('ORIGINAL_ARTIST', 'OriginalArtist', 'VARCHAR', false, 512, null);
+		$this->addColumn('ORIGINAL_ARTIST', 'DbOriginalArtist', 'VARCHAR', false, 512, null);
-		$this->addColumn('COPYRIGHT', 'Copyright', 'VARCHAR', false, 512, null);
+		$this->addColumn('COPYRIGHT', 'DbCopyright', 'VARCHAR', false, 512, null);
-		$this->addColumn('REPORT_DATETIME', 'ReportDatetime', 'VARCHAR', false, 32, null);
+		$this->addColumn('REPORT_DATETIME', 'DbReportDatetime', 'VARCHAR', false, 32, null);
-		$this->addColumn('REPORT_LOCATION', 'ReportLocation', 'VARCHAR', false, 512, null);
+		$this->addColumn('REPORT_LOCATION', 'DbReportLocation', 'VARCHAR', false, 512, null);
-		$this->addColumn('REPORT_ORGANIZATION', 'ReportOrganization', 'VARCHAR', false, 512, null);
+		$this->addColumn('REPORT_ORGANIZATION', 'DbReportOrganization', 'VARCHAR', false, 512, null);
-		$this->addColumn('SUBJECT', 'Subject', 'VARCHAR', false, 512, null);
+		$this->addColumn('SUBJECT', 'DbSubject', 'VARCHAR', false, 512, null);
-		$this->addColumn('CONTRIBUTOR', 'Contributor', 'VARCHAR', false, 512, null);
+		$this->addColumn('CONTRIBUTOR', 'DbContributor', 'VARCHAR', false, 512, null);
-		$this->addColumn('LANGUAGE', 'Language', 'VARCHAR', false, 512, null);
+		$this->addColumn('LANGUAGE', 'DbLanguage', 'VARCHAR', false, 512, null);
 		// validators
 	} // initialize()
 

application/models/campcaster/map/CcSubjsTableMap.php

@@ -38,13 +38,14 @@ class CcSubjsTableMap extends TableMap {
 		$this->setUseIdGenerator(true);
 		$this->setPrimaryKeyMethodInfo('cc_subjs_id_seq');
 		// columns
-		$this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null);
+		$this->addPrimaryKey('ID', 'DbId', 'INTEGER', true, null, null);
-		$this->addColumn('LOGIN', 'Login', 'VARCHAR', true, 255, '');
+		$this->addColumn('LOGIN', 'DbLogin', 'VARCHAR', true, 255, '');
-		$this->addColumn('PASS', 'Pass', 'VARCHAR', true, 255, '');
+		$this->addColumn('PASS', 'DbPass', 'VARCHAR', true, 255, '');
-		$this->addColumn('TYPE', 'Type', 'CHAR', true, 1, 'U');
+		$this->addColumn('TYPE', 'DbType', 'CHAR', true, 1, 'U');
-		$this->addColumn('REALNAME', 'Realname', 'VARCHAR', true, 255, '');
+		$this->addColumn('FIRST_NAME', 'DbFirstName', 'VARCHAR', true, 255, '');
-		$this->addColumn('LASTLOGIN', 'Lastlogin', 'TIMESTAMP', false, null, null);
+		$this->addColumn('LAST_NAME', 'DbLastName', 'VARCHAR', true, 255, '');
-		$this->addColumn('LASTFAIL', 'Lastfail', 'TIMESTAMP', false, null, null);
+		$this->addColumn('LASTLOGIN', 'DbLastlogin', 'TIMESTAMP', false, null, null);
+		$this->addColumn('LASTFAIL', 'DbLastfail', 'TIMESTAMP', false, null, null);
 		// validators
 	} // initialize()
 

application/models/campcaster/om/BaseCcAccess.php

@@ -393,7 +393,7 @@ abstract class BaseCcAccess extends BaseObject  implements Persistent
 			$this->modifiedColumns[] = CcAccessPeer::OWNER;
 		}
 
-		if ($this->aCcSubjs !== null && $this->aCcSubjs->getId() !== $v) {
+		if ($this->aCcSubjs !== null && $this->aCcSubjs->getDbId() !== $v) {
 			$this->aCcSubjs = null;
 		}
 
@@ -533,7 +533,7 @@ abstract class BaseCcAccess extends BaseObject  implements Persistent
 	public function ensureConsistency()
 	{
 
-		if ($this->aCcSubjs !== null && $this->owner !== $this->aCcSubjs->getId()) {
+		if ($this->aCcSubjs !== null && $this->owner !== $this->aCcSubjs->getDbId()) {
 			$this->aCcSubjs = null;
 		}
 	} // ensureConsistency
@@ -1137,7 +1137,7 @@ abstract class BaseCcAccess extends BaseObject  implements Persistent
 		if ($v === null) {
 			$this->setOwner(NULL);
 		} else {
-			$this->setOwner($v->getId());
+			$this->setOwner($v->getDbId());
 		}
 
 		$this->aCcSubjs = $v;

application/models/campcaster/om/BaseCcAccessQuery.php

@@ -405,7 +405,7 @@ abstract class BaseCcAccessQuery extends ModelCriteria
 	public function filterByCcSubjs($ccSubjs, $comparison = null)
 	{
 		return $this
-			->addUsingAlias(CcAccessPeer::OWNER, $ccSubjs->getId(), $comparison);
+			->addUsingAlias(CcAccessPeer::OWNER, $ccSubjs->getDbId(), $comparison);
 	}
 
 	/**

application/models/campcaster/om/BaseCcFilesPeer.php

@@ -209,8 +209,8 @@ abstract class BaseCcFilesPeer {
 	 * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
 	 */
 	private static $fieldNames = array (
-		BasePeer::TYPE_PHPNAME => array ('DbId', 'Gunid', 'Name', 'Mime', 'Ftype', 'filepath', 'State', 'Currentlyaccessing', 'Editedby', 'Mtime', 'Md5', 'TrackTitle', 'ArtistName', 'BitRate', 'SampleRate', 'Format', 'DbLength', 'AlbumTitle', 'Genre', 'Comments', 'Year', 'TrackNumber', 'Channels', 'Url', 'Bpm', 'Rating', 'EncodedBy', 'DiscNumber', 'Mood', 'Label', 'Composer', 'Encoder', 'Checksum', 'Lyrics', 'Orchestra', 'Conductor', 'Lyricist', 'OriginalLyricist', 'RadioStationName', 'InfoUrl', 'ArtistUrl', 'AudioSourceUrl', 'RadioStationUrl', 'BuyThisUrl', 'IsrcNumber', 'CatalogNumber', 'OriginalArtist', 'Copyright', 'ReportDatetime', 'ReportLocation', 'ReportOrganization', 'Subject', 'Contributor', 'Language', ),
+		BasePeer::TYPE_PHPNAME => array ('DbId', 'DbGunid', 'DbName', 'DbMime', 'DbFtype', 'DbFilepath', 'DbState', 'DbCurrentlyaccessing', 'DbEditedby', 'DbMtime', 'DbMd5', 'DbTrackTitle', 'DbArtistName', 'DbBitRate', 'DbSampleRate', 'DbFormat', 'DbLength', 'DbAlbumTitle', 'DbGenre', 'DbComments', 'DbYear', 'DbTrackNumber', 'DbChannels', 'DbUrl', 'DbBpm', 'DbRating', 'DbEncodedBy', 'DbDiscNumber', 'DbMood', 'DbLabel', 'DbComposer', 'DbEncoder', 'DbChecksum', 'DbLyrics', 'DbOrchestra', 'DbConductor', 'DbLyricist', 'DbOriginalLyricist', 'DbRadioStationName', 'DbInfoUrl', 'DbArtistUrl', 'DbAudioSourceUrl', 'DbRadioStationUrl', 'DbBuyThisUrl', 'DbIsrcNumber', 'DbCatalogNumber', 'DbOriginalArtist', 'DbCopyright', 'DbReportDatetime', 'DbReportLocation', 'DbReportOrganization', 'DbSubject', 'DbContributor', 'DbLanguage', ),
-		BasePeer::TYPE_STUDLYPHPNAME => array ('dbId', 'gunid', 'name', 'mime', 'ftype', 'filepath', 'state', 'currentlyaccessing', 'editedby', 'mtime', 'md5', 'trackTitle', 'artistName', 'bitRate', 'sampleRate', 'format', 'dbLength', 'albumTitle', 'genre', 'comments', 'year', 'trackNumber', 'channels', 'url', 'bpm', 'rating', 'encodedBy', 'discNumber', 'mood', 'label', 'composer', 'encoder', 'checksum', 'lyrics', 'orchestra', 'conductor', 'lyricist', 'originalLyricist', 'radioStationName', 'infoUrl', 'artistUrl', 'audioSourceUrl', 'radioStationUrl', 'buyThisUrl', 'isrcNumber', 'catalogNumber', 'originalArtist', 'copyright', 'reportDatetime', 'reportLocation', 'reportOrganization', 'subject', 'contributor', 'language', ),
+		BasePeer::TYPE_STUDLYPHPNAME => array ('dbId', 'dbGunid', 'dbName', 'dbMime', 'dbFtype', 'dbFilepath', 'dbState', 'dbCurrentlyaccessing', 'dbEditedby', 'dbMtime', 'dbMd5', 'dbTrackTitle', 'dbArtistName', 'dbBitRate', 'dbSampleRate', 'dbFormat', 'dbLength', 'dbAlbumTitle', 'dbGenre', 'dbComments', 'dbYear', 'dbTrackNumber', 'dbChannels', 'dbUrl', 'dbBpm', 'dbRating', 'dbEncodedBy', 'dbDiscNumber', 'dbMood', 'dbLabel', 'dbComposer', 'dbEncoder', 'dbChecksum', 'dbLyrics', 'dbOrchestra', 'dbConductor', 'dbLyricist', 'dbOriginalLyricist', 'dbRadioStationName', 'dbInfoUrl', 'dbArtistUrl', 'dbAudioSourceUrl', 'dbRadioStationUrl', 'dbBuyThisUrl', 'dbIsrcNumber', 'dbCatalogNumber', 'dbOriginalArtist', 'dbCopyright', 'dbReportDatetime', 'dbReportLocation', 'dbReportOrganization', 'dbSubject', 'dbContributor', 'dbLanguage', ),
 		BasePeer::TYPE_COLNAME => array (self::ID, self::GUNID, self::NAME, self::MIME, self::FTYPE, self::FILEPATH, self::STATE, self::CURRENTLYACCESSING, self::EDITEDBY, self::MTIME, self::MD5, self::TRACK_TITLE, self::ARTIST_NAME, self::BIT_RATE, self::SAMPLE_RATE, self::FORMAT, self::LENGTH, self::ALBUM_TITLE, self::GENRE, self::COMMENTS, self::YEAR, self::TRACK_NUMBER, self::CHANNELS, self::URL, self::BPM, self::RATING, self::ENCODED_BY, self::DISC_NUMBER, self::MOOD, self::LABEL, self::COMPOSER, self::ENCODER, self::CHECKSUM, self::LYRICS, self::ORCHESTRA, self::CONDUCTOR, self::LYRICIST, self::ORIGINAL_LYRICIST, self::RADIO_STATION_NAME, self::INFO_URL, self::ARTIST_URL, self::AUDIO_SOURCE_URL, self::RADIO_STATION_URL, self::BUY_THIS_URL, self::ISRC_NUMBER, self::CATALOG_NUMBER, self::ORIGINAL_ARTIST, self::COPYRIGHT, self::REPORT_DATETIME, self::REPORT_LOCATION, self::REPORT_ORGANIZATION, self::SUBJECT, self::CONTRIBUTOR, self::LANGUAGE, ),
 		BasePeer::TYPE_RAW_COLNAME => array ('ID', 'GUNID', 'NAME', 'MIME', 'FTYPE', 'FILEPATH', 'STATE', 'CURRENTLYACCESSING', 'EDITEDBY', 'MTIME', 'MD5', 'TRACK_TITLE', 'ARTIST_NAME', 'BIT_RATE', 'SAMPLE_RATE', 'FORMAT', 'LENGTH', 'ALBUM_TITLE', 'GENRE', 'COMMENTS', 'YEAR', 'TRACK_NUMBER', 'CHANNELS', 'URL', 'BPM', 'RATING', 'ENCODED_BY', 'DISC_NUMBER', 'MOOD', 'LABEL', 'COMPOSER', 'ENCODER', 'CHECKSUM', 'LYRICS', 'ORCHESTRA', 'CONDUCTOR', 'LYRICIST', 'ORIGINAL_LYRICIST', 'RADIO_STATION_NAME', 'INFO_URL', 'ARTIST_URL', 'AUDIO_SOURCE_URL', 'RADIO_STATION_URL', 'BUY_THIS_URL', 'ISRC_NUMBER', 'CATALOG_NUMBER', 'ORIGINAL_ARTIST', 'COPYRIGHT', 'REPORT_DATETIME', 'REPORT_LOCATION', 'REPORT_ORGANIZATION', 'SUBJECT', 'CONTRIBUTOR', 'LANGUAGE', ),
 		BasePeer::TYPE_FIELDNAME => array ('id', 'gunid', 'name', 'mime', 'ftype', 'filepath', 'state', 'currentlyaccessing', 'editedby', 'mtime', 'md5', 'track_title', 'artist_name', 'bit_rate', 'sample_rate', 'format', 'length', 'album_title', 'genre', 'comments', 'year', 'track_number', 'channels', 'url', 'bpm', 'rating', 'encoded_by', 'disc_number', 'mood', 'label', 'composer', 'encoder', 'checksum', 'lyrics', 'orchestra', 'conductor', 'lyricist', 'original_lyricist', 'radio_station_name', 'info_url', 'artist_url', 'audio_source_url', 'radio_station_url', 'buy_this_url', 'isrc_number', 'catalog_number', 'original_artist', 'copyright', 'report_datetime', 'report_location', 'report_organization', 'subject', 'contributor', 'language', ),
@@ -224,8 +224,8 @@ abstract class BaseCcFilesPeer {
 	 * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
 	 */
 	private static $fieldKeys = array (
-		BasePeer::TYPE_PHPNAME => array ('DbId' => 0, 'Gunid' => 1, 'Name' => 2, 'Mime' => 3, 'Ftype' => 4, 'filepath' => 5, 'State' => 6, 'Currentlyaccessing' => 7, 'Editedby' => 8, 'Mtime' => 9, 'Md5' => 10, 'TrackTitle' => 11, 'ArtistName' => 12, 'BitRate' => 13, 'SampleRate' => 14, 'Format' => 15, 'DbLength' => 16, 'AlbumTitle' => 17, 'Genre' => 18, 'Comments' => 19, 'Year' => 20, 'TrackNumber' => 21, 'Channels' => 22, 'Url' => 23, 'Bpm' => 24, 'Rating' => 25, 'EncodedBy' => 26, 'DiscNumber' => 27, 'Mood' => 28, 'Label' => 29, 'Composer' => 30, 'Encoder' => 31, 'Checksum' => 32, 'Lyrics' => 33, 'Orchestra' => 34, 'Conductor' => 35, 'Lyricist' => 36, 'OriginalLyricist' => 37, 'RadioStationName' => 38, 'InfoUrl' => 39, 'ArtistUrl' => 40, 'AudioSourceUrl' => 41, 'RadioStationUrl' => 42, 'BuyThisUrl' => 43, 'IsrcNumber' => 44, 'CatalogNumber' => 45, 'OriginalArtist' => 46, 'Copyright' => 47, 'ReportDatetime' => 48, 'ReportLocation' => 49, 'ReportOrganization' => 50, 'Subject' => 51, 'Contributor' => 52, 'Language' => 53, ),
+		BasePeer::TYPE_PHPNAME => array ('DbId' => 0, 'DbGunid' => 1, 'DbName' => 2, 'DbMime' => 3, 'DbFtype' => 4, 'DbFilepath' => 5, 'DbState' => 6, 'DbCurrentlyaccessing' => 7, 'DbEditedby' => 8, 'DbMtime' => 9, 'DbMd5' => 10, 'DbTrackTitle' => 11, 'DbArtistName' => 12, 'DbBitRate' => 13, 'DbSampleRate' => 14, 'DbFormat' => 15, 'DbLength' => 16, 'DbAlbumTitle' => 17, 'DbGenre' => 18, 'DbComments' => 19, 'DbYear' => 20, 'DbTrackNumber' => 21, 'DbChannels' => 22, 'DbUrl' => 23, 'DbBpm' => 24, 'DbRating' => 25, 'DbEncodedBy' => 26, 'DbDiscNumber' => 27, 'DbMood' => 28, 'DbLabel' => 29, 'DbComposer' => 30, 'DbEncoder' => 31, 'DbChecksum' => 32, 'DbLyrics' => 33, 'DbOrchestra' => 34, 'DbConductor' => 35, 'DbLyricist' => 36, 'DbOriginalLyricist' => 37, 'DbRadioStationName' => 38, 'DbInfoUrl' => 39, 'DbArtistUrl' => 40, 'DbAudioSourceUrl' => 41, 'DbRadioStationUrl' => 42, 'DbBuyThisUrl' => 43, 'DbIsrcNumber' => 44, 'DbCatalogNumber' => 45, 'DbOriginalArtist' => 46, 'DbCopyright' => 47, 'DbReportDatetime' => 48, 'DbReportLocation' => 49, 'DbReportOrganization' => 50, 'DbSubject' => 51, 'DbContributor' => 52, 'DbLanguage' => 53, ),
-		BasePeer::TYPE_STUDLYPHPNAME => array ('dbId' => 0, 'gunid' => 1, 'name' => 2, 'mime' => 3, 'ftype' => 4, 'filepath' => 5, 'state' => 6, 'currentlyaccessing' => 7, 'editedby' => 8, 'mtime' => 9, 'md5' => 10, 'trackTitle' => 11, 'artistName' => 12, 'bitRate' => 13, 'sampleRate' => 14, 'format' => 15, 'dbLength' => 16, 'albumTitle' => 17, 'genre' => 18, 'comments' => 19, 'year' => 20, 'trackNumber' => 21, 'channels' => 22, 'url' => 23, 'bpm' => 24, 'rating' => 25, 'encodedBy' => 26, 'discNumber' => 27, 'mood' => 28, 'label' => 29, 'composer' => 30, 'encoder' => 31, 'checksum' => 32, 'lyrics' => 33, 'orchestra' => 34, 'conductor' => 35, 'lyricist' => 36, 'originalLyricist' => 37, 'radioStationName' => 38, 'infoUrl' => 39, 'artistUrl' => 40, 'audioSourceUrl' => 41, 'radioStationUrl' => 42, 'buyThisUrl' => 43, 'isrcNumber' => 44, 'catalogNumber' => 45, 'originalArtist' => 46, 'copyright' => 47, 'reportDatetime' => 48, 'reportLocation' => 49, 'reportOrganization' => 50, 'subject' => 51, 'contributor' => 52, 'language' => 53, ),
+		BasePeer::TYPE_STUDLYPHPNAME => array ('dbId' => 0, 'dbGunid' => 1, 'dbName' => 2, 'dbMime' => 3, 'dbFtype' => 4, 'dbFilepath' => 5, 'dbState' => 6, 'dbCurrentlyaccessing' => 7, 'dbEditedby' => 8, 'dbMtime' => 9, 'dbMd5' => 10, 'dbTrackTitle' => 11, 'dbArtistName' => 12, 'dbBitRate' => 13, 'dbSampleRate' => 14, 'dbFormat' => 15, 'dbLength' => 16, 'dbAlbumTitle' => 17, 'dbGenre' => 18, 'dbComments' => 19, 'dbYear' => 20, 'dbTrackNumber' => 21, 'dbChannels' => 22, 'dbUrl' => 23, 'dbBpm' => 24, 'dbRating' => 25, 'dbEncodedBy' => 26, 'dbDiscNumber' => 27, 'dbMood' => 28, 'dbLabel' => 29, 'dbComposer' => 30, 'dbEncoder' => 31, 'dbChecksum' => 32, 'dbLyrics' => 33, 'dbOrchestra' => 34, 'dbConductor' => 35, 'dbLyricist' => 36, 'dbOriginalLyricist' => 37, 'dbRadioStationName' => 38, 'dbInfoUrl' => 39, 'dbArtistUrl' => 40, 'dbAudioSourceUrl' => 41, 'dbRadioStationUrl' => 42, 'dbBuyThisUrl' => 43, 'dbIsrcNumber' => 44, 'dbCatalogNumber' => 45, 'dbOriginalArtist' => 46, 'dbCopyright' => 47, 'dbReportDatetime' => 48, 'dbReportLocation' => 49, 'dbReportOrganization' => 50, 'dbSubject' => 51, 'dbContributor' => 52, 'dbLanguage' => 53, ),
 		BasePeer::TYPE_COLNAME => array (self::ID => 0, self::GUNID => 1, self::NAME => 2, self::MIME => 3, self::FTYPE => 4, self::FILEPATH => 5, self::STATE => 6, self::CURRENTLYACCESSING => 7, self::EDITEDBY => 8, self::MTIME => 9, self::MD5 => 10, self::TRACK_TITLE => 11, self::ARTIST_NAME => 12, self::BIT_RATE => 13, self::SAMPLE_RATE => 14, self::FORMAT => 15, self::LENGTH => 16, self::ALBUM_TITLE => 17, self::GENRE => 18, self::COMMENTS => 19, self::YEAR => 20, self::TRACK_NUMBER => 21, self::CHANNELS => 22, self::URL => 23, self::BPM => 24, self::RATING => 25, self::ENCODED_BY => 26, self::DISC_NUMBER => 27, self::MOOD => 28, self::LABEL => 29, self::COMPOSER => 30, self::ENCODER => 31, self::CHECKSUM => 32, self::LYRICS => 33, self::ORCHESTRA => 34, self::CONDUCTOR => 35, self::LYRICIST => 36, self::ORIGINAL_LYRICIST => 37, self::RADIO_STATION_NAME => 38, self::INFO_URL => 39, self::ARTIST_URL => 40, self::AUDIO_SOURCE_URL => 41, self::RADIO_STATION_URL => 42, self::BUY_THIS_URL => 43, self::ISRC_NUMBER => 44, self::CATALOG_NUMBER => 45, self::ORIGINAL_ARTIST => 46, self::COPYRIGHT => 47, self::REPORT_DATETIME => 48, self::REPORT_LOCATION => 49, self::REPORT_ORGANIZATION => 50, self::SUBJECT => 51, self::CONTRIBUTOR => 52, self::LANGUAGE => 53, ),
 		BasePeer::TYPE_RAW_COLNAME => array ('ID' => 0, 'GUNID' => 1, 'NAME' => 2, 'MIME' => 3, 'FTYPE' => 4, 'FILEPATH' => 5, 'STATE' => 6, 'CURRENTLYACCESSING' => 7, 'EDITEDBY' => 8, 'MTIME' => 9, 'MD5' => 10, 'TRACK_TITLE' => 11, 'ARTIST_NAME' => 12, 'BIT_RATE' => 13, 'SAMPLE_RATE' => 14, 'FORMAT' => 15, 'LENGTH' => 16, 'ALBUM_TITLE' => 17, 'GENRE' => 18, 'COMMENTS' => 19, 'YEAR' => 20, 'TRACK_NUMBER' => 21, 'CHANNELS' => 22, 'URL' => 23, 'BPM' => 24, 'RATING' => 25, 'ENCODED_BY' => 26, 'DISC_NUMBER' => 27, 'MOOD' => 28, 'LABEL' => 29, 'COMPOSER' => 30, 'ENCODER' => 31, 'CHECKSUM' => 32, 'LYRICS' => 33, 'ORCHESTRA' => 34, 'CONDUCTOR' => 35, 'LYRICIST' => 36, 'ORIGINAL_LYRICIST' => 37, 'RADIO_STATION_NAME' => 38, 'INFO_URL' => 39, 'ARTIST_URL' => 40, 'AUDIO_SOURCE_URL' => 41, 'RADIO_STATION_URL' => 42, 'BUY_THIS_URL' => 43, 'ISRC_NUMBER' => 44, 'CATALOG_NUMBER' => 45, 'ORIGINAL_ARTIST' => 46, 'COPYRIGHT' => 47, 'REPORT_DATETIME' => 48, 'REPORT_LOCATION' => 49, 'REPORT_ORGANIZATION' => 50, 'SUBJECT' => 51, 'CONTRIBUTOR' => 52, 'LANGUAGE' => 53, ),
 		BasePeer::TYPE_FIELDNAME => array ('id' => 0, 'gunid' => 1, 'name' => 2, 'mime' => 3, 'ftype' => 4, 'filepath' => 5, 'state' => 6, 'currentlyaccessing' => 7, 'editedby' => 8, 'mtime' => 9, 'md5' => 10, 'track_title' => 11, 'artist_name' => 12, 'bit_rate' => 13, 'sample_rate' => 14, 'format' => 15, 'length' => 16, 'album_title' => 17, 'genre' => 18, 'comments' => 19, 'year' => 20, 'track_number' => 21, 'channels' => 22, 'url' => 23, 'bpm' => 24, 'rating' => 25, 'encoded_by' => 26, 'disc_number' => 27, 'mood' => 28, 'label' => 29, 'composer' => 30, 'encoder' => 31, 'checksum' => 32, 'lyrics' => 33, 'orchestra' => 34, 'conductor' => 35, 'lyricist' => 36, 'original_lyricist' => 37, 'radio_station_name' => 38, 'info_url' => 39, 'artist_url' => 40, 'audio_source_url' => 41, 'radio_station_url' => 42, 'buy_this_url' => 43, 'isrc_number' => 44, 'catalog_number' => 45, 'original_artist' => 46, 'copyright' => 47, 'report_datetime' => 48, 'report_location' => 49, 'report_organization' => 50, 'subject' => 51, 'contributor' => 52, 'language' => 53, ),

application/models/campcaster/om/BaseCcPerms.php

@@ -160,7 +160,7 @@ abstract class BaseCcPerms extends BaseObject  implements Persistent
 			$this->modifiedColumns[] = CcPermsPeer::SUBJ;
 		}
 
-		if ($this->aCcSubjs !== null && $this->aCcSubjs->getId() !== $v) {
+		if ($this->aCcSubjs !== null && $this->aCcSubjs->getDbId() !== $v) {
 			$this->aCcSubjs = null;
 		}
 
@@ -295,7 +295,7 @@ abstract class BaseCcPerms extends BaseObject  implements Persistent
 	public function ensureConsistency()
 	{
 
-		if ($this->aCcSubjs !== null && $this->subj !== $this->aCcSubjs->getId()) {
+		if ($this->aCcSubjs !== null && $this->subj !== $this->aCcSubjs->getDbId()) {
 			$this->aCcSubjs = null;
 		}
 	} // ensureConsistency
@@ -851,7 +851,7 @@ abstract class BaseCcPerms extends BaseObject  implements Persistent
 		if ($v === null) {
 			$this->setSubj(NULL);
 		} else {
-			$this->setSubj($v->getId());
+			$this->setSubj($v->getDbId());
 		}
 
 		$this->aCcSubjs = $v;

application/models/campcaster/om/BaseCcPermsQuery.php

@@ -283,7 +283,7 @@ abstract class BaseCcPermsQuery extends ModelCriteria
 	public function filterByCcSubjs($ccSubjs, $comparison = null)
 	{
 		return $this
-			->addUsingAlias(CcPermsPeer::SUBJ, $ccSubjs->getId(), $comparison);
+			->addUsingAlias(CcPermsPeer::SUBJ, $ccSubjs->getDbId(), $comparison);
 	}
 
 	/**

application/models/campcaster/om/BaseCcPlaylist.php

@@ -322,7 +322,7 @@ abstract class BaseCcPlaylist extends BaseObject  implements Persistent
 			$this->modifiedColumns[] = CcPlaylistPeer::EDITEDBY;
 		}
 
-		if ($this->aCcSubjs !== null && $this->aCcSubjs->getId() !== $v) {
+		if ($this->aCcSubjs !== null && $this->aCcSubjs->getDbId() !== $v) {
 			$this->aCcSubjs = null;
 		}
 
@@ -501,7 +501,7 @@ abstract class BaseCcPlaylist extends BaseObject  implements Persistent
 	public function ensureConsistency()
 	{
 
-		if ($this->aCcSubjs !== null && $this->editedby !== $this->aCcSubjs->getId()) {
+		if ($this->aCcSubjs !== null && $this->editedby !== $this->aCcSubjs->getDbId()) {
 			$this->aCcSubjs = null;
 		}
 	} // ensureConsistency
@@ -1127,7 +1127,7 @@ abstract class BaseCcPlaylist extends BaseObject  implements Persistent
 		if ($v === null) {
 			$this->setDbEditedby(NULL);
 		} else {
-			$this->setDbEditedby($v->getId());
+			$this->setDbEditedby($v->getDbId());
 		}
 
 		$this->aCcSubjs = $v;

application/models/campcaster/om/BaseCcPlaylistQuery.php

@@ -374,7 +374,7 @@ abstract class BaseCcPlaylistQuery extends ModelCriteria
 	public function filterByCcSubjs($ccSubjs, $comparison = null)
 	{
 		return $this
-			->addUsingAlias(CcPlaylistPeer::EDITEDBY, $ccSubjs->getId(), $comparison);
+			->addUsingAlias(CcPlaylistPeer::EDITEDBY, $ccSubjs->getDbId(), $comparison);
 	}
 
 	/**

application/models/campcaster/om/BaseCcPref.php

@@ -144,7 +144,7 @@ abstract class BaseCcPref extends BaseObject  implements Persistent
 			$this->modifiedColumns[] = CcPrefPeer::SUBJID;
 		}
 
-		if ($this->aCcSubjs !== null && $this->aCcSubjs->getId() !== $v) {
+		if ($this->aCcSubjs !== null && $this->aCcSubjs->getDbId() !== $v) {
 			$this->aCcSubjs = null;
 		}
 
@@ -258,7 +258,7 @@ abstract class BaseCcPref extends BaseObject  implements Persistent
 	public function ensureConsistency()
 	{
 
-		if ($this->aCcSubjs !== null && $this->subjid !== $this->aCcSubjs->getId()) {
+		if ($this->aCcSubjs !== null && $this->subjid !== $this->aCcSubjs->getDbId()) {
 			$this->aCcSubjs = null;
 		}
 	} // ensureConsistency
@@ -812,7 +812,7 @@ abstract class BaseCcPref extends BaseObject  implements Persistent
 		if ($v === null) {
 			$this->setSubjid(NULL);
 		} else {
-			$this->setSubjid($v->getId());
+			$this->setSubjid($v->getDbId());
 		}
 
 		$this->aCcSubjs = $v;

application/models/campcaster/om/BaseCcPrefQuery.php

@@ -248,7 +248,7 @@ abstract class BaseCcPrefQuery extends ModelCriteria
 	public function filterByCcSubjs($ccSubjs, $comparison = null)
 	{
 		return $this
-			->addUsingAlias(CcPrefPeer::SUBJID, $ccSubjs->getId(), $comparison);
+			->addUsingAlias(CcPrefPeer::SUBJID, $ccSubjs->getDbId(), $comparison);
 	}
 
 	/**

application/models/campcaster/om/BaseCcSess.php

@@ -167,7 +167,7 @@ abstract class BaseCcSess extends BaseObject  implements Persistent
 			$this->modifiedColumns[] = CcSessPeer::USERID;
 		}
 
-		if ($this->aCcSubjs !== null && $this->aCcSubjs->getId() !== $v) {
+		if ($this->aCcSubjs !== null && $this->aCcSubjs->getDbId() !== $v) {
 			$this->aCcSubjs = null;
 		}
 
@@ -310,7 +310,7 @@ abstract class BaseCcSess extends BaseObject  implements Persistent
 	public function ensureConsistency()
 	{
 
-		if ($this->aCcSubjs !== null && $this->userid !== $this->aCcSubjs->getId()) {
+		if ($this->aCcSubjs !== null && $this->userid !== $this->aCcSubjs->getDbId()) {
 			$this->aCcSubjs = null;
 		}
 	} // ensureConsistency
@@ -856,7 +856,7 @@ abstract class BaseCcSess extends BaseObject  implements Persistent
 		if ($v === null) {
 			$this->setUserid(NULL);
 		} else {
-			$this->setUserid($v->getId());
+			$this->setUserid($v->getDbId());
 		}
 
 		$this->aCcSubjs = $v;

application/models/campcaster/om/BaseCcSessQuery.php

@@ -262,7 +262,7 @@ abstract class BaseCcSessQuery extends ModelCriteria
 	public function filterByCcSubjs($ccSubjs, $comparison = null)
 	{
 		return $this
-			->addUsingAlias(CcSessPeer::USERID, $ccSubjs->getId(), $comparison);
+			->addUsingAlias(CcSessPeer::USERID, $ccSubjs->getDbId(), $comparison);
 	}
 
 	/**

application/models/campcaster/om/BaseCcShowHosts.php

@@ -157,7 +157,7 @@ abstract class BaseCcShowHosts extends BaseObject  implements Persistent
 			$this->modifiedColumns[] = CcShowHostsPeer::SUBJS_ID;
 		}
 
-		if ($this->aCcSubjs !== null && $this->aCcSubjs->getId() !== $v) {
+		if ($this->aCcSubjs !== null && $this->aCcSubjs->getDbId() !== $v) {
 			$this->aCcSubjs = null;
 		}
 
@@ -233,7 +233,7 @@ abstract class BaseCcShowHosts extends BaseObject  implements Persistent
 		if ($this->aCcShow !== null && $this->show_id !== $this->aCcShow->getDbId()) {
 			$this->aCcShow = null;
 		}
-		if ($this->aCcSubjs !== null && $this->subjs_id !== $this->aCcSubjs->getId()) {
+		if ($this->aCcSubjs !== null && $this->subjs_id !== $this->aCcSubjs->getDbId()) {
 			$this->aCcSubjs = null;
 		}
 	} // ensureConsistency
@@ -843,7 +843,7 @@ abstract class BaseCcShowHosts extends BaseObject  implements Persistent
 		if ($v === null) {
 			$this->setDbHost(NULL);
 		} else {
-			$this->setDbHost($v->getId());
+			$this->setDbHost($v->getDbId());
 		}
 
 		$this->aCcSubjs = $v;

application/models/campcaster/om/BaseCcShowHostsQuery.php

@@ -299,7 +299,7 @@ abstract class BaseCcShowHostsQuery extends ModelCriteria
 	public function filterByCcSubjs($ccSubjs, $comparison = null)
 	{
 		return $this
-			->addUsingAlias(CcShowHostsPeer::SUBJS_ID, $ccSubjs->getId(), $comparison);
+			->addUsingAlias(CcShowHostsPeer::SUBJS_ID, $ccSubjs->getDbId(), $comparison);
 	}
 
 	/**

application/models/campcaster/om/BaseCcSubjs.php

@@ -52,11 +52,18 @@ abstract class BaseCcSubjs extends BaseObject  implements Persistent
 	protected $type;
 
 	/**
-	 * The value for the realname field.
+	 * The value for the first_name field.
 	 * Note: this column has a database default value of: ''
 	 * @var        string
 	 */
-	protected $realname;
+	protected $first_name;
+
+	/**
+	 * The value for the last_name field.
+	 * Note: this column has a database default value of: ''
+	 * @var        string
+	 */
+	protected $last_name;
 
 	/**
 	 * The value for the lastlogin field.
@@ -130,7 +137,8 @@ abstract class BaseCcSubjs extends BaseObject  implements Persistent
 		$this->login = '';
 		$this->pass = '';
 		$this->type = 'U';
-		$this->realname = '';
+		$this->first_name = '';
+		$this->last_name = '';
 	}
 
 	/**
@@ -148,7 +156,7 @@ abstract class BaseCcSubjs extends BaseObject  implements Persistent
 	 * 
 	 * @return     int
 	 */
-	public function getId()
+	public function getDbId()
 	{
 		return $this->id;
 	}
@@ -158,7 +166,7 @@ abstract class BaseCcSubjs extends BaseObject  implements Persistent
 	 * 
 	 * @return     string
 	 */
-	public function getLogin()
+	public function getDbLogin()
 	{
 		return $this->login;
 	}
@@ -168,7 +176,7 @@ abstract class BaseCcSubjs extends BaseObject  implements Persistent
 	 * 
 	 * @return     string
 	 */
-	public function getPass()
+	public function getDbPass()
 	{
 		return $this->pass;
 	}
@@ -178,19 +186,29 @@ abstract class BaseCcSubjs extends BaseObject  implements Persistent
 	 * 
 	 * @return     string
 	 */
-	public function getType()
+	public function getDbType()
 	{
 		return $this->type;
 	}
 
 	/**
-	 * Get the [realname] column value.
+	 * Get the [first_name] column value.
 	 * 
 	 * @return     string
 	 */
-	public function getRealname()
+	public function getDbFirstName()
 	{
-		return $this->realname;
+		return $this->first_name;
+	}
+
+	/**
+	 * Get the [last_name] column value.
+	 * 
+	 * @return     string
+	 */
+	public function getDbLastName()
+	{
+		return $this->last_name;
 	}
 
 	/**
@@ -202,7 +220,7 @@ abstract class BaseCcSubjs extends BaseObject  implements Persistent
 	 * @return     mixed Formatted date/time value as string or DateTime object (if format is NULL), NULL if column is NULL
 	 * @throws     PropelException - if unable to parse/validate the date/time value.
 	 */
-	public function getLastlogin($format = 'Y-m-d H:i:s')
+	public function getDbLastlogin($format = 'Y-m-d H:i:s')
 	{
 		if ($this->lastlogin === null) {
 			return null;
@@ -235,7 +253,7 @@ abstract class BaseCcSubjs extends BaseObject  implements Persistent
 	 * @return     mixed Formatted date/time value as string or DateTime object (if format is NULL), NULL if column is NULL
 	 * @throws     PropelException - if unable to parse/validate the date/time value.
 	 */
-	public function getLastfail($format = 'Y-m-d H:i:s')
+	public function getDbLastfail($format = 'Y-m-d H:i:s')
 	{
 		if ($this->lastfail === null) {
 			return null;
@@ -265,7 +283,7 @@ abstract class BaseCcSubjs extends BaseObject  implements Persistent
 	 * @param      int $v new value
 	 * @return     CcSubjs The current object (for fluent API support)
 	 */
-	public function setId($v)
+	public function setDbId($v)
 	{
 		if ($v !== null) {
 			$v = (int) $v;
@@ -277,7 +295,7 @@ abstract class BaseCcSubjs extends BaseObject  implements Persistent
 		}
 
 		return $this;
-	} // setId()
+	} // setDbId()
 
 	/**
 	 * Set the value of [login] column.
@@ -285,7 +303,7 @@ abstract class BaseCcSubjs extends BaseObject  implements Persistent
 	 * @param      string $v new value
 	 * @return     CcSubjs The current object (for fluent API support)
 	 */
-	public function setLogin($v)
+	public function setDbLogin($v)
 	{
 		if ($v !== null) {
 			$v = (string) $v;
@@ -297,7 +315,7 @@ abstract class BaseCcSubjs extends BaseObject  implements Persistent
 		}
 
 		return $this;
-	} // setLogin()
+	} // setDbLogin()
 
 	/**
 	 * Set the value of [pass] column.
@@ -305,7 +323,7 @@ abstract class BaseCcSubjs extends BaseObject  implements Persistent
 	 * @param      string $v new value
 	 * @return     CcSubjs The current object (for fluent API support)
 	 */
-	public function setPass($v)
+	public function setDbPass($v)
 	{
 		if ($v !== null) {
 			$v = (string) $v;
@@ -317,7 +335,7 @@ abstract class BaseCcSubjs extends BaseObject  implements Persistent
 		}
 
 		return $this;
-	} // setPass()
+	} // setDbPass()
 
 	/**
 	 * Set the value of [type] column.
@@ -325,7 +343,7 @@ abstract class BaseCcSubjs extends BaseObject  implements Persistent
 	 * @param      string $v new value
 	 * @return     CcSubjs The current object (for fluent API support)
 	 */
-	public function setType($v)
+	public function setDbType($v)
 	{
 		if ($v !== null) {
 			$v = (string) $v;
@@ -337,27 +355,47 @@ abstract class BaseCcSubjs extends BaseObject  implements Persistent
 		}
 
 		return $this;
-	} // setType()
+	} // setDbType()
 
 	/**
-	 * Set the value of [realname] column.
+	 * Set the value of [first_name] column.
 	 * 
 	 * @param      string $v new value
 	 * @return     CcSubjs The current object (for fluent API support)
 	 */
-	public function setRealname($v)
+	public function setDbFirstName($v)
 	{
 		if ($v !== null) {
 			$v = (string) $v;
 		}
 
-		if ($this->realname !== $v || $this->isNew()) {
+		if ($this->first_name !== $v || $this->isNew()) {
-			$this->realname = $v;
+			$this->first_name = $v;
-			$this->modifiedColumns[] = CcSubjsPeer::REALNAME;
+			$this->modifiedColumns[] = CcSubjsPeer::FIRST_NAME;
 		}
 
 		return $this;
-	} // setRealname()
+	} // setDbFirstName()
+
+	/**
+	 * Set the value of [last_name] column.
+	 * 
+	 * @param      string $v new value
+	 * @return     CcSubjs The current object (for fluent API support)
+	 */
+	public function setDbLastName($v)
+	{
+		if ($v !== null) {
+			$v = (string) $v;
+		}
+
+		if ($this->last_name !== $v || $this->isNew()) {
+			$this->last_name = $v;
+			$this->modifiedColumns[] = CcSubjsPeer::LAST_NAME;
+		}
+
+		return $this;
+	} // setDbLastName()
 
 	/**
 	 * Sets the value of [lastlogin] column to a normalized version of the date/time value specified.
@@ -366,7 +404,7 @@ abstract class BaseCcSubjs extends BaseObject  implements Persistent
 	 *						be treated as NULL for temporal objects.
 	 * @return     CcSubjs The current object (for fluent API support)
 	 */
-	public function setLastlogin($v)
+	public function setDbLastlogin($v)
 	{
 		// we treat '' as NULL for temporal objects because DateTime('') == DateTime('now')
 		// -- which is unexpected, to say the least.
@@ -406,7 +444,7 @@ abstract class BaseCcSubjs extends BaseObject  implements Persistent
 		} // if either are not null
 
 		return $this;
-	} // setLastlogin()
+	} // setDbLastlogin()
 
 	/**
 	 * Sets the value of [lastfail] column to a normalized version of the date/time value specified.
@@ -415,7 +453,7 @@ abstract class BaseCcSubjs extends BaseObject  implements Persistent
 	 *						be treated as NULL for temporal objects.
 	 * @return     CcSubjs The current object (for fluent API support)
 	 */
-	public function setLastfail($v)
+	public function setDbLastfail($v)
 	{
 		// we treat '' as NULL for temporal objects because DateTime('') == DateTime('now')
 		// -- which is unexpected, to say the least.
@@ -455,7 +493,7 @@ abstract class BaseCcSubjs extends BaseObject  implements Persistent
 		} // if either are not null
 
 		return $this;
-	} // setLastfail()
+	} // setDbLastfail()
 
 	/**
 	 * Indicates whether the columns in this object are only set to default values.
@@ -479,7 +517,11 @@ abstract class BaseCcSubjs extends BaseObject  implements Persistent
 				return false;
 			}
 
-			if ($this->realname !== '') {
+			if ($this->first_name !== '') {
+				return false;
+			}
+
+			if ($this->last_name !== '') {
 				return false;
 			}
 
@@ -509,9 +551,10 @@ abstract class BaseCcSubjs extends BaseObject  implements Persistent
 			$this->login = ($row[$startcol + 1] !== null) ? (string) $row[$startcol + 1] : null;
 			$this->pass = ($row[$startcol + 2] !== null) ? (string) $row[$startcol + 2] : null;
 			$this->type = ($row[$startcol + 3] !== null) ? (string) $row[$startcol + 3] : null;
-			$this->realname = ($row[$startcol + 4] !== null) ? (string) $row[$startcol + 4] : null;
+			$this->first_name = ($row[$startcol + 4] !== null) ? (string) $row[$startcol + 4] : null;
-			$this->lastlogin = ($row[$startcol + 5] !== null) ? (string) $row[$startcol + 5] : null;
+			$this->last_name = ($row[$startcol + 5] !== null) ? (string) $row[$startcol + 5] : null;
-			$this->lastfail = ($row[$startcol + 6] !== null) ? (string) $row[$startcol + 6] : null;
+			$this->lastlogin = ($row[$startcol + 6] !== null) ? (string) $row[$startcol + 6] : null;
+			$this->lastfail = ($row[$startcol + 7] !== null) ? (string) $row[$startcol + 7] : null;
 			$this->resetModified();
 
 			$this->setNew(false);
@@ -520,7 +563,7 @@ abstract class BaseCcSubjs extends BaseObject  implements Persistent
 				$this->ensureConsistency();
 			}
 
-			return $startcol + 7; // 7 = CcSubjsPeer::NUM_COLUMNS - CcSubjsPeer::NUM_LAZY_LOAD_COLUMNS).
+			return $startcol + 8; // 8 = CcSubjsPeer::NUM_COLUMNS - CcSubjsPeer::NUM_LAZY_LOAD_COLUMNS).
 
 		} catch (Exception $e) {
 			throw new PropelException("Error populating CcSubjs object", $e);
@@ -720,7 +763,7 @@ abstract class BaseCcSubjs extends BaseObject  implements Persistent
 
 					$pk = BasePeer::doInsert($criteria, $con);
 					$affectedRows = 1;
-					$this->setId($pk);  //[IMV] update autoincrement primary key
+					$this->setDbId($pk);  //[IMV] update autoincrement primary key
 					$this->setNew(false);
 				} else {
 					$affectedRows = CcSubjsPeer::doUpdate($this, $con);
@@ -946,25 +989,28 @@ abstract class BaseCcSubjs extends BaseObject  implements Persistent
 	{
 		switch($pos) {
 			case 0:
-				return $this->getId();
+				return $this->getDbId();
 				break;
 			case 1:
-				return $this->getLogin();
+				return $this->getDbLogin();
 				break;
 			case 2:
-				return $this->getPass();
+				return $this->getDbPass();
 				break;
 			case 3:
-				return $this->getType();
+				return $this->getDbType();
 				break;
 			case 4:
-				return $this->getRealname();
+				return $this->getDbFirstName();
 				break;
 			case 5:
-				return $this->getLastlogin();
+				return $this->getDbLastName();
 				break;
 			case 6:
-				return $this->getLastfail();
+				return $this->getDbLastlogin();
+				break;
+			case 7:
+				return $this->getDbLastfail();
 				break;
 			default:
 				return null;
@@ -989,13 +1035,14 @@ abstract class BaseCcSubjs extends BaseObject  implements Persistent
 	{
 		$keys = CcSubjsPeer::getFieldNames($keyType);
 		$result = array(
-			$keys[0] => $this->getId(),
+			$keys[0] => $this->getDbId(),
-			$keys[1] => $this->getLogin(),
+			$keys[1] => $this->getDbLogin(),
-			$keys[2] => $this->getPass(),
+			$keys[2] => $this->getDbPass(),
-			$keys[3] => $this->getType(),
+			$keys[3] => $this->getDbType(),
-			$keys[4] => $this->getRealname(),
+			$keys[4] => $this->getDbFirstName(),
-			$keys[5] => $this->getLastlogin(),
+			$keys[5] => $this->getDbLastName(),
-			$keys[6] => $this->getLastfail(),
+			$keys[6] => $this->getDbLastlogin(),
+			$keys[7] => $this->getDbLastfail(),
 		);
 		return $result;
 	}
@@ -1028,25 +1075,28 @@ abstract class BaseCcSubjs extends BaseObject  implements Persistent
 	{
 		switch($pos) {
 			case 0:
-				$this->setId($value);
+				$this->setDbId($value);
 				break;
 			case 1:
-				$this->setLogin($value);
+				$this->setDbLogin($value);
 				break;
 			case 2:
-				$this->setPass($value);
+				$this->setDbPass($value);
 				break;
 			case 3:
-				$this->setType($value);
+				$this->setDbType($value);
 				break;
 			case 4:
-				$this->setRealname($value);
+				$this->setDbFirstName($value);
 				break;
 			case 5:
-				$this->setLastlogin($value);
+				$this->setDbLastName($value);
 				break;
 			case 6:
-				$this->setLastfail($value);
+				$this->setDbLastlogin($value);
+				break;
+			case 7:
+				$this->setDbLastfail($value);
 				break;
 		} // switch()
 	}
@@ -1072,13 +1122,14 @@ abstract class BaseCcSubjs extends BaseObject  implements Persistent
 	{
 		$keys = CcSubjsPeer::getFieldNames($keyType);
 
-		if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]);
+		if (array_key_exists($keys[0], $arr)) $this->setDbId($arr[$keys[0]]);
-		if (array_key_exists($keys[1], $arr)) $this->setLogin($arr[$keys[1]]);
+		if (array_key_exists($keys[1], $arr)) $this->setDbLogin($arr[$keys[1]]);
-		if (array_key_exists($keys[2], $arr)) $this->setPass($arr[$keys[2]]);
+		if (array_key_exists($keys[2], $arr)) $this->setDbPass($arr[$keys[2]]);
-		if (array_key_exists($keys[3], $arr)) $this->setType($arr[$keys[3]]);
+		if (array_key_exists($keys[3], $arr)) $this->setDbType($arr[$keys[3]]);
-		if (array_key_exists($keys[4], $arr)) $this->setRealname($arr[$keys[4]]);
+		if (array_key_exists($keys[4], $arr)) $this->setDbFirstName($arr[$keys[4]]);
-		if (array_key_exists($keys[5], $arr)) $this->setLastlogin($arr[$keys[5]]);
+		if (array_key_exists($keys[5], $arr)) $this->setDbLastName($arr[$keys[5]]);
-		if (array_key_exists($keys[6], $arr)) $this->setLastfail($arr[$keys[6]]);
+		if (array_key_exists($keys[6], $arr)) $this->setDbLastlogin($arr[$keys[6]]);
+		if (array_key_exists($keys[7], $arr)) $this->setDbLastfail($arr[$keys[7]]);
 	}
 
 	/**
@@ -1094,7 +1145,8 @@ abstract class BaseCcSubjs extends BaseObject  implements Persistent
 		if ($this->isColumnModified(CcSubjsPeer::LOGIN)) $criteria->add(CcSubjsPeer::LOGIN, $this->login);
 		if ($this->isColumnModified(CcSubjsPeer::PASS)) $criteria->add(CcSubjsPeer::PASS, $this->pass);
 		if ($this->isColumnModified(CcSubjsPeer::TYPE)) $criteria->add(CcSubjsPeer::TYPE, $this->type);
-		if ($this->isColumnModified(CcSubjsPeer::REALNAME)) $criteria->add(CcSubjsPeer::REALNAME, $this->realname);
+		if ($this->isColumnModified(CcSubjsPeer::FIRST_NAME)) $criteria->add(CcSubjsPeer::FIRST_NAME, $this->first_name);
+		if ($this->isColumnModified(CcSubjsPeer::LAST_NAME)) $criteria->add(CcSubjsPeer::LAST_NAME, $this->last_name);
 		if ($this->isColumnModified(CcSubjsPeer::LASTLOGIN)) $criteria->add(CcSubjsPeer::LASTLOGIN, $this->lastlogin);
 		if ($this->isColumnModified(CcSubjsPeer::LASTFAIL)) $criteria->add(CcSubjsPeer::LASTFAIL, $this->lastfail);
 
@@ -1123,7 +1175,7 @@ abstract class BaseCcSubjs extends BaseObject  implements Persistent
 	 */
 	public function getPrimaryKey()
 	{
-		return $this->getId();
+		return $this->getDbId();
 	}
 
 	/**
@@ -1134,7 +1186,7 @@ abstract class BaseCcSubjs extends BaseObject  implements Persistent
 	 */
 	public function setPrimaryKey($key)
 	{
-		$this->setId($key);
+		$this->setDbId($key);
 	}
 
 	/**
@@ -1143,7 +1195,7 @@ abstract class BaseCcSubjs extends BaseObject  implements Persistent
 	 */
 	public function isPrimaryKeyNull()
 	{
-		return null === $this->getId();
+		return null === $this->getDbId();
 	}
 
 	/**
@@ -1158,12 +1210,13 @@ abstract class BaseCcSubjs extends BaseObject  implements Persistent
 	 */
 	public function copyInto($copyObj, $deepCopy = false)
 	{
-		$copyObj->setLogin($this->login);
+		$copyObj->setDbLogin($this->login);
-		$copyObj->setPass($this->pass);
+		$copyObj->setDbPass($this->pass);
-		$copyObj->setType($this->type);
+		$copyObj->setDbType($this->type);
-		$copyObj->setRealname($this->realname);
+		$copyObj->setDbFirstName($this->first_name);
-		$copyObj->setLastlogin($this->lastlogin);
+		$copyObj->setDbLastName($this->last_name);
-		$copyObj->setLastfail($this->lastfail);
+		$copyObj->setDbLastlogin($this->lastlogin);
+		$copyObj->setDbLastfail($this->lastfail);
 
 		if ($deepCopy) {
 			// important: temporarily setNew(false) because this affects the behavior of
@@ -1216,7 +1269,7 @@ abstract class BaseCcSubjs extends BaseObject  implements Persistent
 
 
 		$copyObj->setNew(true);
-		$copyObj->setId(NULL); // this is a auto-increment column, so set to default value
+		$copyObj->setDbId(NULL); // this is a auto-increment column, so set to default value
 	}
 
 	/**
@@ -2054,7 +2107,8 @@ abstract class BaseCcSubjs extends BaseObject  implements Persistent
 		$this->login = null;
 		$this->pass = null;
 		$this->type = null;
-		$this->realname = null;
+		$this->first_name = null;
+		$this->last_name = null;
 		$this->lastlogin = null;
 		$this->lastfail = null;
 		$this->alreadyInSave = false;

application/models/campcaster/om/BaseCcSubjsPeer.php

@@ -26,7 +26,7 @@ abstract class BaseCcSubjsPeer {
 	const TM_CLASS = 'CcSubjsTableMap';
 	
 	/** The total number of columns. */
-	const NUM_COLUMNS = 7;
+	const NUM_COLUMNS = 8;
 
 	/** The number of lazy-loaded columns. */
 	const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -43,8 +43,11 @@ abstract class BaseCcSubjsPeer {
 	/** the column name for the TYPE field */
 	const TYPE = 'cc_subjs.TYPE';
 
-	/** the column name for the REALNAME field */
+	/** the column name for the FIRST_NAME field */
-	const REALNAME = 'cc_subjs.REALNAME';
+	const FIRST_NAME = 'cc_subjs.FIRST_NAME';
+
+	/** the column name for the LAST_NAME field */
+	const LAST_NAME = 'cc_subjs.LAST_NAME';
 
 	/** the column name for the LASTLOGIN field */
 	const LASTLOGIN = 'cc_subjs.LASTLOGIN';
@@ -68,12 +71,12 @@ abstract class BaseCcSubjsPeer {
 	 * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
 	 */
 	private static $fieldNames = array (
-		BasePeer::TYPE_PHPNAME => array ('Id', 'Login', 'Pass', 'Type', 'Realname', 'Lastlogin', 'Lastfail', ),
+		BasePeer::TYPE_PHPNAME => array ('DbId', 'DbLogin', 'DbPass', 'DbType', 'DbFirstName', 'DbLastName', 'DbLastlogin', 'DbLastfail', ),
-		BasePeer::TYPE_STUDLYPHPNAME => array ('id', 'login', 'pass', 'type', 'realname', 'lastlogin', 'lastfail', ),
+		BasePeer::TYPE_STUDLYPHPNAME => array ('dbId', 'dbLogin', 'dbPass', 'dbType', 'dbFirstName', 'dbLastName', 'dbLastlogin', 'dbLastfail', ),
-		BasePeer::TYPE_COLNAME => array (self::ID, self::LOGIN, self::PASS, self::TYPE, self::REALNAME, self::LASTLOGIN, self::LASTFAIL, ),
+		BasePeer::TYPE_COLNAME => array (self::ID, self::LOGIN, self::PASS, self::TYPE, self::FIRST_NAME, self::LAST_NAME, self::LASTLOGIN, self::LASTFAIL, ),
-		BasePeer::TYPE_RAW_COLNAME => array ('ID', 'LOGIN', 'PASS', 'TYPE', 'REALNAME', 'LASTLOGIN', 'LASTFAIL', ),
+		BasePeer::TYPE_RAW_COLNAME => array ('ID', 'LOGIN', 'PASS', 'TYPE', 'FIRST_NAME', 'LAST_NAME', 'LASTLOGIN', 'LASTFAIL', ),
-		BasePeer::TYPE_FIELDNAME => array ('id', 'login', 'pass', 'type', 'realname', 'lastlogin', 'lastfail', ),
+		BasePeer::TYPE_FIELDNAME => array ('id', 'login', 'pass', 'type', 'first_name', 'last_name', 'lastlogin', 'lastfail', ),
-		BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, )
+		BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, )
 	);
 
 	/**
@@ -83,12 +86,12 @@ abstract class BaseCcSubjsPeer {
 	 * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
 	 */
 	private static $fieldKeys = array (
-		BasePeer::TYPE_PHPNAME => array ('Id' => 0, 'Login' => 1, 'Pass' => 2, 'Type' => 3, 'Realname' => 4, 'Lastlogin' => 5, 'Lastfail' => 6, ),
+		BasePeer::TYPE_PHPNAME => array ('DbId' => 0, 'DbLogin' => 1, 'DbPass' => 2, 'DbType' => 3, 'DbFirstName' => 4, 'DbLastName' => 5, 'DbLastlogin' => 6, 'DbLastfail' => 7, ),
-		BasePeer::TYPE_STUDLYPHPNAME => array ('id' => 0, 'login' => 1, 'pass' => 2, 'type' => 3, 'realname' => 4, 'lastlogin' => 5, 'lastfail' => 6, ),
+		BasePeer::TYPE_STUDLYPHPNAME => array ('dbId' => 0, 'dbLogin' => 1, 'dbPass' => 2, 'dbType' => 3, 'dbFirstName' => 4, 'dbLastName' => 5, 'dbLastlogin' => 6, 'dbLastfail' => 7, ),
-		BasePeer::TYPE_COLNAME => array (self::ID => 0, self::LOGIN => 1, self::PASS => 2, self::TYPE => 3, self::REALNAME => 4, self::LASTLOGIN => 5, self::LASTFAIL => 6, ),
+		BasePeer::TYPE_COLNAME => array (self::ID => 0, self::LOGIN => 1, self::PASS => 2, self::TYPE => 3, self::FIRST_NAME => 4, self::LAST_NAME => 5, self::LASTLOGIN => 6, self::LASTFAIL => 7, ),
-		BasePeer::TYPE_RAW_COLNAME => array ('ID' => 0, 'LOGIN' => 1, 'PASS' => 2, 'TYPE' => 3, 'REALNAME' => 4, 'LASTLOGIN' => 5, 'LASTFAIL' => 6, ),
+		BasePeer::TYPE_RAW_COLNAME => array ('ID' => 0, 'LOGIN' => 1, 'PASS' => 2, 'TYPE' => 3, 'FIRST_NAME' => 4, 'LAST_NAME' => 5, 'LASTLOGIN' => 6, 'LASTFAIL' => 7, ),
-		BasePeer::TYPE_FIELDNAME => array ('id' => 0, 'login' => 1, 'pass' => 2, 'type' => 3, 'realname' => 4, 'lastlogin' => 5, 'lastfail' => 6, ),
+		BasePeer::TYPE_FIELDNAME => array ('id' => 0, 'login' => 1, 'pass' => 2, 'type' => 3, 'first_name' => 4, 'last_name' => 5, 'lastlogin' => 6, 'lastfail' => 7, ),
-		BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, )
+		BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, )
 	);
 
 	/**
@@ -164,7 +167,8 @@ abstract class BaseCcSubjsPeer {
 			$criteria->addSelectColumn(CcSubjsPeer::LOGIN);
 			$criteria->addSelectColumn(CcSubjsPeer::PASS);
 			$criteria->addSelectColumn(CcSubjsPeer::TYPE);
-			$criteria->addSelectColumn(CcSubjsPeer::REALNAME);
+			$criteria->addSelectColumn(CcSubjsPeer::FIRST_NAME);
+			$criteria->addSelectColumn(CcSubjsPeer::LAST_NAME);
 			$criteria->addSelectColumn(CcSubjsPeer::LASTLOGIN);
 			$criteria->addSelectColumn(CcSubjsPeer::LASTFAIL);
 		} else {
@@ -172,7 +176,8 @@ abstract class BaseCcSubjsPeer {
 			$criteria->addSelectColumn($alias . '.LOGIN');
 			$criteria->addSelectColumn($alias . '.PASS');
 			$criteria->addSelectColumn($alias . '.TYPE');
-			$criteria->addSelectColumn($alias . '.REALNAME');
+			$criteria->addSelectColumn($alias . '.FIRST_NAME');
+			$criteria->addSelectColumn($alias . '.LAST_NAME');
 			$criteria->addSelectColumn($alias . '.LASTLOGIN');
 			$criteria->addSelectColumn($alias . '.LASTFAIL');
 		}
@@ -299,7 +304,7 @@ abstract class BaseCcSubjsPeer {
 	{
 		if (Propel::isInstancePoolingEnabled()) {
 			if ($key === null) {
-				$key = (string) $obj->getId();
+				$key = (string) $obj->getDbId();
 			} // if key === null
 			self::$instances[$key] = $obj;
 		}
@@ -319,7 +324,7 @@ abstract class BaseCcSubjsPeer {
 	{
 		if (Propel::isInstancePoolingEnabled() && $value !== null) {
 			if (is_object($value) && $value instanceof CcSubjs) {
-				$key = (string) $value->getId();
+				$key = (string) $value->getDbId();
 			} elseif (is_scalar($value)) {
 				// assume we've been passed a primary key
 				$key = (string) $value;

application/models/campcaster/om/BaseCcSubjsQuery.php

@@ -6,21 +6,23 @@
  *
  * 
  *
- * @method     CcSubjsQuery orderById($order = Criteria::ASC) Order by the id column
+ * @method     CcSubjsQuery orderByDbId($order = Criteria::ASC) Order by the id column
- * @method     CcSubjsQuery orderByLogin($order = Criteria::ASC) Order by the login column
+ * @method     CcSubjsQuery orderByDbLogin($order = Criteria::ASC) Order by the login column
- * @method     CcSubjsQuery orderByPass($order = Criteria::ASC) Order by the pass column
+ * @method     CcSubjsQuery orderByDbPass($order = Criteria::ASC) Order by the pass column
- * @method     CcSubjsQuery orderByType($order = Criteria::ASC) Order by the type column
+ * @method     CcSubjsQuery orderByDbType($order = Criteria::ASC) Order by the type column
- * @method     CcSubjsQuery orderByRealname($order = Criteria::ASC) Order by the realname column
+ * @method     CcSubjsQuery orderByDbFirstName($order = Criteria::ASC) Order by the first_name column
- * @method     CcSubjsQuery orderByLastlogin($order = Criteria::ASC) Order by the lastlogin column
+ * @method     CcSubjsQuery orderByDbLastName($order = Criteria::ASC) Order by the last_name column
- * @method     CcSubjsQuery orderByLastfail($order = Criteria::ASC) Order by the lastfail column
+ * @method     CcSubjsQuery orderByDbLastlogin($order = Criteria::ASC) Order by the lastlogin column
+ * @method     CcSubjsQuery orderByDbLastfail($order = Criteria::ASC) Order by the lastfail column
  *
- * @method     CcSubjsQuery groupById() Group by the id column
+ * @method     CcSubjsQuery groupByDbId() Group by the id column
- * @method     CcSubjsQuery groupByLogin() Group by the login column
+ * @method     CcSubjsQuery groupByDbLogin() Group by the login column
- * @method     CcSubjsQuery groupByPass() Group by the pass column
+ * @method     CcSubjsQuery groupByDbPass() Group by the pass column
- * @method     CcSubjsQuery groupByType() Group by the type column
+ * @method     CcSubjsQuery groupByDbType() Group by the type column
- * @method     CcSubjsQuery groupByRealname() Group by the realname column
+ * @method     CcSubjsQuery groupByDbFirstName() Group by the first_name column
- * @method     CcSubjsQuery groupByLastlogin() Group by the lastlogin column
+ * @method     CcSubjsQuery groupByDbLastName() Group by the last_name column
- * @method     CcSubjsQuery groupByLastfail() Group by the lastfail column
+ * @method     CcSubjsQuery groupByDbLastlogin() Group by the lastlogin column
+ * @method     CcSubjsQuery groupByDbLastfail() Group by the lastfail column
  *
  * @method     CcSubjsQuery leftJoin($relation) Adds a LEFT JOIN clause to the query
  * @method     CcSubjsQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query
@@ -57,21 +59,23 @@
  * @method     CcSubjs findOne(PropelPDO $con = null) Return the first CcSubjs matching the query
  * @method     CcSubjs findOneOrCreate(PropelPDO $con = null) Return the first CcSubjs matching the query, or a new CcSubjs object populated from the query conditions when no match is found
  *
- * @method     CcSubjs findOneById(int $id) Return the first CcSubjs filtered by the id column
+ * @method     CcSubjs findOneByDbId(int $id) Return the first CcSubjs filtered by the id column
- * @method     CcSubjs findOneByLogin(string $login) Return the first CcSubjs filtered by the login column
+ * @method     CcSubjs findOneByDbLogin(string $login) Return the first CcSubjs filtered by the login column
- * @method     CcSubjs findOneByPass(string $pass) Return the first CcSubjs filtered by the pass column
+ * @method     CcSubjs findOneByDbPass(string $pass) Return the first CcSubjs filtered by the pass column
- * @method     CcSubjs findOneByType(string $type) Return the first CcSubjs filtered by the type column
+ * @method     CcSubjs findOneByDbType(string $type) Return the first CcSubjs filtered by the type column
- * @method     CcSubjs findOneByRealname(string $realname) Return the first CcSubjs filtered by the realname column
+ * @method     CcSubjs findOneByDbFirstName(string $first_name) Return the first CcSubjs filtered by the first_name column
- * @method     CcSubjs findOneByLastlogin(string $lastlogin) Return the first CcSubjs filtered by the lastlogin column
+ * @method     CcSubjs findOneByDbLastName(string $last_name) Return the first CcSubjs filtered by the last_name column
- * @method     CcSubjs findOneByLastfail(string $lastfail) Return the first CcSubjs filtered by the lastfail column
+ * @method     CcSubjs findOneByDbLastlogin(string $lastlogin) Return the first CcSubjs filtered by the lastlogin column
+ * @method     CcSubjs findOneByDbLastfail(string $lastfail) Return the first CcSubjs filtered by the lastfail column
  *
- * @method     array findById(int $id) Return CcSubjs objects filtered by the id column
+ * @method     array findByDbId(int $id) Return CcSubjs objects filtered by the id column
- * @method     array findByLogin(string $login) Return CcSubjs objects filtered by the login column
+ * @method     array findByDbLogin(string $login) Return CcSubjs objects filtered by the login column
- * @method     array findByPass(string $pass) Return CcSubjs objects filtered by the pass column
+ * @method     array findByDbPass(string $pass) Return CcSubjs objects filtered by the pass column
- * @method     array findByType(string $type) Return CcSubjs objects filtered by the type column
+ * @method     array findByDbType(string $type) Return CcSubjs objects filtered by the type column
- * @method     array findByRealname(string $realname) Return CcSubjs objects filtered by the realname column
+ * @method     array findByDbFirstName(string $first_name) Return CcSubjs objects filtered by the first_name column
- * @method     array findByLastlogin(string $lastlogin) Return CcSubjs objects filtered by the lastlogin column
+ * @method     array findByDbLastName(string $last_name) Return CcSubjs objects filtered by the last_name column
- * @method     array findByLastfail(string $lastfail) Return CcSubjs objects filtered by the lastfail column
+ * @method     array findByDbLastlogin(string $lastlogin) Return CcSubjs objects filtered by the lastlogin column
+ * @method     array findByDbLastfail(string $lastfail) Return CcSubjs objects filtered by the lastfail column
  *
  * @package    propel.generator.campcaster.om
  */
@@ -184,127 +188,149 @@ abstract class BaseCcSubjsQuery extends ModelCriteria
 	/**
 	 * Filter the query on the id column
 	 * 
-	 * @param     int|array $id The value to use as filter.
+	 * @param     int|array $dbId The value to use as filter.
 	 *            Accepts an associative array('min' => $minValue, 'max' => $maxValue)
 	 * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
 	 *
 	 * @return    CcSubjsQuery The current query, for fluid interface
 	 */
-	public function filterById($id = null, $comparison = null)
+	public function filterByDbId($dbId = null, $comparison = null)
 	{
-		if (is_array($id) && null === $comparison) {
+		if (is_array($dbId) && null === $comparison) {
 			$comparison = Criteria::IN;
 		}
-		return $this->addUsingAlias(CcSubjsPeer::ID, $id, $comparison);
+		return $this->addUsingAlias(CcSubjsPeer::ID, $dbId, $comparison);
 	}
 
 	/**
 	 * Filter the query on the login column
 	 * 
-	 * @param     string $login The value to use as filter.
+	 * @param     string $dbLogin The value to use as filter.
 	 *            Accepts wildcards (* and % trigger a LIKE)
 	 * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
 	 *
 	 * @return    CcSubjsQuery The current query, for fluid interface
 	 */
-	public function filterByLogin($login = null, $comparison = null)
+	public function filterByDbLogin($dbLogin = null, $comparison = null)
 	{
 		if (null === $comparison) {
-			if (is_array($login)) {
+			if (is_array($dbLogin)) {
 				$comparison = Criteria::IN;
-			} elseif (preg_match('/[\%\*]/', $login)) {
+			} elseif (preg_match('/[\%\*]/', $dbLogin)) {
-				$login = str_replace('*', '%', $login);
+				$dbLogin = str_replace('*', '%', $dbLogin);
 				$comparison = Criteria::LIKE;
 			}
 		}
-		return $this->addUsingAlias(CcSubjsPeer::LOGIN, $login, $comparison);
+		return $this->addUsingAlias(CcSubjsPeer::LOGIN, $dbLogin, $comparison);
 	}
 
 	/**
 	 * Filter the query on the pass column
 	 * 
-	 * @param     string $pass The value to use as filter.
+	 * @param     string $dbPass The value to use as filter.
 	 *            Accepts wildcards (* and % trigger a LIKE)
 	 * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
 	 *
 	 * @return    CcSubjsQuery The current query, for fluid interface
 	 */
-	public function filterByPass($pass = null, $comparison = null)
+	public function filterByDbPass($dbPass = null, $comparison = null)
 	{
 		if (null === $comparison) {
-			if (is_array($pass)) {
+			if (is_array($dbPass)) {
 				$comparison = Criteria::IN;
-			} elseif (preg_match('/[\%\*]/', $pass)) {
+			} elseif (preg_match('/[\%\*]/', $dbPass)) {
-				$pass = str_replace('*', '%', $pass);
+				$dbPass = str_replace('*', '%', $dbPass);
 				$comparison = Criteria::LIKE;
 			}
 		}
-		return $this->addUsingAlias(CcSubjsPeer::PASS, $pass, $comparison);
+		return $this->addUsingAlias(CcSubjsPeer::PASS, $dbPass, $comparison);
 	}
 
 	/**
 	 * Filter the query on the type column
 	 * 
-	 * @param     string $type The value to use as filter.
+	 * @param     string $dbType The value to use as filter.
 	 *            Accepts wildcards (* and % trigger a LIKE)
 	 * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
 	 *
 	 * @return    CcSubjsQuery The current query, for fluid interface
 	 */
-	public function filterByType($type = null, $comparison = null)
+	public function filterByDbType($dbType = null, $comparison = null)
 	{
 		if (null === $comparison) {
-			if (is_array($type)) {
+			if (is_array($dbType)) {
 				$comparison = Criteria::IN;
-			} elseif (preg_match('/[\%\*]/', $type)) {
+			} elseif (preg_match('/[\%\*]/', $dbType)) {
-				$type = str_replace('*', '%', $type);
+				$dbType = str_replace('*', '%', $dbType);
 				$comparison = Criteria::LIKE;
 			}
 		}
-		return $this->addUsingAlias(CcSubjsPeer::TYPE, $type, $comparison);
+		return $this->addUsingAlias(CcSubjsPeer::TYPE, $dbType, $comparison);
 	}
 
 	/**
-	 * Filter the query on the realname column
+	 * Filter the query on the first_name column
 	 * 
-	 * @param     string $realname The value to use as filter.
+	 * @param     string $dbFirstName The value to use as filter.
 	 *            Accepts wildcards (* and % trigger a LIKE)
 	 * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
 	 *
 	 * @return    CcSubjsQuery The current query, for fluid interface
 	 */
-	public function filterByRealname($realname = null, $comparison = null)
+	public function filterByDbFirstName($dbFirstName = null, $comparison = null)
 	{
 		if (null === $comparison) {
-			if (is_array($realname)) {
+			if (is_array($dbFirstName)) {
 				$comparison = Criteria::IN;
-			} elseif (preg_match('/[\%\*]/', $realname)) {
+			} elseif (preg_match('/[\%\*]/', $dbFirstName)) {
-				$realname = str_replace('*', '%', $realname);
+				$dbFirstName = str_replace('*', '%', $dbFirstName);
 				$comparison = Criteria::LIKE;
 			}
 		}
-		return $this->addUsingAlias(CcSubjsPeer::REALNAME, $realname, $comparison);
+		return $this->addUsingAlias(CcSubjsPeer::FIRST_NAME, $dbFirstName, $comparison);
+	}
+
+	/**
+	 * Filter the query on the last_name column
+	 * 
+	 * @param     string $dbLastName The value to use as filter.
+	 *            Accepts wildcards (* and % trigger a LIKE)
+	 * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+	 *
+	 * @return    CcSubjsQuery The current query, for fluid interface
+	 */
+	public function filterByDbLastName($dbLastName = null, $comparison = null)
+	{
+		if (null === $comparison) {
+			if (is_array($dbLastName)) {
+				$comparison = Criteria::IN;
+			} elseif (preg_match('/[\%\*]/', $dbLastName)) {
+				$dbLastName = str_replace('*', '%', $dbLastName);
+				$comparison = Criteria::LIKE;
+			}
+		}
+		return $this->addUsingAlias(CcSubjsPeer::LAST_NAME, $dbLastName, $comparison);
 	}
 
 	/**
 	 * Filter the query on the lastlogin column
 	 * 
-	 * @param     string|array $lastlogin The value to use as filter.
+	 * @param     string|array $dbLastlogin The value to use as filter.
 	 *            Accepts an associative array('min' => $minValue, 'max' => $maxValue)
 	 * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
 	 *
 	 * @return    CcSubjsQuery The current query, for fluid interface
 	 */
-	public function filterByLastlogin($lastlogin = null, $comparison = null)
+	public function filterByDbLastlogin($dbLastlogin = null, $comparison = null)
 	{
-		if (is_array($lastlogin)) {
+		if (is_array($dbLastlogin)) {
 			$useMinMax = false;
-			if (isset($lastlogin['min'])) {
+			if (isset($dbLastlogin['min'])) {
-				$this->addUsingAlias(CcSubjsPeer::LASTLOGIN, $lastlogin['min'], Criteria::GREATER_EQUAL);
+				$this->addUsingAlias(CcSubjsPeer::LASTLOGIN, $dbLastlogin['min'], Criteria::GREATER_EQUAL);
 				$useMinMax = true;
 			}
-			if (isset($lastlogin['max'])) {
+			if (isset($dbLastlogin['max'])) {
-				$this->addUsingAlias(CcSubjsPeer::LASTLOGIN, $lastlogin['max'], Criteria::LESS_EQUAL);
+				$this->addUsingAlias(CcSubjsPeer::LASTLOGIN, $dbLastlogin['max'], Criteria::LESS_EQUAL);
 				$useMinMax = true;
 			}
 			if ($useMinMax) {
@@ -314,28 +340,28 @@ abstract class BaseCcSubjsQuery extends ModelCriteria
 				$comparison = Criteria::IN;
 			}
 		}
-		return $this->addUsingAlias(CcSubjsPeer::LASTLOGIN, $lastlogin, $comparison);
+		return $this->addUsingAlias(CcSubjsPeer::LASTLOGIN, $dbLastlogin, $comparison);
 	}
 
 	/**
 	 * Filter the query on the lastfail column
 	 * 
-	 * @param     string|array $lastfail The value to use as filter.
+	 * @param     string|array $dbLastfail The value to use as filter.
 	 *            Accepts an associative array('min' => $minValue, 'max' => $maxValue)
 	 * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
 	 *
 	 * @return    CcSubjsQuery The current query, for fluid interface
 	 */
-	public function filterByLastfail($lastfail = null, $comparison = null)
+	public function filterByDbLastfail($dbLastfail = null, $comparison = null)
 	{
-		if (is_array($lastfail)) {
+		if (is_array($dbLastfail)) {
 			$useMinMax = false;
-			if (isset($lastfail['min'])) {
+			if (isset($dbLastfail['min'])) {
-				$this->addUsingAlias(CcSubjsPeer::LASTFAIL, $lastfail['min'], Criteria::GREATER_EQUAL);
+				$this->addUsingAlias(CcSubjsPeer::LASTFAIL, $dbLastfail['min'], Criteria::GREATER_EQUAL);
 				$useMinMax = true;
 			}
-			if (isset($lastfail['max'])) {
+			if (isset($dbLastfail['max'])) {
-				$this->addUsingAlias(CcSubjsPeer::LASTFAIL, $lastfail['max'], Criteria::LESS_EQUAL);
+				$this->addUsingAlias(CcSubjsPeer::LASTFAIL, $dbLastfail['max'], Criteria::LESS_EQUAL);
 				$useMinMax = true;
 			}
 			if ($useMinMax) {
@@ -345,7 +371,7 @@ abstract class BaseCcSubjsQuery extends ModelCriteria
 				$comparison = Criteria::IN;
 			}
 		}
-		return $this->addUsingAlias(CcSubjsPeer::LASTFAIL, $lastfail, $comparison);
+		return $this->addUsingAlias(CcSubjsPeer::LASTFAIL, $dbLastfail, $comparison);
 	}
 
 	/**
@@ -423,7 +449,7 @@ abstract class BaseCcSubjsQuery extends ModelCriteria
 	public function filterByCcFiles($ccFiles, $comparison = null)
 	{
 		return $this
-			->addUsingAlias(CcSubjsPeer::ID, $ccFiles->getEditedby(), $comparison);
+			->addUsingAlias(CcSubjsPeer::ID, $ccFiles->getDbEditedby(), $comparison);
 	}
 
 	/**
@@ -806,7 +832,7 @@ abstract class BaseCcSubjsQuery extends ModelCriteria
 	public function prune($ccSubjs = null)
 	{
 		if ($ccSubjs) {
-			$this->addUsingAlias(CcSubjsPeer::ID, $ccSubjs->getId(), Criteria::NOT_EQUAL);
+			$this->addUsingAlias(CcSubjsPeer::ID, $ccSubjs->getDbId(), Criteria::NOT_EQUAL);
 	  }
 	  
 		return $this;

application/views/scripts/user/add-user.phtml

@@ -0,0 +1,3 @@
+<?php
+
+echo $this->form;

application/views/scripts/user/index.phtml

@@ -0,0 +1 @@
+<br /><br /><center>View script for controller <b>User</b> and script/action name <b>index</b></center>

build/schema.xml

@@ -33,59 +33,59 @@
   </table>
   <table name="cc_files" phpName="CcFiles">
     <column name="id" phpName="DbId" type="INTEGER" primaryKey="true" autoIncrement="true" required="true"/>
-    <column name="gunid" phpName="Gunid" type="char" size="32" required="true"/>
+    <column name="gunid" phpName="DbGunid" type="char" size="32" required="true"/>
-    <column name="name" phpName="Name" type="VARCHAR" size="255" required="true" defaultValue=""/>
+    <column name="name" phpName="DbName" type="VARCHAR" size="255" required="true" defaultValue=""/>
-    <column name="mime" phpName="Mime" type="VARCHAR" size="255" required="true" defaultValue=""/>
+    <column name="mime" phpName="DbMime" type="VARCHAR" size="255" required="true" defaultValue=""/>
-    <column name="ftype" phpName="Ftype" type="VARCHAR" size="128" required="true" defaultValue=""/>
+    <column name="ftype" phpName="DbFtype" type="VARCHAR" size="128" required="true" defaultValue=""/>
-    <column name="filepath" phpName="filepath" type="LONGVARCHAR" required="false" defaultValue=""/>
+    <column name="filepath" phpName="DbFilepath" type="LONGVARCHAR" required="false" defaultValue=""/>
-    <column name="state" phpName="State" type="VARCHAR" size="128" required="true" defaultValue="empty"/>
+    <column name="state" phpName="DbState" type="VARCHAR" size="128" required="true" defaultValue="empty"/>
-    <column name="currentlyaccessing" phpName="Currentlyaccessing" type="INTEGER" required="true" defaultValue="0"/>
+    <column name="currentlyaccessing" phpName="DbCurrentlyaccessing" type="INTEGER" required="true" defaultValue="0"/>
-    <column name="editedby" phpName="Editedby" type="INTEGER" required="false"/>
+    <column name="editedby" phpName="DbEditedby" type="INTEGER" required="false"/>
-    <column name="mtime" phpName="Mtime" type="TIMESTAMP" size="6" required="false"/>
+    <column name="mtime" phpName="DbMtime" type="TIMESTAMP" size="6" required="false"/>
-    <column name="md5" phpName="Md5" type="CHAR" size="32" required="false"/>
+    <column name="md5" phpName="DbMd5" type="CHAR" size="32" required="false"/>
-    <column name="track_title" phpName="TrackTitle" type="VARCHAR" size="512" required="false"/>
+    <column name="track_title" phpName="DbTrackTitle" type="VARCHAR" size="512" required="false"/>
-    <column name="artist_name" phpName="ArtistName" type="VARCHAR" size="512" required="false"/>
+    <column name="artist_name" phpName="DbArtistName" type="VARCHAR" size="512" required="false"/>
-    <column name="bit_rate" phpName="BitRate" type="VARCHAR" size="32" required="false"/>
+    <column name="bit_rate" phpName="DbBitRate" type="VARCHAR" size="32" required="false"/>
-    <column name="sample_rate" phpName="SampleRate" type="VARCHAR" size="32" required="false"/>
+    <column name="sample_rate" phpName="DbSampleRate" type="VARCHAR" size="32" required="false"/>
-    <column name="format" phpName="Format" type="VARCHAR" size="128" required="false"/>
+    <column name="format" phpName="DbFormat" type="VARCHAR" size="128" required="false"/>
     <column name="length" phpName="DbLength" type="TIME" required="false"/>
-    <column name="album_title" phpName="AlbumTitle" type="VARCHAR" size="512" required="false"/>
+    <column name="album_title" phpName="DbAlbumTitle" type="VARCHAR" size="512" required="false"/>
-    <column name="genre" phpName="Genre" type="VARCHAR" size="64" required="false"/>
+    <column name="genre" phpName="DbGenre" type="VARCHAR" size="64" required="false"/>
-    <column name="comments" phpName="Comments" type="LONGVARCHAR" required="false"/>
+    <column name="comments" phpName="DbComments" type="LONGVARCHAR" required="false"/>
-    <column name="year" phpName="Year" type="VARCHAR" size="16" required="false"/>
+    <column name="year" phpName="DbYear" type="VARCHAR" size="16" required="false"/>
-    <column name="track_number" phpName="TrackNumber" type="INTEGER" required="false"/>
+    <column name="track_number" phpName="DbTrackNumber" type="INTEGER" required="false"/>
-    <column name="channels" phpName="Channels" type="INTEGER" required="false"/>
+    <column name="channels" phpName="DbChannels" type="INTEGER" required="false"/>
-    <column name="url" phpName="Url" type="VARCHAR" size="1024" required="false"/>
+    <column name="url" phpName="DbUrl" type="VARCHAR" size="1024" required="false"/>
-    <column name="bpm" phpName="Bpm" type="VARCHAR" size="8" required="false"/>
+    <column name="bpm" phpName="DbBpm" type="VARCHAR" size="8" required="false"/>
-    <column name="rating" phpName="Rating" type="VARCHAR" size="8" required="false"/>
+    <column name="rating" phpName="DbRating" type="VARCHAR" size="8" required="false"/>
-    <column name="encoded_by" phpName="EncodedBy" type="VARCHAR" size="255" required="false"/>
+    <column name="encoded_by" phpName="DbEncodedBy" type="VARCHAR" size="255" required="false"/>
-    <column name="disc_number" phpName="DiscNumber" type="VARCHAR" size="8" required="false"/>
+    <column name="disc_number" phpName="DbDiscNumber" type="VARCHAR" size="8" required="false"/>
-    <column name="mood" phpName="Mood" type="VARCHAR" size="64" required="false"/>
+    <column name="mood" phpName="DbMood" type="VARCHAR" size="64" required="false"/>
-    <column name="label" phpName="Label" type="VARCHAR" size="512" required="false"/>
+    <column name="label" phpName="DbLabel" type="VARCHAR" size="512" required="false"/>
-    <column name="composer" phpName="Composer" type="VARCHAR" size="512" required="false"/>
+    <column name="composer" phpName="DbComposer" type="VARCHAR" size="512" required="false"/>
-    <column name="encoder" phpName="Encoder" type="VARCHAR" size="64" required="false"/>
+    <column name="encoder" phpName="DbEncoder" type="VARCHAR" size="64" required="false"/>
-    <column name="checksum" phpName="Checksum" type="VARCHAR" size="256" required="false"/>
+    <column name="checksum" phpName="DbChecksum" type="VARCHAR" size="256" required="false"/>
-    <column name="lyrics" phpName="Lyrics" type="LONGVARCHAR" required="false"/>
+    <column name="lyrics" phpName="DbLyrics" type="LONGVARCHAR" required="false"/>
-    <column name="orchestra" phpName="Orchestra" type="VARCHAR" size="512" required="false"/>
+    <column name="orchestra" phpName="DbOrchestra" type="VARCHAR" size="512" required="false"/>
-    <column name="conductor" phpName="Conductor" type="VARCHAR" size="512" required="false"/>
+    <column name="conductor" phpName="DbConductor" type="VARCHAR" size="512" required="false"/>
-    <column name="lyricist" phpName="Lyricist" type="VARCHAR" size="512" required="false"/>
+    <column name="lyricist" phpName="DbLyricist" type="VARCHAR" size="512" required="false"/>
-    <column name="original_lyricist" phpName="OriginalLyricist" type="VARCHAR" size="512" required="false"/>
+    <column name="original_lyricist" phpName="DbOriginalLyricist" type="VARCHAR" size="512" required="false"/>
-    <column name="radio_station_name" phpName="RadioStationName" type="VARCHAR" size="512" required="false"/>
+    <column name="radio_station_name" phpName="DbRadioStationName" type="VARCHAR" size="512" required="false"/>
-    <column name="info_url" phpName="InfoUrl" type="VARCHAR" size="512" required="false"/>
+    <column name="info_url" phpName="DbInfoUrl" type="VARCHAR" size="512" required="false"/>
-    <column name="artist_url" phpName="ArtistUrl" type="VARCHAR" size="512" required="false"/>
+    <column name="artist_url" phpName="DbArtistUrl" type="VARCHAR" size="512" required="false"/>
-    <column name="audio_source_url" phpName="AudioSourceUrl" type="VARCHAR" size="512" required="false"/>
+    <column name="audio_source_url" phpName="DbAudioSourceUrl" type="VARCHAR" size="512" required="false"/>
-    <column name="radio_station_url" phpName="RadioStationUrl" type="VARCHAR" size="512" required="false"/>
+    <column name="radio_station_url" phpName="DbRadioStationUrl" type="VARCHAR" size="512" required="false"/>
-    <column name="buy_this_url" phpName="BuyThisUrl" type="VARCHAR" size="512" required="false"/>
+    <column name="buy_this_url" phpName="DbBuyThisUrl" type="VARCHAR" size="512" required="false"/>
-    <column name="isrc_number" phpName="IsrcNumber" type="VARCHAR" size="512" required="false"/>
+    <column name="isrc_number" phpName="DbIsrcNumber" type="VARCHAR" size="512" required="false"/>
-    <column name="catalog_number" phpName="CatalogNumber" type="VARCHAR" size="512" required="false"/>
+    <column name="catalog_number" phpName="DbCatalogNumber" type="VARCHAR" size="512" required="false"/>
-    <column name="original_artist" phpName="OriginalArtist" type="VARCHAR" size="512" required="false"/>
+    <column name="original_artist" phpName="DbOriginalArtist" type="VARCHAR" size="512" required="false"/>
-    <column name="copyright" phpName="Copyright" type="VARCHAR" size="512" required="false"/>
+    <column name="copyright" phpName="DbCopyright" type="VARCHAR" size="512" required="false"/>
-    <column name="report_datetime" phpName="ReportDatetime" type="VARCHAR" size="32" required="false"/>
+    <column name="report_datetime" phpName="DbReportDatetime" type="VARCHAR" size="32" required="false"/>
-    <column name="report_location" phpName="ReportLocation" type="VARCHAR" size="512" required="false"/>
+    <column name="report_location" phpName="DbReportLocation" type="VARCHAR" size="512" required="false"/>
-    <column name="report_organization" phpName="ReportOrganization" type="VARCHAR" size="512" required="false"/>
+    <column name="report_organization" phpName="DbReportOrganization" type="VARCHAR" size="512" required="false"/>
-    <column name="subject" phpName="Subject" type="VARCHAR" size="512" required="false"/>
+    <column name="subject" phpName="DbSubject" type="VARCHAR" size="512" required="false"/>
-    <column name="contributor" phpName="Contributor" type="VARCHAR" size="512" required="false"/>
+    <column name="contributor" phpName="DbContributor" type="VARCHAR" size="512" required="false"/>
-    <column name="language" phpName="Language" type="VARCHAR" size="512" required="false"/>
+    <column name="language" phpName="DbLanguage" type="VARCHAR" size="512" required="false"/>
     <foreign-key foreignTable="cc_subjs" name="cc_files_editedby_fkey">
       <reference local="editedby" foreign="id"/>
     </foreign-key>
@@ -248,13 +248,14 @@
     </unique>
   </table>
   <table name="cc_subjs" phpName="CcSubjs">
-    <column name="id" phpName="Id" type="INTEGER" primaryKey="true" autoIncrement="true" required="true"/>
+    <column name="id" phpName="DbId" type="INTEGER" primaryKey="true" autoIncrement="true" required="true"/>
-    <column name="login" phpName="Login" type="VARCHAR" size="255" required="true" defaultValue=""/>
+    <column name="login" phpName="DbLogin" type="VARCHAR" size="255" required="true" defaultValue=""/>
-    <column name="pass" phpName="Pass" type="VARCHAR" size="255" required="true" defaultValue=""/>
+    <column name="pass" phpName="DbPass" type="VARCHAR" size="255" required="true" defaultValue=""/>
-    <column name="type" phpName="Type" type="CHAR" size="1" required="true" defaultValue="U"/>
+    <column name="type" phpName="DbType" type="CHAR" size="1" required="true" defaultValue="U"/>
-    <column name="realname" phpName="Realname" type="VARCHAR" size="255" required="true" defaultValue=""/>
+    <column name="first_name" phpName="DbFirstName" type="VARCHAR" size="255" required="true" defaultValue=""/>
-    <column name="lastlogin" phpName="Lastlogin" type="TIMESTAMP" required="false"/>
+	<column name="last_name" phpName="DbLastName" type="VARCHAR" size="255" required="true" defaultValue=""/>
-    <column name="lastfail" phpName="Lastfail" type="TIMESTAMP" required="false"/>
+    <column name="lastlogin" phpName="DbLastlogin" type="TIMESTAMP" required="false"/>
+    <column name="lastfail" phpName="DbLastfail" type="TIMESTAMP" required="false"/>
     <unique name="cc_subjs_id_idx">
       <unique-column name="id"/>
     </unique>

build/sql/schema.sql

@@ -393,7 +393,8 @@ CREATE TABLE "cc_subjs"
 	"login" VARCHAR(255) default '' NOT NULL,
 	"pass" VARCHAR(255) default '' NOT NULL,
 	"type" CHAR(1) default 'U' NOT NULL,
-	"realname" VARCHAR(255) default '' NOT NULL,
+	"first_name" VARCHAR(255) default '' NOT NULL,
+	"last_name" VARCHAR(255) default '' NOT NULL,
 	"lastlogin" TIMESTAMP,
 	"lastfail" TIMESTAMP,
 	PRIMARY KEY ("id"),

public/js/campcaster/schedule/schedule.js

@@ -61,6 +61,7 @@ function submitShow() {
 		function(data){
 			if(data.form) {
 				dialog.find("form").remove();
+				dialog.find("#show_overlap_error").remove();
 				dialog.append(data.form);
 
 				var start  = dialog.find("#start_date");
@@ -70,8 +71,9 @@ function submitShow() {
 				createDateInput(end, endDpSelect);
 
 				if(data.overlap) {
-					var table, tr, days;
+					var div, table, tr, days;
-					table = $("<table/>");
+					div = $('<div id="show_overlap_error"/>');
+					table = $('<table/>');
 					days = $.datepicker.regional[''].dayNamesShort;
 
 					$.each(data.overlap, function(i, val){
@@ -85,8 +87,9 @@ function submitShow() {
 						table.append(tr);
 					});
 				
-					dialog.append("<span>Cannot add show. New show overlaps the following shows:</span>");
+					div.append("<span>Cannot add show. New show overlaps the following shows:</span>");
-					dialog.append(table);
+					div.append(table);
+					dialog.append(div);
 				}
 	
 			}
@@ -128,14 +131,20 @@ function schedulePlaylist() {
 	
 }
 
-function makeShowDialog(html) {
+function autoSelect(event, ui) {
+
+	$("#hosts-"+ui.item.value).attr("checked", "checked");
+	event.preventDefault();
+}
+
+function makeShowDialog(json) {
 	
 	var dialog;
 
 	//main jqueryUI dialog
 	dialog = $('<div id="schedule_add_event_dialog" />');
 
-	dialog.append(html);
+	dialog.append(json.form);
 
 	var start  = dialog.find("#start_date");
 	var end  = dialog.find("#end_date");
@@ -143,6 +152,16 @@ function makeShowDialog(html) {
 	createDateInput(start, startDpSelect);
 	createDateInput(end, endDpSelect);
 
+	var auto = json.hosts.map(function(el) {
+		return {value: el.id, label: el.login};
+	});
+
+	dialog.find("#hosts_autocomplete").autocomplete({
+		source: auto,
+		select: autoSelect
+	});
+
+
 	dialog.dialog({
 		autoOpen: false,
 		title: 'Add Show',
@@ -200,7 +219,7 @@ function openShowDialog() {
 	url = '/Schedule/add-show-dialog/format/json';
 
 	$.get(url, function(json){
-		var dialog = makeShowDialog(json.form);
+		var dialog = makeShowDialog(json);
 		dialog.dialog('open');
 	});
 }