Merge branch 'modular' into develop

Conflicts:
	.gitignore
	composer.json
	composer.lock
	config/.gitignore
	public/.htaccess
	public/css/style.css
	public/index.php

composer.json

@@ -18,33 +18,28 @@
     ],
     "require": {
         "php": ">=5.5",
-        "slim/slim": "^3.0",
-        "slim/twig-view": "^2.0",
-        "slim/flash": "^0.1.0",
-        "slim/csrf": "^0.6.0",
-        "monolog/monolog": "^1.13",
+        "gabordemooij/redbean": "^4.3.1",
+        "guzzlehttp/guzzle": "^6.1",
+        "jasig/phpcas": "1.3.4",
         "kanellov/config-merge": "dev-master",
+        "kanellov/php-events": "^1.0.0",
         "kanellov/slim-twig-flash": "^0.1",
+        "monolog/monolog": "^1.13",
+        "slim/csrf": "^0.6.0",
+        "slim/flash": "^0.1.0",
+        "slim/slim": "^3.0",
+        "slim/twig-view": "^2.0",
         "zendframework/zend-authentication": "^2.0",
+        "zendframework/zend-crypt": "^2.0",
         "zendframework/zend-eventmanager": "^3.0",
+        "zendframework/zend-ldap": "^2.0",
         "zendframework/zend-permissions-acl": "^2.0",
-        "jasig/phpcas": "1.3.4",
-        "guzzlehttp/guzzle": "^6.1"
+        "zendframework/zend-inputfilter": "^2.0"
     },
     "require-dev": {
         "fabpot/php-cs-fixer": "1.*",
+        "phpunit/phpcov": "2.*",
         "phpunit/PHPUnit": "4.*",
-        "satooshi/php-coveralls": "dev-master",
-        "phpunit/phpcov": "2.*"
-    },
-    "autoload": {
-        "psr-4": {
-            "GrEduLabs\\": "app/src"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "GrEduLabsTest\\": "test/src"
-        }
+        "satooshi/php-coveralls": "dev-master"
     }
 }

config/.gitignore

-local.php
-*.local.php
\ No newline at end of file
+dev.config.php

config/app.config.php

+<?php
+/**
+ * gredu_labs.
+ * 
+ * @link https://github.com/eellak/gredu_labs for the canonical source repository
+ *
+ * @copyright Copyright (c) 2008-2015 Greek Free/Open Source Software Society (https://gfoss.ellak.gr/)
+ * @license GNU GPLv3 http://www.gnu.org/licenses/gpl-3.0-standalone.html
+ */
+
+return [
+    'modules' => [
+        'module/application/bootstrap.php',
+        'module/assets_manager/bootstrap.php',
+        'module/authentication/bootstrap.php',
+        'module/authorization/bootstrap.php',
+        'module/sch_ldap/bootstrap.php',
+        'module/sch_sso/bootstrap.php',
+        'module/sch_mm/bootstrap.php',
+        'module/sch_inventory/bootstrap.php',
+        'module/sch_sync/bootstrap.php',
+        'module/schools/bootstrap.php',
+    ],
+    'cache_config' => 'data/cache/config/settings.php',
+];

config/dev.config.php.dist

+<?php
+/**
+ * gredu_labs
+ * 
+ * @link https://github.com/eellak/gredu_labs for the canonical source repository
+ * @copyright Copyright (c) 2008-2015 Greek Free/Open Source Software Society (https://gfoss.ellak.gr/)
+ * @license GNU GPLv3 http://www.gnu.org/licenses/gpl-3.0-standalone.html
+ */
+
+return [
+    'modules' => [
+        'module/debug/bootstrap.php',
+    ],
+    'cache_config' => false,
+];

config/settings/.gitignore

+local.php
+*.local.php
\ No newline at end of file

config/settings/acl.global.php

+<?php
+/**
+ * gredu_labs
+ * 
+ * @link https://github.com/eellak/gredu_labs for the canonical source repository
+ * @copyright Copyright (c) 2008-2015 Greek Free/Open Source Software Society (https://gfoss.ellak.gr/)
+ * @license GNU GPLv3 http://www.gnu.org/licenses/gpl-3.0-standalone.html
+ */
+
+return [
+    'acl' => [
+        'default_role' => 'guest',
+        'roles'        => [
+            'guest'  => [],
+            'user'   => [],
+            'school' => ['user'],
+            'admin'  => ['user'],
+        ],
+        'resoures' => [],
+        'guards'   => [
+            'resources' => [],
+            'callables' => [],
+            'routes'    => [
+                ['/', ['guest', 'user'], ['get']],
+            ],
+        ],
+    ],
+];

config/settings/assets_manager.global.php

+<?php
+/**
+ * gredu_labs
+ * 
+ * @link https://github.com/eellak/gredu_labs for the canonical source repository
+ * @copyright Copyright (c) 2008-2015 Greek Free/Open Source Software Society (https://gfoss.ellak.gr/)
+ * @license GNU GPLv3 http://www.gnu.org/licenses/gpl-3.0-standalone.html
+ */
+
+return [
+    'assets' => [
+        'web_dir'    => 'public',
+        'paths'      => [
+            'module/schools/public',
+        ],
+    ],
+];

config/settings/authentication.global.php

+<?php
+/**
+ * gredu_labs
+ * 
+ * @link https://github.com/eellak/gredu_labs for the canonical source repository
+ * @copyright Copyright (c) 2008-2015 Greek Free/Open Source Software Society (https://gfoss.ellak.gr/)
+ * @license GNU GPLv3 http://www.gnu.org/licenses/gpl-3.0-standalone.html
+ */
+
+return [
+    'acl' => [
+        'guards' => [
+            'routes'    => [
+                ['/user/login', ['guest'], ['get', 'post']],
+                ['/user/logout', ['user'], ['get']],
+            ],
+        ],
+    ],
+];

config/settings/authentication.local.php.dist

+<?php
+/**
+ * gredu_labs
+ * 
+ * @link https://github.com/eellak/gredu_labs for the canonical source repository
+ * @copyright Copyright (c) 2008-2015 Greek Free/Open Source Software Society (https://gfoss.ellak.gr/)
+ * @license GNU GPLv3 http://www.gnu.org/licenses/gpl-3.0-standalone.html
+ */
+
+return [
+    'authentication' => [
+        'bcrypt' => [
+            'salt' => '',
+            'cost' => 14,
+        ],
+    ],
+];
\ No newline at end of file

config/settings/db.local.php.dist

+<?php
+/**
+ * gredu_labs
+ * 
+ * @link https://github.com/eellak/gredu_labs for the canonical source repository
+ * @copyright Copyright (c) 2008-2015 Greek Free/Open Source Software Society (https://gfoss.ellak.gr/)
+ * @license GNU GPLv3 http://www.gnu.org/licenses/gpl-3.0-standalone.html
+ */
+ return [
+    'db' => [
+        'dsn'     => '',
+        'user'    => null,
+        'pass'    => null,
+        'options' => [
+
+        ],
+    ],
+];
\ No newline at end of file

config/settings/debug.global.php

+<?php
+/**
+ * gredu_labs.
+ * 
+ * @link https://github.com/eellak/gredu_labs for the canonical source repository
+ *
+ * @copyright Copyright (c) 2008-2015 Greek Free/Open Source Software Society (https://gfoss.ellak.gr/)
+ * @license GNU GPLv3 http://www.gnu.org/licenses/gpl-3.0-standalone.html
+ */
+return [
+    'logger' => [
+        'debug_path' => 'data/log/debug.log',
+    ],
+];

config/settings/global.php

+<?php
+/**
+ * gredu_labs.
+ * 
+ * @link https://github.com/eellak/gredu_labs for the canonical source repository
+ *
+ * @copyright Copyright (c) 2008-2015 Greek Free/Open Source Software Society (https://gfoss.ellak.gr/)
+ * @license GNU GPLv3 http://www.gnu.org/licenses/gpl-3.0-standalone.html
+ */
+return [
+    // Slim Settings
+    'determineRouteBeforeAppMiddleware' => false,
+    'displayErrorDetails'               => false,
+];

config/settings/inventory.local.php.dist

+<?php return [
+    'inventory' => [
+        'base_uri' => '',
+    ],
+];
\ No newline at end of file

config/settings/ldap.local.php.dist

+<?php
+/**
+ * gredu_labs.
+ * 
+ * @link https://github.com/eellak/gredu_labs for the canonical source repository
+ *
+ * @copyright Copyright (c) 2008-2015 Greek Free/Open Source Software Society (https://gfoss.ellak.gr/)
+ * @license GNU GPLv3 http://www.gnu.org/licenses/gpl-3.0-standalone.html
+ */
+
+return [
+    'ldap' => [
+        'host'                   => '',
+        'username'               => '',
+        'password'               => '',
+        'baseDn'                 => '',
+        'port'                   => 389,
+        'useSsl'                 => false,
+        'bindRequiresDn'         => true,
+        'accountCanonicalForm'   => null,
+        'accountDomainName'      => null,
+        'accountDomainNameShort' => null,
+        'accountFilterFormat'    => null,
+        'allowEmptyPassword'     => false,
+        'useStartTls'            => false,
+        'optReferrals'           => false,
+        'tryUsernameSplit'       => true,
+        'networkTimeout'         => null,
+    ],
+];
\ No newline at end of file

config/settings/monolog.global.php

+<?php
+/**
+ * gredu_labs.
+ * 
+ * @link https://github.com/eellak/gredu_labs for the canonical source repository
+ *
+ * @copyright Copyright (c) 2008-2015 Greek Free/Open Source Software Society (https://gfoss.ellak.gr/)
+ * @license GNU GPLv3 http://www.gnu.org/licenses/gpl-3.0-standalone.html
+ */
+return [
+    'logger' => [
+        'name'      => 'app',
+        'path'      => 'data/log/app.log',
+        'max_files' => 30,
+    ],
+];

config/settings/nav.global.php

+<?php
+/**
+ * gredu_labs.
+ * 
+ * @link https://github.com/eellak/gredu_labs for the canonical source repository
+ *
+ * @copyright Copyright (c) 2008-2015 Greek Free/Open Source Software Society (https://gfoss.ellak.gr/)
+ * @license GNU GPLv3 http://www.gnu.org/licenses/gpl-3.0-standalone.html
+ */
+
+return [
+    'navigation' => [
+        'main' => [
+            'index' => [
+                'label' => 'Αρχική',
+                'route' => 'index',
+                'class' => 'hidden',
+            ],
+            'school' => [
+                'label' => 'Το σχολείο',
+                'route' => 'school',
+                'pages' => [
+                    'info' => [
+                        'label' => 'Πληροφορίες',
+                        'route' => 'school',
+                        'icon'  => 'info',
+                    ],
+                    'staff' => [
+                        'label' => 'Εκπαιδευτικοί',
+                        'route' => 'school.staff',
+                        'icon'  => 'users',
+                    ],
+                    'labs' => [
+                        'label' => 'Χώροι',
+                        'route' => 'school.labs',
+                        'icon'  => 'building-o',
+                    ],
+                    'assets' => [
+                        'label' => 'Εξοπλισμός',
+                        'route' => 'school.assets',
+                        'icon'  => 'tv',
+                    ],
+                ],
+            ],
+            // 'app-form' => [
+            //     'label' => 'Αίτηση',
+            //     'route' => 'app-form',
+            // ],
+
+        ],
+    ],
+];

config/settings/sch_mm.local.php.dist

+<?php
+/**
+ * gredu_labs
+ * 
+ * @link https://github.com/eellak/gredu_labs for the canonical source repository
+ * @copyright Copyright (c) 2008-2015 Greek Free/Open Source Software Society (https://gfoss.ellak.gr/)
+ * @license GNU GPLv3 http://www.gnu.org/licenses/gpl-3.0-standalone.html
+ */
+
+return [
+    'sch_mm' => [
+        'api_url' => '',
+        'api_user' => '',
+        'api_pass' => '',
+    ]
+];
\ No newline at end of file

config/settings/schools.global.php

+<?php
+/**
+ * gredu_labs
+ * 
+ * @link https://github.com/eellak/gredu_labs for the canonical source repository
+ * @copyright Copyright (c) 2008-2015 Greek Free/Open Source Software Society (https://gfoss.ellak.gr/)
+ * @license GNU GPLv3 http://www.gnu.org/licenses/gpl-3.0-standalone.html
+ */
+
+return [
+    'acl' => [
+        'guards'   => [
+            'routes'    => [
+                ['/school', ['school'], ['get']],
+                ['/school/labs', ['school'], ['get']],
+                ['/school/staff', ['school'], ['get', 'post']],
+                ['/school/staff/{id:[1-9][0-9]*}', ['school'], ['delete']],
+                ['/school/assets', ['school'], ['get']],
+            ],
+        ],
+    ],
+];

config/settings/sso.local.php.dist

+<?php
+/**
+ * gredu_labs
+ * 
+ * @link https://github.com/eellak/gredu_labs for the canonical source repository
+ * @copyright Copyright (c) 2008-2015 Greek Free/Open Source Software Society (https://gfoss.ellak.gr/)
+ * @license GNU GPLv3 http://www.gnu.org/licenses/gpl-3.0-standalone.html
+ */
+
+return [
+    
+    'sso' => [
+        'phpcas' => [
+            'serverVersion'         => 'S1',
+            'proxy'                 => false,
+            'serverHostname'        => '',
+            'serverPort'            => 443,
+            'serverUri'             => '/cas',
+            'changeSessionId'       => false,
+            'handleLogoutRequests'  => true,
+            'allowedClients'        => [],
+            'lang'                  => 'CAS_Languages_Greek',
+            'casServerCaCert'       => '',
+            'casServerCnValidate'   => '',
+            'noCasServerValidation' => true,
+        ],
+    
+        'allowed' => [
+            [
+                'physicaldeliveryofficename' => '/^ΕΠΙΣΗΜΟΣ ΛΟΓΑΡΙΑΣΜΟΣ$/i',
+                'umdobject' => '/^account$/i',
+            ],
+        ],
+    ],
+    'acl' => [
+        'guards' => [
+            'routes' => [
+                ['/user/logout/sso', ['guest'], ['get']],
+            ],
+        ],
+    ],
+];
\ No newline at end of file