Merge branch 'master' into remotefork

[phorkie.git] / data / config.default.php

diff --git a/data/config.default.php b/data/config.default.php
index b648614567d7379e33a92c403628f4aad41e7a47..abcb43e071a4cdcd397495c60f6fdf4ccd9f7be7 100644 (file)
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -9,6 +9,17 @@ $GLOBALS['phorkie']['cfg'] = array(
     'topbar'        => '',
     'setupcheck'    => true,
     'elasticsearch' => null,
+    'geshi'         => 'MediaWiki/geshi/geshi/geshi.php',
+    'index'         => 'new'//"new" or "list"
+);
+$GLOBALS['phorkie']['auth'] = array(
+    // 0 = public, no authentication, 1 = protect adds/edits/deletes,
+    // 2 = require authentication
+    'securityLevel'   => 0,
+    'listedUsersOnly' => false,
+    'users'           => array(),             // Array of OpenIDs that may login
+    'anonymousName'   => 'Anonymous',         // Email for non-authenticated commits
+    'anonymousEmail'  => 'anonymous@phorkie', // Email for non-authenticated commits
 );
 $GLOBALS['phorkie']['tools'] = array(
     '\\phorkie\\Tool_Xmllint' => true,
@@ -55,6 +66,16 @@ $GLOBALS['phorkie']['languages'] = array(
         'mime'  => 'application/javascript',
         'geshi' => 'javascript'
     ),
+    'md' => array(
+        'title' => 'Markdown',
+        'mime'  => 'text/x-markdown',
+        'renderer' => '\\phorkie\\Renderer_Markdown'
+    ),
+    'pl' => array(
+        'title' => 'Perl',
+        'mime'  => 'application/x-perl',
+        'geshi' => 'pl'
+    ),
     'php' => array(
         'title' => 'PHP',
         'mime'  => 'text/x-php',
@@ -65,6 +86,11 @@ $GLOBALS['phorkie']['languages'] = array(
         'mime'  => 'image/png',
         'show'  => false
     ),
+    'rb' => array(
+        'title' => 'Ruby/Rails',
+        'mime'  => 'text/x-ruby', /* Is this an acceptable mime type? */
+        'geshi' => 'rails'
+    ),
     'rst' => array(
         'title' => 'reStructuredText',
         'mime'  => 'text/x-rst',
@@ -86,20 +112,20 @@ $GLOBALS['phorkie']['languages'] = array(
         'mime'  => 'image/svg+xml',
         'show'  => false
     ),
-    'ts' => array(
-        'title' => 'TypoScript',
-        'mime'  => 'text/x-typoscript',/* TODO: correct type */
-        'geshi' => 'typoscript'
-    ),
     'txt' => array(
         'title' => 'Text (plain)',
         'mime'  => 'text/plain',
         'geshi' => 'txt'
     ),
+    'ts' => array(
+        'title' => 'TypoScript',
+        'mime'  => 'text/x-typoscript',/* TODO: correct type */
+        'geshi' => 'typoscript'
+    ),
     'xml' => array(
         'title' => 'XML',
         'mime'  => 'text/xml',
         'geshi' => 'xml'
     ),
 );
-?>
\ No newline at end of file
+?>