INSTALL
bin/bootstrap_db.php
bin/finish_url.php
bin/prepare_db.php
conf/lighttpd/single_wiki.conf
files/singlewiki-dump.sql
php/actions/ManageSuperUserAction.php
php/actions/ManageUsersAction.php
php/class/Wikidot/Form.php
php/class/Wikidot/Yaml.php
php/modules/manage/ManageSuperUserModule.php
php/modules/manage/ManageUsersModule.php
templates/modules/manage/ManageSuperUserModule.tpl
templates/modules/manage/ManageUsersModule.tpl
web/files--common/modules/js/manage/ManageSuperUserModule.js
web/files--common/modules/js/manage/ManageUsersModule.js
wikidotctl
@@ -1,3 +1,4 @@
+#!/usr/bin/env php
<?php
/**
* Wikidot - free wiki collaboration software
@@ -28,53 +29,42 @@
* this file creates configuration files that is needed to run Wikidot
*/
-$files = array("/web/.htaccess", "/files/apache.vhost.wikidot.conf", "/files/crontab", "/files/lighttpd-wikidot.conf");
+$files = array("/files/crontab", "/conf/lighttpd/wikidot_ini.conf", "/conf/secret");
chdir(dirname(__FILE__));
require("../php/setup.php");
chdir(WIKIDOT_ROOT);
+$random = random(64);
+
foreach ($files as $file) {
$src = WIKIDOT_ROOT."$file.orig";
$dst = WIKIDOT_ROOT.$file;
echo "Processing $file .";
$s = file_get_contents($src);
echo ".";
- $s = sed($s);
+ $s = sed($s, $random);
echo ".";
file_put_contents($dst, $s);
echo ".\n";
}
-// generate RSA key
-
-echo "Generating RSA keys ..\n";
-exec('sh bin/generate_keys.sh');
-
-echo "Done!!!\n";
-
-echo <<<EOT
-
-Now please use the following files:
-
-files/apache.vhost.wikidot.conf - append to your Apache configuration,
-OR files/lighttpd-wikidot.conf - include to lighttpd configuration (sample Lighttpd configuration: files/lighttpd.conf)
-files/crontab - append to your Crontab configuration
-
-You might also get a Flickr API key from http://flickr.com and
-put it to files/flickr-api-key.txt
-
-
-EOT;
-
+function random($length) {
+ $r = "";
+ for ($i = 0; $i < $length; $i++) {
+ $r .= dechex(rand(0, 15));
+ }
+ return $r;
+}
-function sed($s) {
- $s = preg_replace('/%{WIKIDOT:WIKIDOT_ROOT}/', WIKIDOT_ROOT, $s);
- $s = preg_replace('/%{WIKIDOT:URL_HOST}/', GlobalProperties::$URL_HOST, $s);
- $s = preg_replace('/%{WIKIDOT:URL_HOST_PREG}/', GlobalProperties::$URL_HOST_PREG, $s);
- $s = preg_replace('/%{WIKIDOT:URL_DOMAIN}/', GlobalProperties::$URL_DOMAIN, $s);
- $s = preg_replace('/%{WIKIDOT:URL_DOMAIN_PREG}/', GlobalProperties::$URL_DOMAIN_PREG, $s);
- $s = preg_replace('/%{WIKIDOT:SUPPORT_EMAIL}/', GlobalProperties::$SUPPORT_EMAIL, $s);
+function sed($s, $random) {
+ $s = preg_replace('/%{WIKIDOT:WIKIDOT_ROOT}/', addslashes(WIKIDOT_ROOT), $s);
+ $s = preg_replace('/%{WIKIDOT:URL_HOST}/', addslashes(GlobalProperties::$URL_HOST), $s);
+ $s = preg_replace('/%{WIKIDOT:URL_HOST_PREG}/', addslashes(GlobalProperties::$URL_HOST_PREG), $s);
+ $s = preg_replace('/%{WIKIDOT:URL_DOMAIN}/', addslashes(GlobalProperties::$URL_DOMAIN), $s);
+ $s = preg_replace('/%{WIKIDOT:URL_DOMAIN_PREG}/', addslashes(GlobalProperties::$URL_DOMAIN_PREG), $s);
+ $s = preg_replace('/%{WIKIDOT:HTTP_PORT}/', addslashes(GlobalProperties::$HTTP_PORT), $s);
+ $s = preg_replace('/%{WIKIDOT:RANDOM_STRING}/', $random, $s);
return $s;
}
bin/configure.php
@@ -1,3 +1,4 @@
+#!/usr/bin/env php
<?php
/**
bin/generate_om.php
@@ -75,4 +75,6 @@ CreateAccount createaccount2/CreateAccountModule
CreateAccount2 createaccount2/CreateAccount2Module
CreateAccount3 createaccount2/CreateAccount3Module
WantedPages sitetools/WantedPagesStandaloneModule
-OrphanedPages sitetools/OrphanedPagesStandaloneModule
\ No newline at end of file
+OrphanedPages sitetools/OrphanedPagesStandaloneModule
+ManageSuperUser manage/ManageSuperUserModule
+ManageUsers manage/ManageUsersModule
conf/wiki_modules/default.conf
@@ -1,31 +1,10 @@
-[main]
-; the following option determines the master domain for your Wikidot installation
-domain = wikidot1.dev
-; the name of the Wikidot service
-service = Wikidot custom installation
-
-[security]
-; string that is used to generate unpredictable hashes for authentication
-; YOU MUST CHANGE IT or otherwise, anyone can predict the authentication
-; cookies and thus steal any session from your users
-secret = enter some random phrase here
-domain_upload = wikifiles.wikidot.dev
-
[db]
; PostgreSQL connection parameters
host = localhost
-user = wd
-password = wdpass
-database = wd1
+user = wikidot
+password = wikidot
+database = wikidot
-[mail]
-; simple mail sending parameters
-host = smtp.gmail.com
-port = 465
-ssl = true
-auth = true
-user = wikidot.quake
-password = testpass
+[main]
+port = 8080
-[misc]
-custom_domains = true
\ No newline at end of file
conf/wikidot.ini
@@ -30,21 +30,34 @@ class LoginStatusModule extends Module{
// Smarty if not required!
$user = $runData->getUser();
+
+ if (GlobalProperties::$WIKI_FARM) {
+ $url_prefix = 'http://'.$loginDomain.'.'.GlobalProperties::$URL_DOMAIN;
+ } else {
+ $url_prefix = '';
+ }
if($user == null){
$site = $runData->getTemp('site');
- $originalUrl = 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+
+ $originalUrl = $_SERVER['REQUEST_URI'];
+ if (GlobalProperties::$WIKI_FARM) {
+ $originalUrl = 'http://' . $_SERVER['HTTP_HOST'] . $originalUrl;
+ }
+
if(preg_match(';\?origUrl=.*$;', $originalUrl)){
$o = array();
parse_str(preg_replace(';^.*?\?;', '', $_SERVER['REQUEST_URI']), $o);
$originalUrl = $o['origUrl'];
}
+
$loginDomain = 'www';
if($site->getLanguage() != 'en'){
$loginDomain = $site->getLanguage();
}
- $out = '<a href="http://'.$loginDomain.'.'.GlobalProperties::$URL_DOMAIN . '/auth:newaccount?origUrl='.urlencode($originalUrl).'">'._('create account').'</a> '._('or') . ' ';
- $out .= '<a href="http://'.$loginDomain.'.'.GlobalProperties::$URL_DOMAIN . '/auth:login?origUrl='.urlencode($originalUrl).'">'._('login').'</a> ';
+
+ $out = '<a href="' . $url_prefix . '/auth:newaccount?origUrl='.urlencode($originalUrl).'">'._('create account').'</a> '._('or') . ' ';
+ $out .= '<a href="' . $url_prefix . '/auth:login?origUrl='.urlencode($originalUrl).'">'._('login').'</a> ';
//$out = '<a href="javascript:;" onclick="WIKIDOT.page.listeners.createAccount(event)">'._('create account').'</a> '._('or').' <a href="javascript:;" onclick="WIKIDOT.page.listeners.loginClick(event)">'._('login').'</a>';
} else {
@@ -65,24 +78,24 @@ class LoginStatusModule extends Module{
setlocale(LC_ALL, $glang.'.UTF-8');
$userId = $user->getUserId();
- $linkInner = 'href="http://' . GlobalProperties::$URL_HOST . '/user:info/'.$user->getUnixName().'" onclick="WIKIDOT.page.listeners.userInfo('.$user->getUserId().'); return false;" ';
+ $linkInner = 'href="' . $url_prefix . '/user:info/'.$user->getUnixName().'" onclick="WIKIDOT.page.listeners.userInfo('.$user->getUserId().'); return false;" ';
$out = '<span class="printuser"><a '.$linkInner.'><img class="small" src="/common--images/avatars/'.floor($userId/1000).'/'.$userId.'/a16.png" alt="avatar"';
/* karma: */
- $out .= ' style="background-image:url(http://' . GlobalProperties::$URL_HOST . '/userkarma.php?u=' .$userId . ')"';
+ $out .= ' style="background-image:url(' . $url_prefix . '/userkarma.php?u=' .$userId . ')"';
/* end of karma */
$out .= '/></a>';
$out .= $user->getNickName().'</span>'.
- ' | <a href="http://'.GlobalProperties::$URL_HOST.'/account:you">'._('my account').'</a>' .
+ ' | <a href="' . $url_prefix .'/account:you">'._('my account').'</a>' .
'<a id="account-topbutton" href="javascript:;">∇</a>';
$out .= '<div id="account-options">' .
'<ul>' .
- '<li><a href="http://'.GlobalProperties::$URL_HOST.'/account:you">'._('account summary').'</a></li>' .
- '<li><a href="http://'.GlobalProperties::$URL_HOST.'/account:you/start/messages">'._('private messages').'</a></li>' .
- '<li><a href="http://'.GlobalProperties::$URL_HOST.'/account:you/start/contacts">'._('my contacts').'</a></li>' .
- '<li><a href="http://'.GlobalProperties::$URL_HOST.'/account:you/start/notifications">'._('notifications').'</a></li>'.
- '<li><a href="http://'.GlobalProperties::$URL_HOST.'/account:you/start/watched-changes">'._('watched pages').'</a></li>'.
- '<li><a href="http://'.GlobalProperties::$URL_HOST.'/account:you/start/watched-forum">'._('watched discussions').'</a></li>'.
+ '<li><a href="' . $url_prefix . '/account:you">'._('account summary').'</a></li>' .
+ '<li><a href="' . $url_prefix . '/account:you/start/messages">'._('private messages').'</a></li>' .
+ '<li><a href="' . $url_prefix . '/account:you/start/contacts">'._('my contacts').'</a></li>' .
+ '<li><a href="' . $url_prefix . '/account:you/start/notifications">'._('notifications').'</a></li>'.
+ '<li><a href="' . $url_prefix . '/account:you/start/watched-changes">'._('watched pages').'</a></li>'.
+ '<li><a href="' . $url_prefix . '/account:you/start/watched-forum">'._('watched discussions').'</a></li>'.
'<li><a href="javascript:;" onclick="WIKIDOT.page.listeners.logoutClick(event)">'._('logout').'</a></li>' .
'</ul></div>';
php/modules/LoginStatusModule.php
@@ -44,5 +44,10 @@ if(!defined('WIKIDOT_SETUP_COMPLETED')){
require_once (WIKIDOT_ROOT.DIRECTORY_SEPARATOR."lib/ozone/php/core/functions.php");
require_once (WIKIDOT_ROOT.DIRECTORY_SEPARATOR."lib/ozone/php/core/autoload.inc.php");
+ if (! GlobalProperties::$WIKI_FARM) {
+ $_SERVER['HTTP_HOST'] = GlobalProperties::$URL_HOST;
+ GlobalProperties::$SESSION_COOKIE_DOMAIN = null;
+ }
+
define('WIKIDOT_SETUP_COMPLETED', true);
}
php/setup.php
@@ -18,7 +18,7 @@
*
* @category Wikidot
* @package Wikidot
- * @version $Id$
+ * @version $Id: CodeblockExtractor.php,v 1.2 2008/08/05 21:00:26 quake Exp $
* @copyright Copyright (c) 2008, Wikidot Inc.
* @license http://www.gnu.org/licenses/agpl-3.0.html GNU Affero General Public License
*/
@@ -27,45 +27,37 @@ class CodeblockExtractor {
protected $mimeType = null;
protected $contents = "";
+ protected $treatAsTemplate = false;
+ protected $templateVariables = array();
protected $mimeMap = array(
"css" => "text/css",
"html" => "text/html",
);
- public function __construct($site, $pageName, $codeblockNo = 1){
+ public function __construct($site, $pageName, $codeblockNo = 1, $templateVars = null){
try {
$codeblockNo = (int) $codeblockNo;
if ($codeblockNo < 1) {
$codeblockNo = 1;
}
- /* Check the cache. */
+ $page = DB_PagePeer::instance()->selectByName($site->getSiteId(), $pageName);
- $mkey = 'pagecodeblocks..' . $site->getSiteId() . '..' . $pageName;
- $m = OZONE::$memcache;
- $allMatches = $m->get($mkey);
- if(!$allMatches) {
-
- $page = DB_PagePeer::instance()->selectByName($site->getSiteId(), $pageName);
-
- if($page == null){
- throw new ProcessException("No such page");
- }
- // page exists!!! wooo!!!
-
- $source = $page->getSource();
- /* Get code block. */
-
- $regex = ';^\[\[code(\s[^\]]*)?\]\]((?:(?R)|.)*?)\[\[/code\]\](\s|$);msi';
-
- $allMatches = array();
- preg_match_all($regex, $source, $allMatches);
-
- $m->set($mkey, $allMatches, 0, 3600);
+ if($page == null){
+ throw new ProcessException("No such page");
}
+ // page exists!!! wooo!!!
+
+ $source = $page->getSource();
+ /* Get code block. */
+
+ $regex = ';^\[\[code(\s[^\]]*)?\]\]((?:(?R)|.)*?)\[\[/code\]\](\s|$);msi';
- if(count($allMatches[2]) < $codeblockNo ) {
+ $allMatches = array();
+ preg_match_all($regex, $source, $allMatches);
+
+ if(count($allMatches[2]) < $codeblockNo) {
throw new ProcessException('No valid codeblock found.');
}
@@ -82,7 +74,13 @@ class CodeblockExtractor {
}
}
- $this->contents = trim($code)."\n";
+ $code = trim($code) . "\n";
+
+ if (is_array($templateVars)) {
+ $this->contents = $this->renderSimpleTemplate($code, $templateVars);
+ } else {
+ $this->contents = $code;
+ }
} catch(Exception $e) {
$this->contents = $e->getMessage();
@@ -99,5 +97,24 @@ class CodeblockExtractor {
}
return "text/plain";
}
+
+ public function renderSimpleTemplate($template, $context) {
+ $template = "\n$template\n";
+ $template_parts = explode("\n---\n", $template);
+ $form_def = array_shift($template_parts);
+ $template = trim(implode("\n---\n", $template_parts));
+
+ $form = Wikidot_Form::fromYaml($form_def);
+
+ foreach ($form->fields as $name => $field) {
+ $variable = '$(' . $name . ')';
+ $value = $field['default'];
+ if (isset($context[$name])) {
+ $value = $context[$name];
+ }
+ $template = str_replace($variable, $value, $template);
+ }
+ return $template;
+ }
}
php/utils/CodeblockExtractor.php
@@ -38,6 +38,8 @@ class GlobalProperties {
public static $SERVICE_NAME;
public static $URL_DOMAIN;
public static $URL_HOST;
+ public static $WIKI_FARM;
+ public static $HTTP_PORT;
// security settings
public static $USE_SSL;
@@ -46,6 +48,7 @@ class GlobalProperties {
public static $USE_UPLOAD_DOMAIN;
public static $URL_UPLOAD_DOMAIN;
public static $RESTRICT_HTML;
+ public static $SECRET_MANAGE_SUPERADMIN;
// database settings
public static $DATABASE_SERVER;
@@ -143,6 +146,16 @@ class GlobalProperties {
}
return $value;
}
+
+ protected static function fromFile($file) {
+ if ($fp = @fopen(WIKIDOT_ROOT . '/conf/' . $file, 'r')) {
+ $s = fread($fp, 4096);
+ fclose($fp);
+ } else {
+ $s = "";
+ }
+ return trim($s);
+ }
/**
* read wikidot.ini file
@@ -154,17 +167,27 @@ class GlobalProperties {
self::$iniConfig = parse_ini_file(WIKIDOT_ROOT . "/conf/wikidot.ini", true);
// main settings
- self::$SERVICE_NAME = self::fromIni("main", "service"); // no default!
- self::$URL_DOMAIN = self::fromIni("main", "domain"); // no default!
- self::$URL_HOST = self::fromIni("main", "main_wiki", "www." . self::$URL_DOMAIN);
+ self::$WIKI_FARM = self::fromIni("main", "wiki_farm", false);
+ self::$HTTP_PORT = self::fromIni("main", "port", 8080);
+
+ if (self::$WIKI_FARM) {
+ self::$SERVICE_NAME = self::fromIni("main", "service"); //no default
+ self::$URL_DOMAIN = self::fromIni("main", "domain", "singlewiki.wikidot.dev");
+ self::$URL_HOST = self::fromIni("main", "main_wiki", "www." . self::$URL_DOMAIN);
+ } else {
+ self::$SERVICE_NAME = "";
+ self::$URL_DOMAIN = self::fromIni("main", "domain", "singlewiki.wikidot.dev");
+ self::$URL_HOST = self::fromIni("main", "main_wiki", "www." . self::$URL_DOMAIN);
+ }
// security settings
- self::$SECRET = self::fromIni("security", "secret"); // no default!
+ self::$SECRET = self::fromIni("security", "secret", self::fromFile('secret'));
self::$USE_SSL = self::fromIni("security", "ssl", false);
self::$SECRET_DOMAIN_LOGIN = self::fromIni("security", "secret_login", self::$SECRET . "_custom_domain_login");
self::$USE_UPLOAD_DOMAIN = self::fromIni("security", "upload_separate_domain", false);
self::$URL_UPLOAD_DOMAIN = self::fromIni("security", "upload_domain", "wd.files." . self::$URL_DOMAIN);
self::$RESTRICT_HTML = self::fromIni("security", "upload_restrict_html", true);
+ self::$SECRET_MANAGE_SUPERADMIN = self::fromIni("security", "secret_manage_superuser", md5(self::$SECRET . '_super_admin'));
// database settings
self::$DATABASE_USER = self::fromIni("db", "user"); // no default!
php/utils/GlobalProperties.php
@@ -158,20 +158,28 @@ class UploadedFileFlowController extends WikidotController {
* @param string $fileName code/pagename/number
* @param int $expires timeout in seconds
*/
- protected function serveCode($site, $fileName, $expires = 0) {
+ protected function serveCode($site, $fileName, $expires = 0, $restrict_html = false) {
$m = array();
- if (preg_match(";^code/([^/]+)(?:/([0-9]+))?$;", $fileName, $m)) {
+ if (preg_match(";^code/([^/]+)/?(?:/([0-9]+))?(?:(/r/)(.*))?$;", $fileName, $m)) {
$pageName = $m[1];
$number = 1;
if (isset($m[2])) {
$number = (int) $m[2];
}
-
- $ext = new CodeblockExtractor($site, $pageName, $number);
+ if (isset($m[3])) {
+ $params = array();
+ if (isset($m[4])) {
+ parse_str($m[4], $params);
+ }
+ } else {
+ $params = null;
+ }
+
+ $ext = new CodeblockExtractor($site, $pageName, $number, $params);
$mime = $ext->getMimeType();
- if (GlobalProperties::$RESTRICT_HTML && in_array($mime, self::$HTML_MIME_TYPES)) {
+ if ($restrict_html && preg_match(self::$HTML_MIME_TYPES, $mime)) {
$mime = self::$HTML_SERVE_AS;
}
$this->setContentTypeHeader($mime);
@@ -237,7 +245,7 @@ class UploadedFileFlowController extends WikidotController {
if ($this->publicArea($site, $file)) {
if ($this->isCodeRequest($file)) {
- $this->serveCode($site, $file, 3600);
+ $this->serveCode($site, $file, 3600, GlobalProperties::$RESTRICT_HTML);
} else {
$this->serveFileWithMime($path, 3600, GlobalProperties::$RESTRICT_HTML);
}
php/utils/UploadedFileFlowController.php
@@ -175,8 +175,10 @@
</a>
</div>
- Part of <a href="http://{$URL_HOST}">{$SERVICE_NAME|escape}</a>
- —
+ {if $SERVICE_NAME!=""}
+ Part of <a href="http://{$URL_HOST}">{$SERVICE_NAME|escape}</a>
+ —
+ {/if}
Powered by <a href="http://www.wikidot.org/">Wikidot</a>
</div>
{if $licenseText!=""}
@@ -247,4 +249,4 @@
<div style="display:none" id="dummy-ondomready-block"></div>
</body>
-</html>
\ No newline at end of file
+</html>
templates/layouts/WikiLayout.tpl
@@ -38,6 +38,7 @@ WIKIDOT.modules.LoginModule.listeners = {
switchUser: function(e){
setCookie('welcome', null, -100000, '/', '.'+URL_DOMAIN);
+ setCookie('welcome', null, -100000, '/');
window.location.reload();
},
@@ -72,12 +73,12 @@ WIKIDOT.modules.LoginModule.callbacks = {
if(originalUrl){
window.location.href=originalUrl;
}else{
- window.location.href='http://'+URL_HOST;
+ window.location.href='http://'+window.location.host;
}
},
cancel: function(r){
- window.location.href='http://'+window.location.hostname;
+ window.location.href='http://'+window.location.host;
}
}
web/files--common/modules/js/login/LoginModule.js
files/lighttpd-wikidot.conf.orig
files/lighttpd.conf
93be9c3a45412a3781628939a9a25d5e70718d77
Piotr Gabryjeluk
piotr@wikidot.com
http://github.com/gabrys/wikidot/commit/d60ca315c645f068421183d1f19ff684227340cf
d60ca315c645f068421183d1f19ff684227340cf
2009-05-14T15:22:38-07:00
2009-05-14T15:22:38-07:00
* a draft code templating system
* single wiki mode as the default
* Makefile-based build
* other improvements
c03408a31e24561ec1474af52240ba0d125c7784
Piotr Gabryjeluk
piotr@wikidot.com