Merge pull request #1 from pi-engine/master

update trunk Pi master

README-GIT.md

@@ -6,7 +6,7 @@
 
     ```sh
     % git clone https://github.com/pi-engine/pi.git
-    % cd framework
+    % cd pi
     ```
 
 # GIT REPO SKELETON FOR PI ENGINE

README.md

@@ -6,9 +6,9 @@ Pi is developed upon PHP and MySQL with selected third-party frameworks includin
 
 Pi Project follows the philosophy of open standard, open design, open development and open structure. Pi is born as a complete open source project and intended to build a sustainable ecosystem that benefits all contributors and users. 
 
-[Pi Team](https://github.com/pi-engine/pi/wiki/Pi-Team) is highly inspired by the Xoops led by onokazu (Ono Kazumi), skalpa and phppp (Taiwen Jiang, or D.J.) successively since 2001 and will continue to support and promote Xoops.
+Pi Engine is started by [Taiwen Jiang](http://github.com/taiwen) (Xoops Project Lead and Dev Lead), [Marc Desrousseaux](http://github.com/MarcoXoops) (Xoops QA Lead), [Hossein Azizabadi](http://github.com/voltan) (Xoops Persian Lead), [Kris](http://github.com/krisxoofoo) (Xoops Council Member and Xoops France Lead), etc. [Pi Team](https://github.com/pi-engine/pi/wiki/Pi-Team) is highly inspired by the Xoops led by onokazu (Ono Kazumi), skalpa and phppp (Taiwen Jiang, or D.J.) successively since 2001 and will continue to support and promote Xoops.
 
-**Check out [Latest Release](https://github.com/pi-engine/pi/blob/master/doc/releasenotes.txt).**
+**Check out [Latest Release](https://github.com/pi-engine/pi/blob/master/doc/releasenotes.md).**
 
 
 
@@ -23,15 +23,14 @@ Features and practices
 
 Quick start
 -----------
-* Check documents at [Pi Wiki](https://github.com/pi-engine/pi/wiki)
-* Download the [latest code](https://github.com/xoops/pi/zipball/master).
+* Documents at [Pi Wiki](https://github.com/pi-engine/pi/wiki)
+* Download the [latest stable code](https://github.com/xoops/pi/zipball/master) and [latest dev code](https://github.com/xoops/pi/zipball/develop).
 * Clone Pi repo `git clone git://github.com/pi-engine/pi.git` and [keep updated](https://help.github.com/articles/fork-a-repo#pull-in-upstream-changes).
+* Demo sites with shared deployment: Pi Dialogue ([pialog.org](http://pialog.org) | [pialogue.org](http://pialogue.org)), Pi Demo ([pi-demo.org](http://pi-demo.org)) and Xoops/Pi ([xoopsengine.org](http://demo.xoopsengine.org)).
 
 Development
 ----------
 
-Pi Engine is started by Taiwen Jiang (Xoops Project Lead and Dev Lead), Marc Desrousseaux (Xoops QA Lead), Hossein Azizabadi (Xoops Persian Lead), Kris (Xoops Council Member and Xoops France Lead), etc. You are welcome to join **[Pi Team](https://github.com/pi-engine/pi/wiki/Pi-Team)**. 
-
 You may contribute to Pi at github by submitting your code to Pi repo with **[Pull Request](https://help.github.com/articles/using-pull-requests)** or submitting bug reports and feature requests to **[Issue Tracker](https://github.com/pi-engine/pi/issues)**.
 
 

doc/README.md

@@ -0,0 +1,38 @@
+Pi Engine is a role oriented application development engine for web and mobile, designed as the next generation and a successor to Xoops.
+Pi is developed upon PHP and MySQL with selected third-party frameworks including but not limited to Zend Framework library, jQuery, Bootstrap and Backbone.
+
+Pi Project follows the philosophy of open standard, open design, open development and open structure. Pi is born as a complete open source project and intended to build a sustainable ecosystem that benefits all contributors and users.
+
+Pi Engine is started by [Taiwen Jiang](http://github.com/taiwen) (Xoops Project Lead and Dev Lead), [Marc Desrousseaux](http://github.com/MarcoXoops) (Xoops QA Lead), [Hossein Azizabadi](http://github.com/voltan) (Xoops Persian Lead), [Kris](http://github.com/krisxoofoo) (Xoops Council Member and Xoops France Lead), etc. [Pi Team](https://github.com/pi-engine/pi/wiki/Pi-Team) is highly inspired by the Xoops led by onokazu (Ono Kazumi), skalpa and phppp (Taiwen Jiang, or D.J.) successively since 2001 and will continue to support and promote Xoops.
+
+The Engine is released under a New BSD License.
+
+
+Selected features and practices:
+
+1. Modularization for functionality and applications
+2. Components for basic libraries and services for fundamental system functions
+3. Theming for presentation and appearance
+4. Design-friendly templating
+5. DevOps oriented architecture
+6. Centralized security enhancement
+
+
+Pi Engine tries to be strict standard compliant, including by not limited to:
+
+1. Versioning - [Semantic Versioning Specification](http://semver.org)
+2. PHP - [PSR compliant](https://github.com/php-fig/fig-standards), [Zend Framework Coding Standards](http://framework.zend.com/wiki/display/ZFDEV2/Coding+Standards)
+3. HTML/CSS - [Google HTML/CSS Style Guide](http://google-styleguide.googlecode.com/svn/trunk/htmlcssguide.xml)
+4. JavaScript - [Google JavaScript Style Guide](http://google-styleguide.googlecode.com/svn/trunk/javascriptguide.xml)
+5. All code must be strictly compliant to its corresponding standards, no warning/notice messages allowed
+
+
+Third-party frameworks utilized in this framework:
+
+1. PHP - [Zend Framework 2](https://github.com/zendframework/zf2)
+2. JavaScript - [jQuery](https://github.com/jquery/jquery)
+3. CSS/JS - [Bootstrap](https://github.com/twitter/bootstrap)/[Backbone](https://github.com/documentcloud/backbone)
+
+
+Taiwen Jiang
+

doc/changelog.txt

@@ -1,5 +1,42 @@
 Pi Engine Changelog
 
+June 19th, 2013
+=============================
+1. Upgraded ZF2 to 2.2.1
+2. Formulated CSV file format: keys and values are required to be quoted with enclosure of ["]
+3. Refactoring ZF related components: keep ZF untouched for smooth upgrade maintenance
+4. Modified config files with separate config file: var/config/application.front.php; var/config/application.admin.php; var/config/application.feed.php
+5. Added config file: var/config/config.application.php
+6. Modified boot.php: added constant 'PI_BOOT_ENABLE' and removed 'PI_BOOT_SKIP'
+7. Imported \RandomLib and \SecurityLib required by \Zend\Math\Rand
+8. Added ErrorStrategy for all erroneous results
+9. Added file: theme/template/error.phtml
+10. Added Pi\Version\Version and removed Pi::VERSION
+11. Added module availability check against module controller load
+
+
+June 8th, 2013
+=============================
+1. Disabled form autocomplete in setup
+2. Skip version comparison in debug mode for module update
+3. Fixed bug in URL generation with duplicated '/' reported in Issue #66
+4. Improved Filter to support regexp filter
+5. Refactored module install/uninstall/update displaying information messages on a redirecting page
+6. Formulated module install/uninstall/update result message structure for improvements in Issue #88
+7. Added default value 'text' for renderer to markup service
+8. Initiated system service Url
+9. Initiated system service User
+10. Added config file: var/config/service.user.php
+11. Improved filter User
+12. Changed route User parameter name 'name' to 'identity'
+13. Added support for auto detection of locale
+14. Added charset to service Locale
+15. Modified locale file folders: usr/locale/zh-cn  -- folder name must be in lower case
+16. Modified config file: var/config/service.markup.php -- removing default value for encoding
+17. Added vd shortcoming function to Debug
+18. Refactored bootstrap resource: changed resource namespace to Pi\Application\Bootstrap\Resource; changed Pi\Application\Bootstrap to Pi\Application\Bootstrap\ModuleBootstrap
+19. Changed Pi\Application\Engine\Standard methods: loadService to bootServices; setupResource to bootResources; loadResource to bootResource
+
 
 May 24th, 2013
 =============================
@@ -8,8 +45,10 @@ May 24th, 2013
 3. Changed default config values: 'sitename', 'slogan' in setup
 4. Add 'name' to admin account in setup
 5. Modified file boot.php removing 'PI_PATH_WWW'
-6. Modified file var/config/host.php enabling paramters path-www and path-lib
+6. Modified file var/config/host.php enabling parameters path-www and path-lib
 7. Fixed bug causing block cache conflicts, reported in Issue #77
+8. Changed backoffice mode name 'manage-Management' to 'manage-Setting'
+9. Added support for theme template inheritance proposed in Issue #80
 
 
 May 20th, 2013

doc/nginx-site.conf

@@ -9,13 +9,13 @@
 #                                  .htaccess
 #                                  boot.php
 #                                  lib/
-#                                  script/
 #                                  usr/
 #                                  www/
 #  Deployment: /home/pi/deployment/
 #                                  asset/
 #                                  static/
 #                                  upload/
+#                                  var/
 #
 
 
@@ -52,15 +52,15 @@ server {
     }
     if (!-e $request_filename) {
         # Admin route
-        rewrite ^/admin(/(.*)?)?$     /admin.php   last;
+        rewrite ^/admin(/(.*)?)?$   /admin.php   last;
         # API route
         rewrite ^/api(/(.*)?)?$     /api.php    last;
         # Feed route
         rewrite ^/feed(/(.*)?)?$    /feed.php   last;
         # Widget route
         rewrite ^/widget(/(.*)?)?$  /widget.php last;
         # Default app route
-        rewrite ^/(.+)$         /app.php    last;
+        rewrite ^/(.+)$             /app.php    last;
         break;
     }
 

doc/readme-i18n.txt

@@ -1,12 +1,12 @@
 
-* usr/locale: Global
+* usr/locale: Global, locale folder name must be in lower case
   * /en
     * main.csv: General
     * navigation.csv: Navigation and menu
     * ...
-  * /zh-CN
+  * /zh-cn
     * ...
-* usr/module/demo: Module
+* usr/module/demo: Module, locale folder name must be in lower case
   * /en
     * /mail: Mail templates
       * mail-template.phtml
@@ -16,7 +16,7 @@
     * config.csv: Config edit
     * feed.csv: Feed
     * ...
-  * /zh-CN
+  * /zh-cn
     * ...
 
 

doc/releasenotes.md

@@ -0,0 +1,45 @@
+Pi Engine 2.2.0 Release
+=======================
+
+The Pi Team is pleased to present the Pi Engine Summer Day Release (Pi 2.2.0), a role oriented application development engine based on Zend Framwork 2.
+
+Get the [Pi Summer Day Release](https://github.com/pi-engine/pi/archive/release-2.2.0.zip) and report issues and requests to [Pi Issue Tracker](https://github.com/pi-engine/pi/issues).
+
+What's New
+==========
+During the months of intensive development, a lot of **[features](https://github.com/pi-engine/pi/blob/release-2.2.0/doc/changelog.txt)** have been introduced or improved with dedicated **[documentation](https://github.com/pi-engine/pi/wiki)**. Among of those exciting features, the One-Deployment-Multiple-Instance feature is demonstrated with three websites: Pi Engine Dialogue ([pialog.org](http://pialog.org) | [pialogue.org](http://pialogue.org)), Pi Engine Demo ([pi-demo.org](http://pi-demo.org)) and Xoops/Pi Demo ([demo.xoopsengine.org](http://demo.xoopsengine.org)).
+
+Some of the major changes:
+* Third-party updated: Zend Framework 2.2.1; Bootstrap 1.0.0; Backbone 2.3.1; MakeItUp 1.1.14
+* MVC/View strategy cleaned up and Pi components aligned for compatibility with ZF components
+* Services introduced: mail service, application audit service, user service
+* L10n support introduced and locale folder name file format canonized
+* HTML head meta and title rendering improved for theme templates
+* Filesystem cache mechanism improved for convenient APIs
+* Variable filtering/sanitizing improved with convenient syntactic sugar
+* Theme inheritance introduced and module template inheritance improved
+* Module operation process improved with responsive messages
+* Module and front-end development documented massively
+* Config files:
+   + Added: var/config/config.application.php
+   + Added: var/config/service.user.php
+   + Added: var/config/service.audit.php
+   + Added: var/config/service.mail.php
+   + Added: var/config/service.security.php
+   + Modified: var/config/service.markup.php
+   + Modified: var/config/resource.security.php
+   + Modified: var/config/application.front.php
+   + Modified: var/config/application.admin.php
+   + Modified: var/config/application.feed.php
+
+Check out [changelog](https://github.com/pi-engine/pi/blob/release-2.2.0/doc/changelog.txt) for details from @taiwen, @sexnothing, @voltan, @MarcoXoops, @linzongshu, @kris and etc.
+
+Tutorials
+=========
+Aside from framework and module developments, **[tutorials](https://github.com/pi-engine/pi/wiki)** are being built up at Pi Wiki and a variety of development teams start to learn and build their applications on Pi Engine, for instance @linzongshu, @sexnothing and @9sheng with their teams respectively.
+
+
+---------------------
+[Taiwen Jiang](http://github.com/taiwen), [Pi Team](http://pi-engine.org) 
+
+June 22nd, 2013 

lib/Pi.php

@@ -12,9 +12,7 @@
  * @copyright       Copyright (c) Pi Engine http://www.xoopsengine.org
  * @license         http://www.xoopsengine.org/license New BSD License
  * @author          Taiwen Jiang <[email protected]>
- * @since           3.0
  * @package         Pi
- * @version         $Id$
  */
 
 /**
@@ -62,7 +60,7 @@ class Pi
      * @var string
      * @see http://semver.org/ for semantic versioning
      */
-    const VERSION = '3.0.0-beta.1';
+    //const VERSION = '3.0.0-beta.1';
 
     /**
      * Default application engine
@@ -204,7 +202,7 @@ public static function init()
         $options = array(
             // Top namespaces
             'top'       => array(
-                'Pi' => static::path('lib') . '/Pi',
+                'Pi'    => static::path('lib') . '/Pi',
                 'Zend'  => static::path('lib') . '/Zend',
             ),
             // Regular namespaces

lib/Pi/Application/AbstractApi.php

@@ -13,8 +13,6 @@
  * @license         http://www.xoopsengine.org/license New BSD License
  * @author          Taiwen Jiang <[email protected]>
  * @package         Pi\Application
- * @since           3.0
- * @version         $Id$
  */
 
 namespace Pi\Application;

lib/Pi/Application/AbstractProvider.php

@@ -13,8 +13,6 @@
  * @license         http://www.xoopsengine.org/license New BSD License
  * @author          Taiwen Jiang <[email protected]>
  * @package         Pi\Application
- * @since           3.0
- * @version         $Id$
  */
 
 namespace Pi\Application;

lib/Pi/Application/AbstractSearch.php

@@ -13,8 +13,6 @@
  * @license         http://www.xoopsengine.org/license New BSD License
  * @author          Taiwen Jiang <[email protected]>
  * @package         Pi\Application
- * @since           3.0
- * @version         $Id$
  */
 
 namespace Pi\Application;

lib/Pi/Application/Autoloader.php

@@ -12,13 +12,13 @@
  * @copyright       Copyright (c) Pi Engine http://www.xoopsengine.org
  * @license         http://www.xoopsengine.org/license New BSD License
  * @author          Taiwen Jiang <[email protected]>
- * @package         Application
- * @since           3.0
- * @version         $Id$
+ * @package         Pi\Application
  */
 
 /**
- * Autoloader
+ * Autoloader handler
+ *
+ * Options are loaded in Pi::init()
  *
  * Autoloading priority:
  * 1. class map

lib/Pi/Application/Bootstrap.php → lib/Pi/Application/Bootstrap/ModuleBootstrap.php

@@ -17,10 +17,11 @@
  * @version         $Id$
  */
 
-namespace Pi\Application;
+namespace Pi\Application\Bootstrap;
+
 use Pi\Mvc\Application as Application;
 
-abstract class Bootstrap
+abstract class ModuleBootstrap
 {
     protected $application;
 

lib/Pi/Application/Resource/AbstractResource.php → lib/Pi/Application/Bootstrap/Resource/AbstractResource.php

@@ -18,7 +18,7 @@
  * @version         $Id$
  */
 
-namespace Pi\Application\Resource;
+namespace Pi\Application\Bootstrap\Resource;
 
 use Pi\Application\Engine\AbstractEngine;