Permalink
Browse files

Updated to Slim Framework 3

Switched from Smarty to Twig template engine
Using CKEditor from composer
  • Loading branch information...
h9k committed Jan 1, 2016
1 parent 1f15c5f commit b9b4f9ab0194b2f38d76e0a05266dd632872db2a
Showing with 1,249 additions and 9,895 deletions.
  1. +24 −27 README.md
  2. +9 −5 composer.json
  3. +1,210 −65 composer.lock
  4. +1 −3 doc/credits.md
  5. +3 −1 htaccess.txt
  6. +0 −960 js/ckeditor/CHANGES.md
  7. +0 −1,420 js/ckeditor/LICENSE.md
  8. +0 −39 js/ckeditor/README.md
  9. +0 −158 js/ckeditor/build-config.js
  10. +0 −993 js/ckeditor/ckeditor.js
  11. +0 −38 js/ckeditor/config.js
  12. +0 −132 js/ckeditor/contents.css
  13. +0 −5 js/ckeditor/lang/en.js
  14. +0 −10 js/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
  15. +0 −11 js/ckeditor/plugins/a11yhelp/dialogs/lang/en.js
  16. +0 −7 js/ckeditor/plugins/about/dialogs/about.js
  17. BIN js/ckeditor/plugins/about/dialogs/hidpi/logo_ckeditor.png
  18. BIN js/ckeditor/plugins/about/dialogs/logo_ckeditor.png
  19. +0 −11 js/ckeditor/plugins/clipboard/dialogs/paste.js
  20. +0 −4 js/ckeditor/plugins/dialog/dialogDefinition.js
  21. BIN js/ckeditor/plugins/icons.png
  22. BIN js/ckeditor/plugins/icons_hidpi.png
  23. +0 −43 js/ckeditor/plugins/image/dialogs/image.js
  24. BIN js/ckeditor/plugins/image/images/noimage.png
  25. +0 −7 js/ckeditor/plugins/link/dialogs/anchor.js
  26. +0 −26 js/ckeditor/plugins/link/dialogs/link.js
  27. BIN js/ckeditor/plugins/link/images/anchor.png
  28. BIN js/ckeditor/plugins/link/images/hidpi/anchor.png
  29. BIN js/ckeditor/plugins/magicline/images/hidpi/icon-rtl.png
  30. BIN js/ckeditor/plugins/magicline/images/hidpi/icon.png
  31. BIN js/ckeditor/plugins/magicline/images/icon-rtl.png
  32. BIN js/ckeditor/plugins/magicline/images/icon.png
  33. +0 −32 js/ckeditor/plugins/pastefromword/filter/default.js
  34. +0 −28 js/ckeditor/plugins/scayt/LICENSE.md
  35. +0 −25 js/ckeditor/plugins/scayt/README.md
  36. +0 −17 js/ckeditor/plugins/scayt/dialogs/options.js
  37. +0 −71 js/ckeditor/plugins/scayt/dialogs/toolbar.css
  38. +0 −13 js/ckeditor/plugins/specialchar/dialogs/lang/en.js
  39. +0 −14 js/ckeditor/plugins/specialchar/dialogs/specialchar.js
  40. +0 −21 js/ckeditor/plugins/table/dialogs/table.js
  41. +0 −17 js/ckeditor/plugins/tabletools/dialogs/tableCell.js
  42. +0 −28 js/ckeditor/plugins/wsc/LICENSE.md
  43. +0 −25 js/ckeditor/plugins/wsc/README.md
  44. +0 −66 js/ckeditor/plugins/wsc/dialogs/ciframe.html
  45. +0 −52 js/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
  46. +0 −82 js/ckeditor/plugins/wsc/dialogs/wsc.css
  47. +0 −92 js/ckeditor/plugins/wsc/dialogs/wsc.js
  48. +0 −11 js/ckeditor/plugins/wsc/dialogs/wsc_ie.js
  49. +0 −5 js/ckeditor/skins/moono/dialog.css
  50. +0 −5 js/ckeditor/skins/moono/dialog_ie.css
  51. +0 −5 js/ckeditor/skins/moono/dialog_ie7.css
  52. +0 −5 js/ckeditor/skins/moono/dialog_ie8.css
  53. +0 −5 js/ckeditor/skins/moono/dialog_iequirks.css
  54. +0 −5 js/ckeditor/skins/moono/dialog_opera.css
  55. +0 −5 js/ckeditor/skins/moono/editor.css
  56. +0 −5 js/ckeditor/skins/moono/editor_gecko.css
  57. +0 −5 js/ckeditor/skins/moono/editor_ie.css
  58. +0 −5 js/ckeditor/skins/moono/editor_ie7.css
  59. +0 −5 js/ckeditor/skins/moono/editor_ie8.css
  60. +0 −5 js/ckeditor/skins/moono/editor_iequirks.css
  61. BIN js/ckeditor/skins/moono/icons.png
  62. BIN js/ckeditor/skins/moono/icons_hidpi.png
  63. BIN js/ckeditor/skins/moono/images/arrow.png
  64. BIN js/ckeditor/skins/moono/images/close.png
  65. BIN js/ckeditor/skins/moono/images/hidpi/close.png
  66. BIN js/ckeditor/skins/moono/images/hidpi/lock-open.png
  67. BIN js/ckeditor/skins/moono/images/hidpi/lock.png
  68. BIN js/ckeditor/skins/moono/images/hidpi/refresh.png
  69. BIN js/ckeditor/skins/moono/images/lock-open.png
  70. BIN js/ckeditor/skins/moono/images/lock.png
  71. BIN js/ckeditor/skins/moono/images/mini.png
  72. BIN js/ckeditor/skins/moono/images/refresh.png
  73. BIN js/ckeditor/skins/moono/images/spinner.gif
  74. +0 −49 js/ckeditor/skins/moono/readme.md
  75. +0 −111 js/ckeditor/styles.js
  76. +0 −583 lib/ckeditor/ckeditor.php
  77. +0 −536 lib/gettext/gettext.inc
  78. +0 −432 lib/gettext/gettext.php
  79. +0 −167 lib/gettext/streams.php
  80. +2 −2 lib/magirc/version.inc.php
  81. +0 −126 lib/smarty-plugins/block.t.php
  82. +0 −50 lib/smarty-plugins/modifier.close_tags.php
  83. +0 −73 lib/smarty-plugins/modifier.irc2html.php
  84. +0 −1,749 lib/smarty-plugins/modifier.markdown.php
  85. +0 −339 lib/smarty-plugins/prefilter.jsmin.php
  86. +0 −942 locale/strings.c
  87. +0 −117 locale/tsmarty2c.php
View
@@ -10,15 +10,15 @@ In case you want to migrate from Denora to Anope, we created a script for this t
### Main features ###
* REST service
* [Smarty](http://www.smarty.net/) templating engine
* [Twig](http://twig.sensiolabs.org) templating engine
* [jQuery](http://www.jquery.com/)-based UI with AJAX interactions
* HTML5 and CSS3
* Easy installation
* Administration panel
* Slick design
### Requirements ###
* Web Server with PHP 5.3+ and the `pdo_mysql`, `mcrypt` and `gettext` modules installed
* Web Server with PHP 5.5+ and the `pdo_mysql`, `mcrypt` and `gettext` modules installed
* Web Browser supporting HTML5, CSS3 and JavaScript
* Any of the following:
* [Denora Stats](http://www.denorastats.org) v1.5 server with MySQL enabled
@@ -118,32 +118,29 @@ This is optional, MagIRC also works without rewriting on Apache.
It is also recommended, if you allow slashes `/` in your nicknames or channel names, to set `AllowEncodedSlashes On`
### Nginx ###
Your Nginx configuration file should contain this code, if Magirc is in the document root :
index index.php index.html;
location / {
try_files $uri $uri/ /index.php;
}
location ~ ^(/.*\.php)(/.*)?$ {
try_files $1 =404;
include /etc/nginx/fastcgi.conf;
fastcgi_pass backend;
fastcgi_index index.php;
}
or this for a directory in document root (`document_root/magirc_directory`) :
index index.php index.html;
location /magirc_directory {
try_files $uri $uri/ /magirc_directory/index.php;
}
location ~ ^(/magirc_directory/.*\.php)(/.*)?$ {
try_files $1 =404;
include /etc/nginx/fastcgi.conf;
fastcgi_pass backend;
Your Nginx configuration file should look like this, adapted to your needs of course:
server {
listen 80;
server_name example.com;
index index.php;
error_log /path/to/example.error.log;
access_log /path/to/example.access.log;
root /path/to/public;
location / {
try_files $uri $uri/ /index.php$is_args$args;
}
location ~ \.php {
try_files $uri =404;
fastcgi_split_path_info ^(.+\.php)(/.+)$;
include fastcgi_params;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param SCRIPT_NAME $fastcgi_script_name;
fastcgi_index index.php;
fastcgi_pass 127.0.0.1:9000;
}
}
This will work with or without Magirc rewrite.
View
@@ -23,12 +23,16 @@
"source": "https://github.com/h9k/magirc"
},
"require": {
"php": ">=5.3.0",
"php": ">=5.5.0",
"ext-pdo_mysql": "*",
"ext-gettext": "*",
"ext-mcrypt": "*",
"slim/slim": "2.*",
"slim/views": "0.1.*",
"smarty/smarty": "3.*"
"slim/slim": "3.*",
"slim/twig-view": "^2.0",
"twig/extensions": "^1.3",
"umpirsky/twig-gettext-extractor": "^1.2",
"aptoma/twig-markdown": "^2.0",
"michelf/php-markdown": "^1.6",
"ckeditor/ckeditor": "^4.5"
}
}
}
Oops, something went wrong.

0 comments on commit b9b4f9a

Please sign in to comment.