Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Conflicts:
	public/css/styles.css
This commit is contained in:
Naomi 2011-02-11 18:59:27 -05:00
commit d9118fe2d0
14 changed files with 112 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
application/controllers/DashboardController.php
View file

@ -13,10 +13,15 @@ class DashboardController extends Zend_Controller_Action
// action body
}
public function helpAction()
{
// action body
}
}

3
application/controllers/UserController.php
View file

@ -36,6 +36,9 @@ class UserController extends Zend_Controller_Action
if ($formdata['password'] != "xxxxxx")
$user->setPassword($formdata['password']);
$user->setType($formdata['type']);
$user->setEmail($formdata['email']);
$user->setSkype($formdata['skype']);
$user->setJabber($formdata['jabber']);
$user->save();
$form->reset();