Permalink
Browse files

Merge branch 'master' into feature/map

  • Loading branch information...
lchenay committed Jul 9, 2012
2 parents 531f2ff + d14ed03 commit fd85226f9ce97bfd16dfdaa16af9bc5d15e59bd8
Showing with 4,188 additions and 1,204 deletions.
  1. +3 −0 .gitignore
  2. +5 −5 .htaccess
  3. +0 −5 .svnexternals
  4. +0 −22 .svnignore
  5. +2 −2 application/Bootstrap.php
  6. +0 −1 application/configs/routes.ini
  7. +0 −1 application/modules/cms/Bootstrap.php
  8. +7 −2 application/modules/cms/controllers/FlatpageController.php
  9. +20 −0 application/modules/cms/data/schema.sql
  10. +7 −0 application/modules/cms/models/DbTable/Flatpage.php
  11. +2 −13 application/modules/cms/models/DbTable/Row/Flatpage.php
  12. +33 −0 application/modules/cms/signals/PreDisplayRte.php
  13. +4 −4 application/modules/cms/views/scripts/admin-flatpage/_tree.phtml
  14. +6 −1 application/modules/user/models/DbTable/Row/Profile.php
  15. +1 −1 library/Centurion/Application.php
  16. +1 −1 library/Centurion/Application/Bootstrap/Bootstrap.php
  17. +8 −3 library/Centurion/Application/Module/Autoloader.php
  18. +2 −2 library/Centurion/Application/Resource/Frontcontroller.php
  19. +2 −2 library/Centurion/Application/Resource/Modules.php
  20. +3 −2 library/Centurion/Auth/Storage/Session.php
  21. +2 −2 library/Centurion/Cache/Backend/Static.php
  22. +7 −3 library/Centurion/Cache/Core.php
  23. +8 −4 library/Centurion/Cache/Frontend/Capture.php
  24. +2 −2 library/Centurion/Cache/Frontend/File.php
  25. +3 −3 library/Centurion/Cache/Frontend/Output.php
  26. +3 −3 library/Centurion/Cache/Frontend/Page.php
  27. +23 −6 library/Centurion/Cache/Manager.php
  28. +2 −2 library/Centurion/Cache/TagManager.php
  29. +5 −0 library/Centurion/Captcha/Simple.php
  30. +15 −5 library/Centurion/Collection.php
  31. +18 −3 library/Centurion/Config/Directory.php
  32. +2 −2 library/Centurion/Config/Manager.php
  33. +31 −0 library/Centurion/Contrib/admin/controllers/AdminDashboardController.php
  34. +3 −3 library/Centurion/Contrib/admin/controllers/AdminNavigationController.php
  35. +26 −0 library/Centurion/Contrib/admin/controllers/ErrorController.php
  36. +1 −1 library/Centurion/Contrib/admin/controllers/GridController.php
  37. +2 −2 library/Centurion/Contrib/admin/controllers/IndexController.php
  38. +27 −1 library/Centurion/Contrib/admin/controllers/LoginController.php
  39. +28 −2 library/Centurion/Contrib/admin/controllers/TestController.php
  40. +26 −1 library/Centurion/Contrib/admin/forms/Filter.php
  41. +4 −2 library/Centurion/Contrib/admin/forms/Model/Navigation.php
  42. +27 −1 library/Centurion/Contrib/admin/views/helpers/Cui/MakeSaveButton.php
  43. +31 −2 library/Centurion/Contrib/admin/views/helpers/GridForm.php
  44. +27 −0 library/Centurion/Contrib/admin/views/helpers/GridRowActions.php
  45. +27 −1 library/Centurion/Contrib/admin/views/helpers/SlugifyForm.php
  46. +7 −2 library/Centurion/Contrib/admin/views/helpers/Ticket.php
  47. +5 −5 library/Centurion/Contrib/admin/views/scripts/admin-navigation/index.phtml
  48. +21 −9 library/Centurion/Contrib/admin/views/scripts/grid/_form.phtml
  49. +23 −11 library/Centurion/Contrib/admin/views/scripts/grid/list.phtml
  50. +1 −1 library/Centurion/Contrib/admin/views/scripts/mptt/_tree.phtml
  51. +1 −1 library/Centurion/Contrib/admin/views/scripts/mptt/index.json.phtml
  52. +32 −6 library/Centurion/Contrib/admin/views/scripts/mptt/index.phtml
  53. +1 −1 library/Centurion/Contrib/auth/Bootstrap.php
  54. +3 −1 library/Centurion/Contrib/auth/forms/Validator/Login.php
  55. +63 −29 library/Centurion/Contrib/auth/models/Acl.php
  56. +32 −1 library/Centurion/Contrib/core/data/schema.sql
  57. +1 −1 library/Centurion/Contrib/core/models/DbTable/ContentType.php
  58. +7 −0 library/Centurion/Contrib/core/models/DbTable/Navigation.php
  59. +19 −0 library/Centurion/Contrib/core/tests/Model/DbTable/ContentTypeTest.php
  60. +56 −0 library/Centurion/Contrib/core/tests/traits/SoftDelete/DbTable.php
  61. +9 −9 library/Centurion/Contrib/core/traits/Mptt/Model/DbTable.php
  62. +10 −6 library/Centurion/Contrib/core/traits/Mptt/Model/DbTable/Row.php
  63. +38 −0 library/Centurion/Contrib/core/traits/Order/Model/DbTable.php
  64. +6 −0 library/Centurion/Contrib/core/traits/Order/Model/DbTable/Interface.php
  65. +2 −3 library/Centurion/Contrib/core/traits/Slug/Form/Model.php
  66. +68 −14 library/Centurion/Contrib/core/traits/Slug/Model/DbTable/Row.php
  67. +16 −1 library/Centurion/Contrib/core/traits/Slug/Model/DbTable/Row/Interface.php
  68. +70 −0 library/Centurion/Contrib/core/traits/SoftDelete/Model/DbTable.php
  69. +5 −0 library/Centurion/Contrib/core/traits/SoftDelete/Model/DbTable/Interface.php
  70. +2 −2 library/Centurion/Contrib/core/traits/Version/Model/DbTable.php
  71. +3 −2 library/Centurion/Contrib/core/views/filters/Extend.php
  72. +5 −1 library/Centurion/Contrib/core/views/helpers/Email.php
  73. +9 −9 library/Centurion/Contrib/core/views/helpers/Extend.php
  74. +1 −2 library/Centurion/Contrib/core/views/helpers/FormInfo.php
  75. +10 −1 library/Centurion/Contrib/core/views/helpers/Messages.php
  76. +1 −1 library/Centurion/Contrib/core/views/helpers/Partial.php
  77. +2 −2 library/Centurion/Contrib/core/views/helpers/RowToColumn.php
  78. +2 −2 library/Centurion/Contrib/core/views/helpers/Slugify.php
  79. +11 −3 library/Centurion/Contrib/core/views/helpers/SmartTextCrop.php
  80. +9 −1 library/Centurion/Contrib/core/views/helpers/Truncate.php
  81. +2 −2 library/Centurion/Contrib/media/Bootstrap.php
  82. +3 −2 library/Centurion/Contrib/media/controllers/FileController.php
  83. +3 −214 library/Centurion/Contrib/media/controllers/ImageController.php
  84. +1 −1 library/Centurion/Contrib/media/controllers/UploadController.php
  85. +16 −0 library/Centurion/Contrib/media/data/schema.sql
  86. +27 −17 library/Centurion/Contrib/media/forms/Decorator/MultiFile.php
  87. +10 −1 library/Centurion/Contrib/media/forms/Model/Admin/File.php
  88. +2 −2 library/Centurion/Contrib/media/models/Adapter.php
  89. +43 −10 library/Centurion/Contrib/media/models/Adapter/Abstract.php
  90. +2 −2 library/Centurion/Contrib/media/models/Adapter/Ftp.php
  91. +2 −2 library/Centurion/Contrib/media/models/Adapter/Local.php
  92. +1 −1 library/Centurion/Contrib/media/models/DbTable/Duplicate.php
  93. +9 −6 library/Centurion/Contrib/media/models/DbTable/File.php
  94. +31 −1 library/Centurion/Contrib/media/models/DbTable/Image.php
  95. +2 −1 library/Centurion/Contrib/media/models/DbTable/MultiuploadTicket.php
  96. +8 −3 library/Centurion/Contrib/media/models/DbTable/Row/Duplicate.php
  97. +38 −4 library/Centurion/Contrib/media/models/DbTable/Row/File.php
  98. +38 −10 library/Centurion/Contrib/media/models/DbTable/Video.php
  99. +18 −0 library/Centurion/Contrib/media/tests/Controller/ImageController.php
  100. +4 −4 library/Centurion/Contrib/media/tests/Model/DbTable/{File.php → FileTest.php}
  101. +2 −2 library/Centurion/Contrib/translation/Bootstrap.php
  102. +11 −6 library/Centurion/Contrib/translation/controllers/AdminController.php
  103. +2 −2 library/Centurion/Contrib/translation/controllers/GenerateController.php
  104. +10 −2 library/Centurion/Contrib/translation/controllers/helpers/ManageLanguageParam.php
  105. +2 −2 library/Centurion/Contrib/translation/forms/Translation.php
  106. +2 −2 library/Centurion/Contrib/translation/models/DbTable/Language.php
  107. +2 −2 library/Centurion/Contrib/translation/models/DbTable/Row/Language.php
  108. +2 −2 library/Centurion/Contrib/translation/models/DbTable/Row/Translation.php
  109. +2 −2 library/Centurion/Contrib/translation/models/DbTable/Row/Uid.php
  110. +2 −2 library/Centurion/Contrib/translation/models/DbTable/Tag.php
  111. +2 −2 library/Centurion/Contrib/translation/models/DbTable/TagUid.php
  112. +2 −2 library/Centurion/Contrib/translation/models/DbTable/Translation.php
  113. +2 −2 library/Centurion/Contrib/translation/models/DbTable/Uid.php
  114. +1 −1 library/Centurion/Contrib/translation/models/Log/Translation.php
  115. +1 −1 library/Centurion/Contrib/translation/models/Manager.php
  116. +12 −12 library/Centurion/Contrib/translation/models/Translate/Adapter/Array.php
  117. +2 −2 library/Centurion/Contrib/translation/traits/Controller/CRUD.php
  118. +4 −2 library/Centurion/Contrib/translation/traits/Form/Model.php
  119. +22 −31 library/Centurion/Contrib/translation/traits/Model/DbTable.php
  120. +1 −1 library/Centurion/Contrib/translation/views/scripts/traits/form.phtml
  121. +346 −32 library/Centurion/Controller/AGL.php
  122. +17 −5 library/Centurion/Controller/Action.php
  123. +2 −2 library/Centurion/Controller/Action/Exception.php
  124. +2 −2 library/Centurion/Controller/Action/Gone/Exception.php
  125. +2 −1 library/Centurion/Controller/Action/Helper/AclCheck.php
  126. +4 −3 library/Centurion/Controller/Action/Helper/AuthCheck.php
  127. +2 −2 library/Centurion/Controller/Action/Helper/Cache.php
  128. +2 −4 library/Centurion/Controller/Action/Helper/ContextAutoSwitch.php
  129. +2 −2 library/Centurion/Controller/Action/Helper/Excel.php
  130. +2 −2 library/Centurion/Controller/Action/Helper/Extract.php
  131. +1 −1 library/Centurion/Controller/Action/Helper/LayoutLoader.php
  132. +2 −2 library/Centurion/Controller/Action/Helper/List.php
  133. +5 −2 library/Centurion/Controller/Action/Helper/Params.php
  134. +2 −2 library/Centurion/Controller/Action/Helper/Ticket.php
  135. +2 −2 library/Centurion/Controller/Action/Helper/WidgetRenderer.php
  136. +59 −13 library/Centurion/Controller/CRUD.php
  137. +10 −9 library/Centurion/Controller/Error.php
  138. +25 −1 library/Centurion/Controller/Front.php
  139. +80 −8 library/Centurion/Controller/Mptt.php
  140. +3 −2 library/Centurion/Controller/Plugin/ErrorControllerBootstrap.php
  141. +11 −11 library/Centurion/Controller/Request/Http.php
  142. +51 −2 library/Centurion/Controller/Router/Rewrite.php
  143. +1 −1 library/Centurion/Controller/Router/Route.php
  144. +39 −5 library/Centurion/Controller/Router/Route/Module.php
  145. +4 −14 library/Centurion/Controller/Router/Route/Object.php
  146. +8 −3 library/Centurion/Controller/Router/Route/Queue.php
  147. +2 −2 library/Centurion/Controller/Router/Route/Static.php
  148. +9 −2 library/Centurion/Date.php
  149. +2 −2 library/Centurion/Db/Adapter/Pdo/Mysql.php
  150. +2 −2 library/Centurion/Db/Table.php
  151. +62 −12 library/Centurion/Db/Table/Abstract.php
  152. +1 −0 library/Centurion/Db/Table/Field/Slug.php
  153. +64 −17 library/Centurion/Db/Table/Row/Abstract.php
  154. +1 −1 library/Centurion/Db/Table/Row/Proxy.php
  155. +5 −5 library/Centurion/Db/Table/Rowset/Abstract.php
  156. +23 −24 library/Centurion/Db/Table/Select.php
  157. +2 −2 library/Centurion/File/System.php
  158. +40 −5 library/Centurion/File/Transfer/Adapter/Abstract.php
  159. +27 −1 library/Centurion/File/Transfer/Adapter/Local.php
  160. +27 −1 library/Centurion/File/Transfer/Adapter/Remote.php
  161. +40 −13 library/Centurion/Form.php
  162. +2 −2 library/Centurion/Form/Composite.php
  163. +2 −2 library/Centurion/Form/Decorator/Button.php
  164. +1 −1 library/Centurion/Form/Decorator/DtDdWrapperEv.php
  165. +2 −2 library/Centurion/Form/Decorator/Label.php
  166. +2 −2 library/Centurion/Form/Decorator/Texte.php
  167. +81 −2 library/Centurion/Form/DisplayGroup.php
  168. +41 −0 library/Centurion/Form/Element/DatePicker.php
  169. +27 −1 library/Centurion/Form/Element/DateTimePicker.php
  170. +0 −15 library/Centurion/Form/Element/Datepicker.php
  171. +2 −2 library/Centurion/Form/Element/File.php
  172. +2 −2 library/Centurion/Form/Element/FileTable.php
  173. +2 −2 library/Centurion/Form/Element/Info.php
  174. +27 −1 library/Centurion/Form/Element/OnOff.php
  175. +2 −2 library/Centurion/Form/Element/Reference.php
  176. +2 −2 library/Centurion/Form/Exception.php
  177. +2 −2 library/Centurion/Form/Model.php
  178. +182 −53 library/Centurion/Form/Model/Abstract.php
  179. +2 −2 library/Centurion/Form/Model/Composite.php
  180. +9 −9 library/Centurion/Ftp.php
  181. +2 −2 library/Centurion/Ftp/Directory.php
  182. +2 −2 library/Centurion/Ftp/Directory/Exception.php
  183. +2 −2 library/Centurion/Ftp/Directory/Iterator.php
  184. +2 −2 library/Centurion/Ftp/Exception.php
  185. +2 −2 library/Centurion/Ftp/File.php
  186. +2 −2 library/Centurion/Ftp/File/Exception.php
  187. +2 −2 library/Centurion/Image.php
  188. +11 −1 library/Centurion/Image/Adapter/Abstract.php
  189. +6 −3 library/Centurion/Image/Adapter/GD.php
  190. +2 −2 library/Centurion/Loader/PluginLoader.php
  191. +25 −1 library/Centurion/Locale/Format.php
  192. +2 −2 library/Centurion/Mail.php
  193. +1 −1 library/Centurion/Mail/Transport/Blackhole.php
  194. +1 −1 library/Centurion/Matrice.php
  195. +7 −2 library/Centurion/Movie.php
  196. +12 −10 library/Centurion/Movie/Flv.php
  197. +11 −3 library/Centurion/Node.php
  198. +2 −2 library/Centurion/Notification.php
  199. +25 −0 library/Centurion/Notification/Message.php
  200. +0 −5 library/Centurion/Notification/Stack.php
  201. +2 −2 library/Centurion/Paginator/Adapter/DbTable.php
  202. +6 −2 library/Centurion/Queue.php
  203. +2 −2 library/Centurion/Rest/Controller/API.php
  204. +3 −2 library/Centurion/Rest/Controller/CRUD.php
  205. +2 −2 library/Centurion/Rest/Route/CRUD.php
  206. +2 −2 library/Centurion/Service/Bitly.php
  207. +1 −1 library/Centurion/Service/Facebook.php
  208. +2 −2 library/Centurion/Service/Flickr.php
  209. +2 −2 library/Centurion/Service/Flickr/Result.php
  210. +2 −2 library/Centurion/Service/Flickr/Result/Abstract.php
  211. +1 −1 library/Centurion/Service/Flickr/Result/Collection.php
  212. +2 −2 library/Centurion/Service/Flickr/Result/Photo.php
  213. +2 −2 library/Centurion/Service/Flickr/Result/Set.php
  214. +2 −2 library/Centurion/Service/Flickr/Result/Tag.php
  215. +2 −2 library/Centurion/Service/Flickr/ResultSet.php
  216. +2 −2 library/Centurion/Service/Flickr/ResultSet/Abstract.php
  217. +8 −6 library/Centurion/Signal/Abstract.php
  218. +31 −0 library/Centurion/Signal/OnDefiningMainObject.php
  219. +31 −0 library/Centurion/Signal/OnFormPreSaveReferenceSubform.php
  220. +30 −0 library/Centurion/Signal/OnFormRendering.php
  221. +30 −0 library/Centurion/Signal/OnFormValidation.php
  222. +2 −2 library/Centurion/Signal/OnSelectJoinInner.php
  223. +31 −0 library/Centurion/Signal/PostFormPreValidate.php
  224. +2 −3 library/Centurion/Social/Service/Facebook.php
  225. +2 −2 library/Centurion/Social/TokenHandler/Abstract.php
  226. +16 −6 library/Centurion/Stack.php
  227. +4 −4 library/Centurion/Test/DbTable.php
  228. +27 −1 library/Centurion/Test/PHPUnit/AdminControllerTestCase.php
  229. +107 −3 library/Centurion/Test/PHPUnit/ControllerTestCase.php
  230. +2 −2 library/Centurion/Tool/Project/Context/Zf/BuildDirectory.php
  231. +2 −2 library/Centurion/Tool/Project/Context/Zf/BuildFile.php
  232. +212 −6 library/Centurion/Tool/Project/Provider/Db.php
  233. +197 −117 library/Centurion/Tool/Project/Provider/Install.php
  234. +6 −4 library/Centurion/Traits/Abstract.php
  235. +15 −9 library/Centurion/Traits/Common.php
  236. +8 −1 library/Centurion/Traits/Form/Abstract.php
  237. +4 −1 library/Centurion/Traits/Model/DbTable/Abstract.php
  238. +15 −0 library/Centurion/Traits/Model/DbTable/Select/Abstract.php
  239. +3 −2 library/Centurion/Traits/Queue.php
  240. +2 −2 library/Centurion/Validate/DateGreaterThanField.php
  241. +2 −2 library/Centurion/Validate/Field/Abstract.php
  242. +2 −2 library/Centurion/Validate/Url.php
  243. +2 −2 library/Centurion/Version.php
  244. +2 −2 library/Centurion/View.php
  245. +5 −0 public/index.php
  246. +1 −1 public/status/index.php
  247. +1 −1 tests/library/Centurion/AllTests.php
  248. +30 −0 tests/library/Centurion/Auth/Adapter/DbTableTest.php
  249. +1 −1 tests/library/Centurion/Cache/AllTests.php
  250. +153 −0 tests/library/Centurion/Contrib/Core/SlugTest.php
  251. +63 −0 tests/library/Centurion/Controller/AGLTest.php
  252. +33 −0 tests/library/Centurion/Controller/Router/Route/ObjectTest.php
  253. +50 −1 tests/library/Centurion/Db/Table/RowTest.php
  254. +43 −5 tests/library/Centurion/Db/Table/SelectTest.php
  255. +1 −1 tests/library/Centurion/Db/TableTest.php
  256. +2 −0 tests/library/Centurion/Form/ModelTest.php
  257. +2 −2 tests/support/Asset/Model/DbTable/Abstract.php
  258. +9 −0 tests/support/Asset/Model/DbTable/Row/SimpleWithSlug.php
  259. +9 −0 tests/support/Asset/Model/DbTable/Row/SimpleWithSlugAndTranslation.php
  260. +15 −0 tests/support/Asset/Model/DbTable/Row/WithMultiColumnsForSlug.php
  261. +27 −0 tests/support/Asset/Model/DbTable/SimpleWithSlug.php
  262. +33 −0 tests/support/Asset/Model/DbTable/SimpleWithSlugAndTranslation.php
  263. +27 −0 tests/support/Asset/Model/DbTable/WithMultiColumnsForSlug.php
View
@@ -58,3 +58,6 @@ application/configs/local.ini
/tests/library/Centurion/Image/Adapter/_files/build/*
/data/cache/config.php
+.sass-cache/
+
+*.done
View
@@ -4,20 +4,20 @@ RewriteRule ^attachment/(.*)$ /static/$1 [PT]
RewriteCond %{REQUEST_FILENAME} !-s
RewriteCond %{QUERY_STRING} ^([^:]*):([^:]*):([^:]*)(:([0-9a-z]*))?(.*)$ [NC,OR]
-RewriteCond %{QUERY_STRING} ^([a-zA-Z0-9_-]*)%3A([a-zA-Z0-9_-]*)%3A([a-zA-Z0-9_-]*)(%3A([0-9a-z]*))?%3A(.*)$ [NC]
+RewriteCond %{QUERY_STRING} ^([a-zA-Z0-9_-]*)%3A([a-zA-Z0-9_-]*)%3A([a-zA-Z0-9_-]*)(%3A([0-9a-z]*))?(.*)$ [NC]
RewriteRule ^public/static/(.*)/(.*)$ public/files/%2/_%5.centurion [NC,PT]
#Rewrite for static image (with effect)
RewriteCond %{REQUEST_FILENAME} !-s
RewriteCond %{QUERY_STRING} ^([^:]*):([^:]*):([^:]*):([0-9a-z]*)(.*)$ [NC,OR]
-RewriteCond %{QUERY_STRING} ^([a-zA-Z0-9_-]*)%3A([a-zA-Z0-9_-]*)%3A([a-zA-Z0-9_-]*)%3A([0-9a-z]*)%3A(.*)$ [NC]
-RewriteRule ^public/files/.*$ public/media/image/get/id/%1/fileid/%2/key/%3/effect/%4/extra/%5? [NC,PT]
+RewriteCond %{QUERY_STRING} ^([a-zA-Z0-9_-]*)%3A([a-zA-Z0-9_-]*)%3A([a-zA-Z0-9_-]*)%3A([0-9a-z]*)(.*)$ [NC]
+RewriteRule ^public/files/.*$ /media/image/get/id/%1/fileid/%2/key/%3/effect/%4/extra/%5? [NC,R,L]
#Rewrite for static file
RewriteCond %{REQUEST_FILENAME} !-s
RewriteCond %{QUERY_STRING} ^([^:]*):([^:]*):([^:]*)(.*)$ [NC,OR]
-RewriteCond %{QUERY_STRING} ^([a-zA-Z0-9_-]*)%3A([a-zA-Z0-9_-]*)%3A([0-9a-z]*)%3A(.*)$ [NC]
-RewriteRule ^public/files/.*$ public/media/file/get/id/%1/fileid/%2/key/%3/extra/%4? [NC,PT]
+RewriteCond %{QUERY_STRING} ^([a-zA-Z0-9_-]*)%3A([a-zA-Z0-9_-]*)%3A([0-9a-z]*)(.*)$ [NC]
+RewriteRule ^public/files/.*$ /media/file/get/id/%1/fileid/%2/key/%3/extra/%4? [NC,R,L]
#Rewrite for cached file
#RewriteCond %{DOCUMENT_ROOT}/cached/index.html -f
View
@@ -1,5 +0,0 @@
-public/layouts/backoffice http://svn.octaveoctave.com/branches/cui/branches/mediarte/layouts/backoffice
-public/cui http://svn.octaveoctave.com/branches/cui/branches/mediarte/cui/
-library/Zend http://framework.zend.com/svn/framework/standard/tags/release-1.11.0/library/Zend/
-application/modules/generator http://svn.octaveoctave.com/branches/generator/trunk/application/modules/generator/
-library/Sayyes http://svn.octaveoctave.com/branches/generator/trunk/library/Sayyes/
View
@@ -1,22 +0,0 @@
-**/.DS_Store
-**/*.db
-.project
-.buildpath
-/.settings
-/data/cache/core/*
-/data/cache/output/*
-/data/cache/class/*
-/data/cache/page/*
-/data/cache/sessions/*
-/data/cache/tags/*
-/data/cache/*.php
-/data/uploads/*
-/data/logs/*
-/data/import/*
-/data/build/*
-tests/log/*
-/public/.htaccess
-/public/static/*
-/public/files/*
-/public/cached/*
-/tests/library/Centurion/Image/Adapter/_files/build/*
@@ -11,7 +11,7 @@ protected function _initLogDated()
'stream' => array(
'writerName' => 'Stream',
'writerParams' => array(
- 'stream' => APPLICATION_PATH . sprintf('/../data/logs/%s_application.log', Zend_Date::now()->toString('yyyy.MM.dd')),
+ 'stream' => APPLICATION_PATH . sprintf('/../data/logs/%s_%s_application.log', APPLICATION_ENV, Zend_Date::now()->toString('yyyy.MM.dd')),
'mode' => 'a'
)
),
@@ -114,4 +114,4 @@ protected function _initCachePage()
$cache->start();
}
}
-}
+}
@@ -1,5 +1,4 @@
[production]
-resources.router.routes.default.type = "Centurion_Controller_Router_Route_Module"
resources.router.routes.language.type = "Zend_Controller_Router_Route"
resources.router.routes.language.route = "/:language"
@@ -161,7 +161,6 @@ protected function _generateRoutes()
$baseRoute = null;
$this->_routePrefix = '';
- //TODO: put in cache !!!
if (false === ($data = $this->_getCache('core')->load('Cms_Flatpage_Route'))) {
if (Zend_Registry::isRegistered('Centurion_Route_Queue')) {
$routeQueue = Zend_Registry::get('Centurion_Route_Queue');
@@ -9,15 +9,17 @@ public function getAction()
'is_published' => 1,
'published_at__lt' => new Zend_Db_Expr('NOW()')));
Centurion_Db_Table_Abstract::restoreFiltersStatus();
-
+
+ Centurion_Signal::factory('pre_display_rte')->send($this, array($flatpageRow));
+
Centurion_Cache_TagManager::addTag($flatpageRow);
$navRow = Centurion_Db::getSingleton('core/navigation')->findOneByProxy($flatpageRow);
if (null !== $navRow) {
$navigation = $this->view->navigation()->getContainer();
$this->view->currentNavigation = $navigation->findOneById($navRow->id);
}
-
+
return $this->renderToResponse($flatpageRow->flatpage_template->view_script, array('flatpageRow' => $flatpageRow));
}
@@ -26,6 +28,9 @@ public function getBySlugAction()
$flatpageRow = $this->_helper->getObjectOr404('cms/flatpage', array('id' => $this->_getParam('id'),
'is_published' => 1,
'published_at__lt' => new Zend_Db_Expr('NOW()')));
+
+ Centurion_Signal::factory('pre_display_rte')->send($flatpageRow, array($flatpageRow));
+
Centurion_Cache_TagManager::addTag($flatpageRow);
return $this->renderToResponse($flatpageRow->flatpage_template->view_script, array('currentFlatpageRow' => $flatpageRow));
}
@@ -79,3 +79,23 @@ ALTER TABLE `cms_flatpage`
ADD CONSTRAINT `cms_flatpage__banner_id___media_file__id` FOREIGN KEY (`cover_id`) REFERENCES `media_file` (`id`),
ADD CONSTRAINT `cms_flatpage__flatpage_template_id___cms_flatpage_template__id` FOREIGN KEY (`flatpage_template_id`) REFERENCES `cms_flatpage_template` (`id`) ON UPDATE CASCADE;
SET FOREIGN_KEY_CHECKS=1;
+
+
+ALTER TABLE `cms_flatpage` ADD INDEX ( `slug` );
+ALTER TABLE `cms_flatpage` ADD INDEX ( `is_published` );
+ALTER TABLE `cms_flatpage` ADD INDEX ( `mptt_lft` );
+ALTER TABLE `cms_flatpage` ADD INDEX ( `mptt_rgt` );
+ALTER TABLE `cms_flatpage` ADD INDEX ( `mptt_level` );
+ALTER TABLE `cms_flatpage` ADD INDEX ( `mptt_tree_id` );
+ALTER TABLE `cms_flatpage` ADD INDEX ( `original_id` , `language_id` ) ;
+
+ALTER TABLE `cms_flatpage` ADD INDEX ( `language_id` );
+
+
+ALTER TABLE `cms_flatpage` ADD FOREIGN KEY ( `original_id` ) REFERENCES `cms_flatpage` (
+`id`
+);
+
+ALTER TABLE `cms_flatpage` ADD FOREIGN KEY ( `language_id` ) REFERENCES `translation_language` (
+`id`
+);
@@ -128,4 +128,11 @@ public function getTranslationSpec()
)
);
}
+
+ public function ignoreForeignOnColumn()
+ {
+ return array(
+ 'mptt_tree_id',
+ );
+ }
}
@@ -1,6 +1,6 @@
<?php
-class Cms_Model_DbTable_Row_Flatpage extends Centurion_Db_Table_Row implements Translation_Traits_Model_DbTable_Row_Interface, Core_Traits_Mptt_Model_DbTable_Row_Interface, Core_Model_DbTable_Row_Navigable_Interface
+class Cms_Model_DbTable_Row_Flatpage extends Centurion_Db_Table_Row implements Translation_Traits_Model_DbTable_Row_Interface, Core_Traits_Mptt_Model_DbTable_Row_Interface, Core_Model_DbTable_Row_Navigable_Interface, Core_Traits_Slug_Model_DbTable_Row_Interface
{
protected $_navigation = false;
protected $_route = null;
@@ -119,17 +119,6 @@ public function getNumber()
return str_pad($this->order, 2, '0', STR_PAD_LEFT);
}
- protected function _preSave()
- {
- parent::_preSave();
-
- if ($this->title) {
- $this->slug = Centurion_Inflector::slugify($this->title);
- } else {
- $this->slug = Centurion_Inflector::slugify($this->slug);
- }
- }
-
protected function _postSave()
{
parent::_postSave();
@@ -154,4 +143,4 @@ public function getSlugifyName()
{
return 'title';
}
-}
+}
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Centurion
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@centurion-project.org so we can send you a copy immediately.
+ *
+ * @category Centurion
+ * @package Centurion_Signal
+ * @copyright Copyright (c) 2008-2011 Octave & Octave (http://www.octaveoctave.com)
+ * @license http://centurion-project.org/license/new-bsd New BSD License
+ * @version $Id$
+ */
+
+/**
+ * @category Centurion
+ * @package Centurion_Signal
+ * @copyright Copyright (c) 2008-2011 Octave & Octave (http://www.octaveoctave.com)
+ * @license http://centurion-project.org/license/new-bsd New BSD License
+ * @author Florent Messa <florent.messa@gmail.com>
+ */
+/**
+ * @todo : move (is not used only by flatpage anymore)
+ * @todo : find a better name
+ */
+class Cms_Signal_PreDisplayRte extends Centurion_Signal_Abstract
+{
+}
@@ -23,11 +23,11 @@
</div>
<?php if ($children = $page->getChildren()): ?>
- <?php if ($children->count()): ?>
- <?php echo $this->partial('admin-flatpage/_tree.phtml', array_merge($this->getVars(), array('tree' => $children, 'isRoot' => false))); ?>
- <?php endif ?>
+ <?php if ($children->count()): ?>
+ <?php echo $this->partial('admin-flatpage/_tree.phtml', array_merge($this->getVars(), array('tree' => $children, 'isRoot' => false))); ?>
+ <?php endif ?>
<?php endif ?>
</li>
<?php endforeach ?>
</ul>
-<?php //endif ?>
+<?php //endif ?>
@@ -3,6 +3,11 @@ class User_Model_DbTable_Row_Profile extends Centurion_Db_Table_Row_Abstract
{
public function __toString()
{
- return $this->nickname;
+ return $this->user->username;
+ }
+
+ public function getAvatar()
+ {
+ return $this->px;
}
}
@@ -58,7 +58,7 @@ public function __construct($environment, $options = null)
* Set options for Centurion_Config_Manager
*
* @param array $options Options
- * @return Centurion_Application
+ * @return $this
*/
public function setOptions(array $options)
{
@@ -25,7 +25,7 @@
* @copyright Copyright (c) 2008-2011 Octave & Octave (http://www.octaveoctave.com)
* @license http://centurion-project.org/license/new-bsd New BSD License
* @author Florent Messa <florent.messa@gmail.com>
- * @author Laurent Chenay <lchenay@gmail.com>
+ * @author Laurent Chenay <lc@centurion-project.org>
*/
abstract class Centurion_Application_Bootstrap_Bootstrap extends Zend_Application_Bootstrap_Bootstrap
{
@@ -35,7 +35,7 @@ class Centurion_Application_Module_Autoloader extends Zend_Application_Module_Au
public function initDefaultResourceTypes()
{
parent::initDefaultResourceTypes();
- $basePath = $this->getBasePath();
+
$this->addResourceTypes(array(
'controllershelpers' => array(
'namespace' => 'Controller_Action_Helper',
@@ -60,10 +60,15 @@ public function initDefaultResourceTypes()
));
}
+ /**
+ * @param $key
+ * @return bool|mixed
+ */
public function getComponent($key)
{
- if (isset($this->_components[$key]))
+ if (isset($this->_components[$key])) {
return $this->_components[$key];
+ }
return false;
}
@@ -82,4 +87,4 @@ public function getResourceType($type)
return false;
}
-}
+}
@@ -24,7 +24,7 @@
* @subpackage Resource
* @copyright Copyright (c) 2008-2011 Octave & Octave (http://www.octaveoctave.com)
* @license http://centurion-project.org/license/new-bsd New BSD License
- * @author Laurent Chenay <lchenay@gmail.com>
+ * @author Laurent Chenay <lc@centurion-project.org>
*/
class Centurion_Application_Resource_Frontcontroller extends Zend_Application_Resource_Frontcontroller
@@ -41,4 +41,4 @@ public function getFrontController()
}
return $this->_front;
}
-}
+}
@@ -25,7 +25,7 @@
* @copyright Copyright (c) 2008-2011 Octave & Octave (http://www.octaveoctave.com)
* @license http://centurion-project.org/license/new-bsd New BSD License
* @author Florent Messa <florent.messa@gmail.com>
- * @author Laurent Chenau <lc@octaveoctave.com>
+ * @author Laurent Chenay <lc@centurion-project.org>
*/
class Centurion_Application_Resource_Modules extends Zend_Application_Resource_Modules
{
@@ -107,4 +107,4 @@ public function init()
return $this->_bootstraps;
}
-}
+}
@@ -24,7 +24,7 @@
* @subpackage Storage
* @copyright Copyright (c) 2008-2011 Octave & Octave (http://www.octaveoctave.com)
* @license http://centurion-project.org/license/new-bsd New BSD License
- * @author Laurent Chenay <lchenay@gmail.com>
+ * @author Laurent Chenay <lc@centurion-project.org>
*/
class Centurion_Auth_Storage_Session extends Zend_Auth_Storage_Session
{
@@ -39,8 +39,9 @@ public function __construct($namespace = self::NAMESPACE_DEFAULT, $member = self
{
$cookieDomain = Centurion_Config_Manager::get('session.domain', $_SERVER['SERVER_NAME']);
- if ($cookieDomain !== null)
+ if ($cookieDomain !== null) {
Zend_Session::setOptions(array('cookie_domain' => $cookieDomain));
+ }
parent::__construct($namespace, $member);
}
@@ -24,7 +24,7 @@
* @subpackage Backend
* @copyright Copyright (c) 2008-2011 Octave & Octave (http://www.octaveoctave.com)
* @license http://centurion-project.org/license/new-bsd New BSD License
- * @author Laurent Chenay <lc@octaveoctave.com>
+ * @author Laurent Chenay <lc@centurion-project.org>
*/
class Centurion_Cache_Backend_Static extends Zend_Cache_Backend_Static implements Zend_Cache_Backend_ExtendedInterface
{
@@ -121,4 +121,4 @@ public function touch($id, $extraLifetime)
{
$this->getInnerCache()->touch($id, $extraLifetime);
}
-}
+}
Oops, something went wrong.

0 comments on commit fd85226

Please sign in to comment.