Added examples, html5 history browsing and 'my-fiddles' section. Fixed timezone php bug

Author: Marc J. Schmidt

.bowerrc

@@ -0,0 +1,3 @@
+{
+    "directory": "Resources/public/libs"
+}

Controller/MainController.php

@@ -3,12 +3,14 @@
 namespace PropelSandbox\Controller;
 
 use FOS\RestBundle\Request\ParamFetcher;
+use Propel\Runtime\ActiveQuery\Criteria;
 use Propel\Runtime\Map\TableMap;
 use PropelSandbox\Model\Fiddle;
 use PropelSandbox\Model\FiddleQuery;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Request;
-use FOS\RestBundle\Controller\Annotations\View;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 use FOS\RestBundle\Controller\Annotations\Get;
 use FOS\RestBundle\Controller\Annotations\Post;
 use FOS\RestBundle\Controller\Annotations\Put;
@@ -19,42 +21,59 @@ class MainController extends Controller
 {
 
     /**
-     *
-     * @QueryParam(name="fiddle", requirements="[a-zA-Z0-9]{7}")
-     *
-     * @Get("/")
-     * @Get("/{fiddle}")
+     * @Route("/")
+     * @Route("/{fiddle}",requirements={"fiddle" = "[a-zA-Z0-9]{7}"})
+     * @Route("/example/{exampleId}",requirements={"exampleId" = "[a-zA-Z0-9]+"})
+     * @Method("GET")
      */
-    public function indexAction(Request $request, $fiddle = '')
+    public function appAction(Request $request, $fiddle = '')
     {
-        $editable = $fiddle ? $this->isEditable($fiddle, $request) : true;
-
-        $model = false;
-        $fiddleId = $fiddle;
-
         if ($fiddle) {
             $fiddle = FiddleQuery::create()->findPk($fiddle);
             if (!$fiddle) {
-                throw $this->createNotFoundException('The fiddle does not exist');
+                throw $this->createNotFoundException('The fiddle does not exist.');
             }
-
-            $model = $fiddle->exportModel();
         }
 
-        $config = array(
-            'fiddleId' => $fiddleId,
-            'editable' => $editable
-        );
-
         return $this->render(
-            'PropelSandboxBundle::app.twig.html',
-            array(
-                'config' => $config,
-                'model' => $model
-            )
+            'PropelSandboxBundle::app.twig.html'
         );
     }
 
+    /**
+     * @Route("/{fiddle}.json", requirements={"fiddle" = "[a-zA-Z0-9]{7}"})
+     * @Method("GET")
+     */
+    public function fiddleAsJsonAction($fiddle, Request $request)
+    {
+        $fiddle = FiddleQuery::create()->findPk($fiddle);
+        if (!$fiddle) {
+            throw $this->createNotFoundException('The fiddle does not exist. [json]');
+        }
+
+        $result = $fiddle->exportModel();
+        $result['editable'] = $this->isEditable($fiddle->getId(), $request);
+
+        return $result;
+    }
+
+    /**
+     * @Route("/my-fiddles")
+     * @Method("GET")
+     */
+    public function myFiddles(Request $request)
+    {
+        $request->getSession()->start();
+        $sessionId = $request->getSession()->getId();
+
+        return FiddleQuery::create()
+            ->select(['id', 'title', 'created_at'])
+            ->filterBySessionOwner($sessionId)
+            ->orderByCreatedAt(Criteria::DESC)
+            ->find()
+            ->toArray();
+    }
+
     /**
      * @param string $fiddle
      * @param Request $request

README.md

@@ -8,9 +8,13 @@
 ```
 useradd sandbox --home /home/sandbox
 echo 'www-data ALL= NOPASSWD: /var/www/propelsandbox/src/PropelSandbox/Resources/meta/jail.sh' >> /etc/sudoers // or sudo visudo
-iptables -I OUTPUT -j REJECT -m owner --gid-owner sandbox #dont forget to do this on server boot, use iptables-persistent
+
+#dont forget to do this on server boot, use iptables-persistent
+iptables -I OUTPUT -j REJECT -m owner --gid-owner sandbox 
+iptables -I OUTPUT -j ACCEPT -p tcp -d 127.0.0.1 -m owner --gid-owner sandbox
 ```
 4. make sure `/var/www/propelsandbox/src/PropelSandbox/Resources/meta/jail.sh` is only writeable by root!
 5. fire `bower install` in `src/PropelSandbox`
 6. make sure /tmp/propelsandbox is writeable by your web server
+7. user `sandbox` needs access to `/tmp/propelsandbox/`, `/tmp/propelsandbox/chroots/` rx.
 7. Make sure all dependencies are set up. See @propelorm/sandbox-vagrant/bootstrap.sh for more information.

Resources/config/config.yml

@@ -14,4 +14,6 @@ framework:
 
 fos_rest:
     param_fetcher_listener: true
-    body_listener: true
+    body_listener: true
+    routing_loader:
+        include_format: false

Resources/meta/jail-php.ini

@@ -1,6 +1,6 @@
 [PHP]
 
-zend_extension=xdebug.so
+;zend_extension=xdebug.so
 extension=pdo.so
 extension=pdo_mysql.so
 extension=json.so
@@ -871,7 +871,7 @@ cli_server.color = On
 [Date]
 ; Defines the default timezone used by the date functions
 ; http://php.net/date.timezone
-;date.timezone =
+date.timezone = "Europe/Berlin"
 
 ; http://php.net/date.default-latitude
 ;date.default_latitude = 31.7667

Resources/meta/setup_jail_base.sh

@@ -75,6 +75,8 @@ chmod 644 $BASE/etc/passwd $BASE/etc/shadow $BASE/etc/group
 mkdir -p $BASE/etc/php5/cli
 cp $metaDir/jail-php.ini $BASE/etc/php5/cli/php.ini
 
+mkdir -p $BASE/usr/share/
+cp -r /usr/share/zoneinfo $BASE/usr/share/
 
 cp $metaDir/start.sh $BASE/bin/
 cp $metaDir/model-build.sh $BASE/bin/

Resources/public/.bowerrc

@@ -1,9 +1,23 @@
 import angular from './angular';
 
-var app = angular.module('propelFiddle', ['ui.codemirror', 'ui.bootstrap']);
+var app = angular.module('propelFiddle', ['ngRoute', 'ui.codemirror', 'ui.bootstrap']);
 
 import MainController from './controller/MainController';
 import toArray from './filters/toArray';
 
+import examples from './examples';
+
 app.controller('MainController', MainController);
 app.filter('toArray', () => toArray);
+app.constant('EXAMPLES', examples);
+app.config(['$routeProvider', '$locationProvider', function($routeProvider, $locationProvider) {
+    // use the HTML5 History API
+    $locationProvider.html5Mode(true);
+
+    $routeProvider
+        .when(window._baseUrl + '/', {})
+        .when(window._baseUrl + '/:fiddleId', {})
+        .when(window._baseUrl + '/example/:exampleId', {});
+}]);
+
+app.run(function($route) {});