Merge branch '3.1.x'

.gitignore

@@ -15,3 +15,4 @@ cache.properties
 lint.cache
 tags
 .project
+.vagrant

.gitmodules

@@ -4,3 +4,45 @@
 [submodule "app/plugins/extended_test_case"]
 	path = app/plugins/extended_test_case
 	url = https://github.com/jeremyharris/extended_test_case.git
+[submodule "puppet/modules/ipeer"]
+	path = puppet/modules/ipeer
+	url = https://github.com/ubc/puppet-ipeer.git
+[submodule "puppet/modules/stdlib"]
+	path = puppet/modules/stdlib
+	url = https://github.com/puppetlabs/puppetlabs-stdlib.git
+[submodule "puppet/modules/vcsrepo"]
+	path = puppet/modules/vcsrepo
+	url = https://github.com/puppetlabs/puppetlabs-vcsrepo.git
+[submodule "puppet/modules/git"]
+	path = puppet/modules/git
+	url = https://github.com/theforeman/puppet-git.git
+[submodule "puppet/modules/apt"]
+	path = puppet/modules/apt
+	url = https://github.com/puppetlabs/puppetlabs-apt.git
+[submodule "puppet/modules/firewall"]
+	path = puppet/modules/firewall
+	url = https://github.com/puppetlabs/puppetlabs-firewall.git
+[submodule "puppet/modules/mysql"]
+	path = puppet/modules/mysql
+	url = https://github.com/puppetlabs/puppetlabs-mysql.git
+[submodule "puppet/modules/php"]
+	path = puppet/modules/php
+	url = https://github.com/thias/puppet-php.git
+[submodule "nginx"]
+	path = puppet/modules/nginx
+	url = https://github.com/ubc/puppet-nginx.git
+[submodule "concat"]
+	path = puppet/modules/concat
+	url = https://github.com/puppetlabs/puppetlabs-concat.git
+[submodule "puppet/modules/db"]
+	path = puppet/modules/db
+	url = https://github.com/ubc/puppet-db.git
+[submodule "vendors/webdriver"]
+	path = vendors/webdriver
+	url = https://github.com/Element-34/php-webdriver.git
+[submodule "vendors/sausage"]
+	path = vendors/sausage
+	url = https://github.com/jlipps/sausage.git
+[submodule "puppet/modules/epel"]
+	path = puppet/modules/epel
+	url = https://github.com/stahnma/puppet-module-epel.git

Vagrantfile

@@ -0,0 +1,135 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
+VAGRANTFILE_API_VERSION = "2"
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+  # All Vagrant configuration is done here. The most common configuration
+  # options are documented and commented below. For a complete reference,
+  # please see the online documentation at vagrantup.com.
+
+  # Every Vagrant virtual environment requires a box to build off of.
+  config.vm.box = "ipeerbox"
+
+  config.vm.box_url = "http://developer.nrel.gov/downloads/vagrant-boxes/CentOS-6.4-x86_64-v20130731.box"
+
+  config.vm.define "ipeerdev" do |t|
+  end
+
+  config.vm.provision "puppet" do |puppet|
+        puppet.manifests_path = "puppet"
+        puppet.manifest_file  = "dev.pp"
+        puppet.module_path = "puppet/modules"
+        puppet.options = "--environment development"
+  end
+
+  config.vm.provision :shell, :path => "puppet/bootstrap.sh"
+
+  config.vm.network :forwarded_port, host: 2000, guest: 2000
+
+  # The url from where the 'config.vm.box' box will be fetched if it
+  # doesn't already exist on the user's system.
+  # config.vm.box_url = "http://domain.com/path/to/above.box"
+
+  # Create a forwarded port mapping which allows access to a specific port
+  # within the machine from a port on the host machine. In the example below,
+  # accessing "localhost:8080" will access port 80 on the guest machine.
+  # config.vm.network :forwarded_port, guest: 80, host: 8080
+
+  # Create a private network, which allows host-only access to the machine
+  # using a specific IP.
+  # config.vm.network :private_network, ip: "192.168.33.10"
+
+  # Create a public network, which generally matched to bridged network.
+  # Bridged networks make the machine appear as another physical device on
+  # your network.
+  # config.vm.network :public_network
+
+  # If true, then any SSH connections made will enable agent forwarding.
+  # Default value: false
+  # config.ssh.forward_agent = true
+
+  # Share an additional folder to the guest VM. The first argument is
+  # the path on the host to the actual folder. The second argument is
+  # the path on the guest to mount the folder. And the optional third
+  # argument is a set of non-required options.
+  config.vm.synced_folder ".", "/var/www", id: "vagrant-root",
+    mount_options: ["dmode=777,fmode=666"]
+
+  # Provider-specific configuration so you can fine-tune various
+  # backing providers for Vagrant. These expose provider-specific options.
+  # Example for VirtualBox:
+  #
+  # config.vm.provider :virtualbox do |vb|
+  #   # Don't boot with headless mode
+  #   vb.gui = true
+  #
+  #   # Use VBoxManage to customize the VM. For example to change memory:
+  #   vb.customize ["modifyvm", :id, "--memory", "1024"]
+  # end
+  #
+  # View the documentation for the provider you're using for more
+  # information on available options.
+
+  # Enable provisioning with Puppet stand alone.  Puppet manifests
+  # are contained in a directory path relative to this Vagrantfile.
+  # You will need to create the manifests directory and a manifest in
+  # the file base.pp in the manifests_path directory.
+  #
+  # An example Puppet manifest to provision the message of the day:
+  #
+  # # group { "puppet":
+  # #   ensure => "present",
+  # # }
+  # #
+  # # File { owner => 0, group => 0, mode => 0644 }
+  # #
+  # # file { '/etc/motd':
+  # #   content => "Welcome to your Vagrant-built virtual machine!
+  # #               Managed by Puppet.\n"
+  # # }
+  #
+  # config.vm.provision :puppet do |puppet|
+  #   puppet.manifests_path = "manifests"
+  #   puppet.manifest_file  = "site.pp"
+  # end
+
+  # Enable provisioning with chef solo, specifying a cookbooks path, roles
+  # path, and data_bags path (all relative to this Vagrantfile), and adding
+  # some recipes and/or roles.
+  #
+  # config.vm.provision :chef_solo do |chef|
+  #   chef.cookbooks_path = "../my-recipes/cookbooks"
+  #   chef.roles_path = "../my-recipes/roles"
+  #   chef.data_bags_path = "../my-recipes/data_bags"
+  #   chef.add_recipe "mysql"
+  #   chef.add_role "web"
+  #
+  #   # You may also specify custom JSON attributes:
+  #   chef.json = { :mysql_password => "foo" }
+  # end
+
+  # Enable provisioning with chef server, specifying the chef server URL,
+  # and the path to the validation key (relative to this Vagrantfile).
+  #
+  # The Opscode Platform uses HTTPS. Substitute your organization for
+  # ORGNAME in the URL and validation key.
+  #
+  # If you have your own Chef Server, use the appropriate URL, which may be
+  # HTTP instead of HTTPS depending on your configuration. Also change the
+  # validation key to validation.pem.
+  #
+  # config.vm.provision :chef_client do |chef|
+  #   chef.chef_server_url = "https://api.opscode.com/organizations/ORGNAME"
+  #   chef.validation_key_path = "ORGNAME-validator.pem"
+  # end
+  #
+  # If you're using the Opscode platform, your validator client is
+  # ORGNAME-validator, replacing ORGNAME with your organization name.
+  #
+  # If you have your own Chef Server, the default validation client name is
+  # chef-validator, unless you changed the configuration.
+  #
+  #   chef.validation_client_name = "ORGNAME-validator"
+end

app/app_controller.php

@@ -13,21 +13,6 @@
 App::import('Lib', 'toolkit');
 App::import('Lib', 'breadcrumb');
 
-/**
- * _t
- * because CakePHP 1.3's internationalization __() call is stupid and wants
- * you to pass an extra parameter for no reason to get a string, use this
- * instead.
- *
- * @param mixed $str
- *
- * @access public
- * @return void
- */
-function _t($str) {
-    return __($str, true);
-}
-
 /**
  * AppController the base controller
  *
@@ -244,6 +229,13 @@ public function _afterLogin($isRedirect = true)
     {
         if ($this->Auth->isAuthorized()) {
             User::getInstance($this->Auth->user());
+            // deny access for inactive users
+            if (User::get('record_status') == 'I') {
+                $this->Auth->logout();
+                $this->Session->setFlash(__('Your account is currently inactive.', true));
+                $this->redirect('/');
+                return;
+            }
             // after login stuff
             $this->User->loadRoles(User::get('id'));
             $this->AccessControl->loadPermissions();

app/config/core.php

@@ -319,7 +319,7 @@
   /**
    * iPeer database version
    */
-  Configure::write('DATABASE_VERSION', 6);
+  Configure::write('DATABASE_VERSION', 7);
 
 
   $CWL['LoginURL'] = 'https://www.auth.cwl.ubc.ca/auth/login';
@@ -342,7 +342,7 @@
   $CWL['applicationID'] = '';
   $CWL['applicationPassword'] = '';
 
-  define('IPEER_VERSION', '3.1.3');
+  define('IPEER_VERSION', '3.1.4');
 
 
 /**

app/config/routes.php

@@ -82,6 +82,14 @@
   Router::connect('/:controller/courses/:course_id/departments/:department_id',
     array('action'=> 'courseDepartments'),
     array('course_id' => '[0-9]+', 'department_id' => '[0-9]+'));
+  // Connect url to users/events api with filters
+  Router::connect('/:controller/users/:username/events/sub/:sub/results/:results',
+    array('action' => 'userEvents'),
+    array('sub' => '[0-1]', 'results' => '[0-1]'));
+  // connect url to users/events/course api with filters
+  Router::connect('/:controller/courses/:course_id/users/:username/events/sub/:sub/results/:results',
+    array('action' => 'userEvents'),
+    array('course_id' => '[0-9]+', 'sub' => '[0-1]', 'results' => '[0-1]'));
   // Connect url to users/events api
   Router::connect('/:controller/users/:username/events',
     array('action' => 'userEvents'));