From c404cb3b0b4946f6308f66b6324a24489b2ef5b8 Mon Sep 17 00:00:00 2001 From: Matt Perry Date: Fri, 23 Aug 2013 03:08:41 -0700 Subject: Fix CodeSniffer violations for PHP files Fix violations for Squiz.Commenting.DocCommentAlignment.SpaceBeforeTag Conflicts: inc/parser/xhtml.php --- inc/farm.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc/farm.php') diff --git a/inc/farm.php b/inc/farm.php index 54fff3ec6..54692928d 100644 --- a/inc/farm.php +++ b/inc/farm.php @@ -20,7 +20,7 @@ * @author virtual host part of farm_confpath() based on conf_path() from Drupal.org's /includes/bootstrap.inc * (see https://github.com/drupal/drupal/blob/7.x/includes/bootstrap.inc#L537) * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) -*/ + */ // DOKU_FARMDIR needs to be set in preload.php, here the fallback is the same as DOKU_INC would be (if it was set already) if(!defined('DOKU_FARMDIR')) define('DOKU_FARMDIR', fullpath(dirname(__FILE__).'/../').'/'); -- cgit v1.2.3 From 8c867678811e7f91159175c41ef4722a2fc5308c Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Mon, 4 Nov 2013 01:17:09 +0000 Subject: removed loading of deprecated RTL styles --- inc/farm.php | 2 -- 1 file changed, 2 deletions(-) (limited to 'inc/farm.php') diff --git a/inc/farm.php b/inc/farm.php index 54692928d..cee61816c 100644 --- a/inc/farm.php +++ b/inc/farm.php @@ -135,9 +135,7 @@ $config_cascade = array( ), ), 'userstyle' => array( - 'default' => DOKU_CONF.'userstyle.css', // 'default' was renamed to 'screen' on 2011-02-26, so will be deprecated in the next version 'screen' => DOKU_CONF.'userstyle.css', - 'rtl' => DOKU_CONF.'userrtl.css', // deprecated since version after 2012-04-09 'print' => DOKU_CONF.'userprint.css', 'feed' => DOKU_CONF.'userfeed.css', 'all' => DOKU_CONF.'userall.css', -- cgit v1.2.3 From 9b47ccb8d0bb02c6f5a7a67d261a43f0fd31413c Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Mon, 4 Nov 2013 10:42:19 +0000 Subject: deleted wrongly added file --- inc/farm.php | 146 ----------------------------------------------------------- 1 file changed, 146 deletions(-) delete mode 100644 inc/farm.php (limited to 'inc/farm.php') diff --git a/inc/farm.php b/inc/farm.php deleted file mode 100644 index cee61816c..000000000 --- a/inc/farm.php +++ /dev/null @@ -1,146 +0,0 @@ -/subdir/ will need the subdirectory '$farm/subdir/'. - * * A virtual host based setup needs animal directory names which have to reflect - * the domain name: If an animal resides in http://www.example.org:8080/mysite/test/, - * directories that will match range from '$farm/8080.www.example.org.mysite.test/' - * to a simple '$farm/domain/'. - * - * @author Anika Henke - * @author Michael Klier - * @author Christopher Smith - * @author virtual host part of farm_confpath() based on conf_path() from Drupal.org's /includes/bootstrap.inc - * (see https://github.com/drupal/drupal/blob/7.x/includes/bootstrap.inc#L537) - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -// DOKU_FARMDIR needs to be set in preload.php, here the fallback is the same as DOKU_INC would be (if it was set already) -if(!defined('DOKU_FARMDIR')) define('DOKU_FARMDIR', fullpath(dirname(__FILE__).'/../').'/'); -if(!defined('DOKU_CONF')) define('DOKU_CONF', farm_confpath(DOKU_FARMDIR)); -if(!defined('DOKU_FARM')) define('DOKU_FARM', false); - - -/** - * Find the appropriate configuration directory. - * - * If the .htaccess based setup is used, the configuration directory can be - * any subdirectory of the farm directory. - * - * Otherwise try finding a matching configuration directory by stripping the - * website's hostname from left to right and pathname from right to left. The - * first configuration file found will be used; the remaining will ignored. - * If no configuration file is found, return the default confdir './conf'. - */ -function farm_confpath($farm) { - - // htaccess based or cli - // cli usage example: animal=your_animal bin/indexer.php - if(isset($_REQUEST['animal']) || ('cli' == php_sapi_name() && isset($_SERVER['animal']))) { - $mode = isset($_REQUEST['animal']) ? 'htaccess' : 'cli'; - $animal = $mode == 'htaccess' ? $_REQUEST['animal'] : $_SERVER['animal']; - // check that $animal is a string and just a directory name and not a path - if (!is_string($animal) || strpbrk($animal, '\\/') !== false) - nice_die('Sorry! Invalid animal name!'); - if(!is_dir($farm.'/'.$animal)) - nice_die("Sorry! This Wiki doesn't exist!"); - if(!defined('DOKU_FARM')) define('DOKU_FARM', $mode); - return $farm.'/'.$animal.'/conf/'; - } - - // virtual host based - $uri = explode('/', $_SERVER['SCRIPT_NAME'] ? $_SERVER['SCRIPT_NAME'] : $_SERVER['SCRIPT_FILENAME']); - $server = explode('.', implode('.', array_reverse(explode(':', rtrim($_SERVER['HTTP_HOST'], '.'))))); - for ($i = count($uri) - 1; $i > 0; $i--) { - for ($j = count($server); $j > 0; $j--) { - $dir = implode('.', array_slice($server, -$j)) . implode('.', array_slice($uri, 0, $i)); - if(is_dir("$farm/$dir/conf/")) { - if(!defined('DOKU_FARM')) define('DOKU_FARM', 'virtual'); - return "$farm/$dir/conf/"; - } - } - } - - // default conf directory in farm - if(is_dir("$farm/default/conf/")) { - if(!defined('DOKU_FARM')) define('DOKU_FARM', 'default'); - return "$farm/default/conf/"; - } - // farmer - return DOKU_INC.'conf/'; -} - -/* Use default config files and local animal config files */ -$config_cascade = array( - 'main' => array( - 'default' => array(DOKU_INC.'conf/dokuwiki.php'), - 'local' => array(DOKU_CONF.'local.php'), - 'protected' => array(DOKU_CONF.'local.protected.php'), - ), - 'acronyms' => array( - 'default' => array(DOKU_INC.'conf/acronyms.conf'), - 'local' => array(DOKU_CONF.'acronyms.local.conf'), - ), - 'entities' => array( - 'default' => array(DOKU_INC.'conf/entities.conf'), - 'local' => array(DOKU_CONF.'entities.local.conf'), - ), - 'interwiki' => array( - 'default' => array(DOKU_INC.'conf/interwiki.conf'), - 'local' => array(DOKU_CONF.'interwiki.local.conf'), - ), - 'license' => array( - 'default' => array(DOKU_INC.'conf/license.php'), - 'local' => array(DOKU_CONF.'license.local.php'), - ), - 'mediameta' => array( - 'default' => array(DOKU_INC.'conf/mediameta.php'), - 'local' => array(DOKU_CONF.'mediameta.local.php'), - ), - 'mime' => array( - 'default' => array(DOKU_INC.'conf/mime.conf'), - 'local' => array(DOKU_CONF.'mime.local.conf'), - ), - 'scheme' => array( - 'default' => array(DOKU_INC.'conf/scheme.conf'), - 'local' => array(DOKU_CONF.'scheme.local.conf'), - ), - 'smileys' => array( - 'default' => array(DOKU_INC.'conf/smileys.conf'), - 'local' => array(DOKU_CONF.'smileys.local.conf'), - ), - 'wordblock' => array( - 'default' => array(DOKU_INC.'conf/wordblock.conf'), - 'local' => array(DOKU_CONF.'wordblock.local.conf'), - ), - 'acl' => array( - 'default' => DOKU_CONF.'acl.auth.php', - ), - 'plainauth.users' => array( - 'default' => DOKU_CONF.'users.auth.php', - ), - 'plugins' => array( // needed since Angua - 'default' => array(DOKU_INC.'conf/plugins.php'), - 'local' => array(DOKU_CONF.'plugins.local.php'), - 'protected' => array( - DOKU_INC.'conf/plugins.required.php', - DOKU_CONF.'plugins.protected.php', - ), - ), - 'userstyle' => array( - 'screen' => DOKU_CONF.'userstyle.css', - 'print' => DOKU_CONF.'userprint.css', - 'feed' => DOKU_CONF.'userfeed.css', - 'all' => DOKU_CONF.'userall.css', - ), - 'userscript' => array( - 'default' => DOKU_CONF.'userscript.js' - ), -); -- cgit v1.2.3 From 13054fbf5e7e9dd2c2544a358603cd8f195f9996 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Mon, 4 Nov 2013 10:46:06 +0000 Subject: Revert "deleted wrongly added file" This reverts commit 9b47ccb8d0bb02c6f5a7a67d261a43f0fd31413c. --- inc/farm.php | 146 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 146 insertions(+) create mode 100644 inc/farm.php (limited to 'inc/farm.php') diff --git a/inc/farm.php b/inc/farm.php new file mode 100644 index 000000000..cee61816c --- /dev/null +++ b/inc/farm.php @@ -0,0 +1,146 @@ +/subdir/ will need the subdirectory '$farm/subdir/'. + * * A virtual host based setup needs animal directory names which have to reflect + * the domain name: If an animal resides in http://www.example.org:8080/mysite/test/, + * directories that will match range from '$farm/8080.www.example.org.mysite.test/' + * to a simple '$farm/domain/'. + * + * @author Anika Henke + * @author Michael Klier + * @author Christopher Smith + * @author virtual host part of farm_confpath() based on conf_path() from Drupal.org's /includes/bootstrap.inc + * (see https://github.com/drupal/drupal/blob/7.x/includes/bootstrap.inc#L537) + * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) + */ + +// DOKU_FARMDIR needs to be set in preload.php, here the fallback is the same as DOKU_INC would be (if it was set already) +if(!defined('DOKU_FARMDIR')) define('DOKU_FARMDIR', fullpath(dirname(__FILE__).'/../').'/'); +if(!defined('DOKU_CONF')) define('DOKU_CONF', farm_confpath(DOKU_FARMDIR)); +if(!defined('DOKU_FARM')) define('DOKU_FARM', false); + + +/** + * Find the appropriate configuration directory. + * + * If the .htaccess based setup is used, the configuration directory can be + * any subdirectory of the farm directory. + * + * Otherwise try finding a matching configuration directory by stripping the + * website's hostname from left to right and pathname from right to left. The + * first configuration file found will be used; the remaining will ignored. + * If no configuration file is found, return the default confdir './conf'. + */ +function farm_confpath($farm) { + + // htaccess based or cli + // cli usage example: animal=your_animal bin/indexer.php + if(isset($_REQUEST['animal']) || ('cli' == php_sapi_name() && isset($_SERVER['animal']))) { + $mode = isset($_REQUEST['animal']) ? 'htaccess' : 'cli'; + $animal = $mode == 'htaccess' ? $_REQUEST['animal'] : $_SERVER['animal']; + // check that $animal is a string and just a directory name and not a path + if (!is_string($animal) || strpbrk($animal, '\\/') !== false) + nice_die('Sorry! Invalid animal name!'); + if(!is_dir($farm.'/'.$animal)) + nice_die("Sorry! This Wiki doesn't exist!"); + if(!defined('DOKU_FARM')) define('DOKU_FARM', $mode); + return $farm.'/'.$animal.'/conf/'; + } + + // virtual host based + $uri = explode('/', $_SERVER['SCRIPT_NAME'] ? $_SERVER['SCRIPT_NAME'] : $_SERVER['SCRIPT_FILENAME']); + $server = explode('.', implode('.', array_reverse(explode(':', rtrim($_SERVER['HTTP_HOST'], '.'))))); + for ($i = count($uri) - 1; $i > 0; $i--) { + for ($j = count($server); $j > 0; $j--) { + $dir = implode('.', array_slice($server, -$j)) . implode('.', array_slice($uri, 0, $i)); + if(is_dir("$farm/$dir/conf/")) { + if(!defined('DOKU_FARM')) define('DOKU_FARM', 'virtual'); + return "$farm/$dir/conf/"; + } + } + } + + // default conf directory in farm + if(is_dir("$farm/default/conf/")) { + if(!defined('DOKU_FARM')) define('DOKU_FARM', 'default'); + return "$farm/default/conf/"; + } + // farmer + return DOKU_INC.'conf/'; +} + +/* Use default config files and local animal config files */ +$config_cascade = array( + 'main' => array( + 'default' => array(DOKU_INC.'conf/dokuwiki.php'), + 'local' => array(DOKU_CONF.'local.php'), + 'protected' => array(DOKU_CONF.'local.protected.php'), + ), + 'acronyms' => array( + 'default' => array(DOKU_INC.'conf/acronyms.conf'), + 'local' => array(DOKU_CONF.'acronyms.local.conf'), + ), + 'entities' => array( + 'default' => array(DOKU_INC.'conf/entities.conf'), + 'local' => array(DOKU_CONF.'entities.local.conf'), + ), + 'interwiki' => array( + 'default' => array(DOKU_INC.'conf/interwiki.conf'), + 'local' => array(DOKU_CONF.'interwiki.local.conf'), + ), + 'license' => array( + 'default' => array(DOKU_INC.'conf/license.php'), + 'local' => array(DOKU_CONF.'license.local.php'), + ), + 'mediameta' => array( + 'default' => array(DOKU_INC.'conf/mediameta.php'), + 'local' => array(DOKU_CONF.'mediameta.local.php'), + ), + 'mime' => array( + 'default' => array(DOKU_INC.'conf/mime.conf'), + 'local' => array(DOKU_CONF.'mime.local.conf'), + ), + 'scheme' => array( + 'default' => array(DOKU_INC.'conf/scheme.conf'), + 'local' => array(DOKU_CONF.'scheme.local.conf'), + ), + 'smileys' => array( + 'default' => array(DOKU_INC.'conf/smileys.conf'), + 'local' => array(DOKU_CONF.'smileys.local.conf'), + ), + 'wordblock' => array( + 'default' => array(DOKU_INC.'conf/wordblock.conf'), + 'local' => array(DOKU_CONF.'wordblock.local.conf'), + ), + 'acl' => array( + 'default' => DOKU_CONF.'acl.auth.php', + ), + 'plainauth.users' => array( + 'default' => DOKU_CONF.'users.auth.php', + ), + 'plugins' => array( // needed since Angua + 'default' => array(DOKU_INC.'conf/plugins.php'), + 'local' => array(DOKU_CONF.'plugins.local.php'), + 'protected' => array( + DOKU_INC.'conf/plugins.required.php', + DOKU_CONF.'plugins.protected.php', + ), + ), + 'userstyle' => array( + 'screen' => DOKU_CONF.'userstyle.css', + 'print' => DOKU_CONF.'userprint.css', + 'feed' => DOKU_CONF.'userfeed.css', + 'all' => DOKU_CONF.'userall.css', + ), + 'userscript' => array( + 'default' => DOKU_CONF.'userscript.js' + ), +); -- cgit v1.2.3