Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of git://github.com/splitbrain/dokuwiki
- Loading branch information
Showing
23 changed files
with
355 additions
and
160 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| ====== Index ====== | ||
| ====== Sitemap ====== | ||
|
|
||
| This is an index over all available pages ordered by [[doku>namespaces|namespaces]]. | ||
| This is a sitemap over all available pages ordered by [[doku>namespaces|namespaces]]. | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,51 +1,48 @@ | ||
| <?php | ||
| if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../'); | ||
| define('DOKU_MEDIADETAIL',1); | ||
| require_once(DOKU_INC.'inc/init.php'); | ||
| //close session | ||
| session_write_close(); | ||
|
|
||
| $IMG = getID('media'); | ||
| $ID = cleanID($_REQUEST['id']); | ||
|
|
||
| if($conf['allowdebug'] && $_REQUEST['debug']){ | ||
| print '<pre>'; | ||
| foreach(explode(' ','basedir userewrite baseurl useslash') as $x){ | ||
| print '$'."conf['$x'] = '".$conf[$x]."';\n"; | ||
| } | ||
| foreach(explode(' ','DOCUMENT_ROOT HTTP_HOST SCRIPT_FILENAME PHP_SELF '. | ||
| 'REQUEST_URI SCRIPT_NAME PATH_INFO PATH_TRANSLATED') as $x){ | ||
| print '$'."_SERVER['$x'] = '".$_SERVER[$x]."';\n"; | ||
| } | ||
| print "getID('media'): ".getID('media')."\n"; | ||
| print "getID('media',false): ".getID('media',false)."\n"; | ||
| print '</pre>'; | ||
| } | ||
|
|
||
| $ERROR = false; | ||
| // check image permissions | ||
| $AUTH = auth_quickaclcheck($IMG); | ||
| if($AUTH >= AUTH_READ){ | ||
| if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../'); | ||
| define('DOKU_MEDIADETAIL',1); | ||
| require_once(DOKU_INC.'inc/init.php'); | ||
| //close session | ||
| session_write_close(); | ||
|
|
||
| $IMG = getID('media'); | ||
| $ID = cleanID($_REQUEST['id']); | ||
|
|
||
| if($conf['allowdebug'] && $_REQUEST['debug']){ | ||
| print '<pre>'; | ||
| foreach(explode(' ','basedir userewrite baseurl useslash') as $x){ | ||
| print '$'."conf['$x'] = '".$conf[$x]."';\n"; | ||
| } | ||
| foreach(explode(' ','DOCUMENT_ROOT HTTP_HOST SCRIPT_FILENAME PHP_SELF '. | ||
| 'REQUEST_URI SCRIPT_NAME PATH_INFO PATH_TRANSLATED') as $x){ | ||
| print '$'."_SERVER['$x'] = '".$_SERVER[$x]."';\n"; | ||
| } | ||
| print "getID('media'): ".getID('media')."\n"; | ||
| print "getID('media',false): ".getID('media',false)."\n"; | ||
| print '</pre>'; | ||
| } | ||
|
|
||
| $ERROR = false; | ||
| // check image permissions | ||
| $AUTH = auth_quickaclcheck($IMG); | ||
| if($AUTH >= AUTH_READ){ | ||
| // check if image exists | ||
| $SRC = mediaFN($IMG); | ||
| if(!@file_exists($SRC)){ | ||
| //doesn't exist! | ||
|
|
||
| //doesn't exist! | ||
| header("HTTP/1.0 404 File not Found"); | ||
| $ERROR = 'File not found'; | ||
| } | ||
| }else{ | ||
| }else{ | ||
| // no auth | ||
| $ERROR = p_locale_xhtml('denied'); | ||
| } | ||
|
|
||
| /*if(!$ERROR){ | ||
| // load EXIF/IPTC/image details | ||
| $INFO = array(); | ||
| $INFO['std'][''] | ||
| imagesize | ||
| }*/ | ||
| } | ||
|
|
||
| // this makes some general infos available as well as the info about the | ||
| // "parent" page | ||
| $INFO = pageinfo(); | ||
|
|
||
| //start output and load template | ||
| header('Content-Type: text/html; charset=utf-8'); | ||
| include(template('detail.php')); | ||
| //start output and load template | ||
| header('Content-Type: text/html; charset=utf-8'); | ||
| include(template('detail.php')); | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| div#acl_manager div#acl__tree { | ||
| float: right; | ||
| text-align: right; | ||
| } | ||
|
|
||
| div#acl_manager div#acl__tree li { | ||
| padding-left: 0em; | ||
| padding-right: 1em; | ||
| } | ||
|
|
||
| div#acl_manager div#acl__tree ul img { | ||
| margin-left: 0.25em; | ||
| margin-right: 0em; | ||
| } | ||
|
|
||
|
|
||
| div#acl_manager div#acl__detail { | ||
| float: left; | ||
| } | ||
|
|
||
| div#acl_manager .aclgroup { | ||
| background: transparent url(pix/group.png) right 1px no-repeat; | ||
| padding: 1px 18px 1px 0px; | ||
| } | ||
|
|
||
| div#acl_manager .acluser { | ||
| background: transparent url(pix/user.png) right 1px no-repeat; | ||
| padding: 1px 18px 1px 0px; | ||
| } | ||
|
|
||
| div#acl_manager .aclpage { | ||
| background: transparent url(pix/page.png) right 1px no-repeat; | ||
| padding: 1px 18px 1px 0px; | ||
| } | ||
|
|
||
| div#acl_manager .aclns { | ||
| background: transparent url(pix/ns.png) right 1px no-repeat; | ||
| padding: 1px 18px 1px 0px; | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.