From 5dc0a4477b8619df4645aaef8d2b4fadc3639fab Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Tue, 26 Mar 2013 16:10:42 -0400
Subject: [PATCH 1/2] disable deletion of users

---
 airtime_mvc/application/controllers/UserController.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/airtime_mvc/application/controllers/UserController.php b/airtime_mvc/application/controllers/UserController.php
index 3faa1477f..2b1197a9c 100644
--- a/airtime_mvc/application/controllers/UserController.php
+++ b/airtime_mvc/application/controllers/UserController.php
@@ -198,6 +198,11 @@ class UserController extends Zend_Controller_Action
 
         $user = new Application_Model_User($delId);
 
+        if (isset($CC_CONFIG['demo']) && $CC_CONFIG['demo'] == 1
+            && $user->getLogin() == 'admin') {
+                return;
+        }
+
         # Take care of the user's files by either assigning them to somebody
         # or deleting them all
         if ($files_action == "delete_cascade") {

From d9646994e99ae3264587ca43f0c528a7f1c6f4c8 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Tue, 26 Mar 2013 16:33:14 -0400
Subject: [PATCH 2/2] remove airtime-demo specific code

---
 .../controllers/UserController.php            | 20 ++-----------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/airtime_mvc/application/controllers/UserController.php b/airtime_mvc/application/controllers/UserController.php
index 2b1197a9c..f1f3134f0 100644
--- a/airtime_mvc/application/controllers/UserController.php
+++ b/airtime_mvc/application/controllers/UserController.php
@@ -48,13 +48,7 @@ class UserController extends Zend_Controller_Action
 
             if ($form->isValid($formData)) {
 
-                if (isset($CC_CONFIG['demo']) && $CC_CONFIG['demo'] == 1
-                        && $formData['login'] == 'admin'
-                        && $formData['user_id'] != 0) {
-                    $this->view->form = $form;
-                    $this->view->successMessage = "<div class='errors'>"._("Specific action is not allowed in demo version!")."</div>";
-                    die(json_encode(array("valid"=>"false", "html"=>$this->view->render('user/add-user.phtml'))));
-                } elseif ($form->validateLogin($formData)) {
+                if ($form->validateLogin($formData)) {
                     $user = new Application_Model_User($formData['user_id']);
                     if (empty($formData['user_id'])) {
                         $user->setLogin($formData['login']);
@@ -131,12 +125,7 @@ class UserController extends Zend_Controller_Action
         if ($request->isPost()) {
             $formData = $request->getPost();
             
-            if (isset($CC_CONFIG['demo']) && $CC_CONFIG['demo'] == 1
-                    && $formData['cu_login'] == 'admin') {
-                $this->view->form = $form;
-                $this->view->successMessage = "<div class='errors'>"._("Specific action is not allowed in demo version!")."</div>";
-                die(json_encode(array("html"=>$this->view->render('user/edit-user.phtml'))));
-            } else if ($form->isValid($formData) &&
+            if ($form->isValid($formData) &&
                        $form->validateLogin($formData['cu_login'], $formData['cu_user_id'])) {
                 $user = new Application_Model_User($formData['cu_user_id']);
                 $user->setFirstName($formData['cu_first_name']);
@@ -198,11 +187,6 @@ class UserController extends Zend_Controller_Action
 
         $user = new Application_Model_User($delId);
 
-        if (isset($CC_CONFIG['demo']) && $CC_CONFIG['demo'] == 1
-            && $user->getLogin() == 'admin') {
-                return;
-        }
-
         # Take care of the user's files by either assigning them to somebody
         # or deleting them all
         if ($files_action == "delete_cascade") {