Skip to content

Commit 7bff0db

Browse files
geekwrightgeekwright
committed
Xmf implementation
1 parent 91dcf43 commit 7bff0db

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+2499
-2231
lines changed

Diff for: ‎.gitattributes

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Auto detect text files and perform LF normalization
2+
* text=auto
3+
4+
/testing export-ignore
5+
.gitattributes export-ignore
6+
.gitignore export-ignore
7+
.scrutinizer.yml export-ignore

Diff for: ‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# no backup files, editor temp
22
*~
33
\#*
4-
*.kate-swp
4+
.idea/

Diff for: ‎README.md

+33-33
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
1-
![alt XOOPS CMS](http://xoops.org/images/logoXoops4GithubRepository.png)
2-
## gWiki module for [XOOPS CMS 2.5.8+](https://xoops.org)
3-
[![Software License](https://img.shields.io/badge/license-GPL-brightgreen.svg?style=flat)](LICENSE)
4-
[![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/mambax7/gwiki.svg?style=flat)](https://scrutinizer-ci.com/g/mambax7/gwiki/?branch=master)
5-
[![Codacy Badge](https://api.codacy.com/project/badge/grade/2d27c0023ee54f0b9ba2b5d17a68b2a5)](https://www.codacy.com/app/mambax7/gwiki)
6-
[![Code Climate](https://img.shields.io/codeclimate/github/mambax7/gwiki.svg?style=flat)](https://codeclimate.com/github/mambax7/gwiki)
7-
[![SensioLabsInsight](https://insight.sensiolabs.com/projects/ee2f6ad8-0de5-41f4-b804-10898953ad7f/mini.png)](https://insight.sensiolabs.com/projects/ee2f6ad8-0de5-41f4-b804-10898953ad7f)
8-
[![Latest Pre-Resease](https://img.shields.io/github/tag/XoopsModules25x/gwiki.svg?style=flat)](https://github.com/XoopsModules25x/gwiki/tags/)
9-
[![Latest Version](https://img.shields.io/github/release/XoopsModules25x/gwiki.svg?style=flat)](https://github.com/XoopsModules25x/gwiki/releases/)
10-
11-
**gWiki** for [XOOPS CMS](http://xoops.org), the geekwright wiki, is a XOOPS module which implements a wiki
12-
based on the [WikiCreole 1.0](http://wikicreole.org/) specification.
13-
In addition to the basics as defined in the WikiCreole spec, the wiki
14-
features several powerful extensions, giving it great flexibility as
15-
a content authoring and presentation tool. It also features an equally
16-
flexible permission capability, making a single instance suitable for
17-
multiple collaborative efforts, each with their own policies.
18-
19-
Although nearing release, this is still a work in progress.
20-
21-
[![Tutorial Available](http://xoops.org/images/tutorial-available-blue.svg)](https://www.gitbook.com/book/xoops/gwiki-tutorial/) Tutorial: see [GitBook](https://www.gitbook.com/book/xoops/gwiki-tutorial/).
22-
To contribute to the Tutorial, [fork it on GitHub](https://github.com/XoopsDocs/gwiki-tutorial)
23-
24-
Documentation is also supplied as wiki pages which can be optionally loaded
25-
into the wiki by the module administrator.
26-
27-
[![Translations on Transifex](http://xoops.org/images/translations-transifex-blue.svg)](https://www.transifex.com/xoops)
28-
29-
Please visit us on [http://xoops.org](http://xoops.org)
30-
31-
The upcoming "next generation" version of XOOPS CMS is being crafted on GitHub at: https://github.com/XOOPS
32-
33-
1+
![alt XOOPS CMS](http://xoops.org/images/logoXoops4GithubRepository.png)
2+
## gWiki module for [XOOPS CMS 2.5.8+](https://xoops.org)
3+
[![Software License](https://img.shields.io/badge/license-GPL-brightgreen.svg?style=flat)](LICENSE)
4+
[![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/mambax7/gwiki.svg?style=flat)](https://scrutinizer-ci.com/g/mambax7/gwiki/?branch=master)
5+
[![Codacy Badge](https://api.codacy.com/project/badge/grade/2d27c0023ee54f0b9ba2b5d17a68b2a5)](https://www.codacy.com/app/mambax7/gwiki)
6+
[![Code Climate](https://img.shields.io/codeclimate/github/mambax7/gwiki.svg?style=flat)](https://codeclimate.com/github/mambax7/gwiki)
7+
[![SensioLabsInsight](https://insight.sensiolabs.com/projects/ee2f6ad8-0de5-41f4-b804-10898953ad7f/mini.png)](https://insight.sensiolabs.com/projects/ee2f6ad8-0de5-41f4-b804-10898953ad7f)
8+
[![Latest Pre-Resease](https://img.shields.io/github/tag/XoopsModules25x/gwiki.svg?style=flat)](https://github.com/XoopsModules25x/gwiki/tags/)
9+
[![Latest Version](https://img.shields.io/github/release/XoopsModules25x/gwiki.svg?style=flat)](https://github.com/XoopsModules25x/gwiki/releases/)
10+
11+
**gWiki** for [XOOPS CMS](http://xoops.org), the geekwright wiki, is a XOOPS module which implements a wiki
12+
based on the [WikiCreole 1.0](http://wikicreole.org/) specification.
13+
In addition to the basics as defined in the WikiCreole spec, the wiki
14+
features several powerful extensions, giving it great flexibility as
15+
a content authoring and presentation tool. It also features an equally
16+
flexible permission capability, making a single instance suitable for
17+
multiple collaborative efforts, each with their own policies.
18+
19+
Although nearing release, this is still a work in progress.
20+
21+
[![Tutorial Available](http://xoops.org/images/tutorial-available-blue.svg)](https://www.gitbook.com/book/xoops/gwiki-tutorial/) Tutorial: see [GitBook](https://www.gitbook.com/book/xoops/gwiki-tutorial/).
22+
To contribute to the Tutorial, [fork it on GitHub](https://github.com/XoopsDocs/gwiki-tutorial)
23+
24+
Documentation is also supplied as wiki pages which can be optionally loaded
25+
into the wiki by the module administrator.
26+
27+
[![Translations on Transifex](http://xoops.org/images/translations-transifex-blue.svg)](https://www.transifex.com/xoops)
28+
29+
Please visit us on [http://xoops.org](http://xoops.org)
30+
31+
The upcoming "next generation" version of XOOPS CMS is being crafted on GitHub at: https://github.com/XOOPS
32+
33+

Diff for: ‎admin/about.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
include __DIR__ . '/header.php';
1313

14-
echo $moduleAdmin->addNavigation(basename(__FILE__));
15-
echo $moduleAdmin->renderAbout('', false);
14+
$moduleAdmin->displayNavigation(basename(__FILE__));
15+
$moduleAdmin->displayAbout('', false);
1616

1717
include __DIR__ . '/footer.php';

Diff for: ‎admin/attachments.php

+8-36
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
<?php
2+
3+
use Xmf\Request;
4+
25
/**
36
* admin/attachments.php - file attachment review tool
47
*
@@ -11,26 +14,7 @@
1114
include __DIR__ . '/header.php';
1215
//include_once dirname(__DIR__) . '/include/functions.php';
1316

14-
echo $moduleAdmin->addNavigation(basename(__FILE__));
15-
16-
/**
17-
* @param $string
18-
* @param bool $trim
19-
*
20-
* @return string
21-
*/
22-
function cleaner($string, $trim = true)
23-
{
24-
// $string=stripcslashes($string);
25-
$string = html_entity_decode($string);
26-
$string = strip_tags($string);
27-
if ($trim) {
28-
$string = trim($string);
29-
}
30-
$string = stripslashes($string);
31-
32-
return $string;
33-
}
17+
$moduleAdmin->displayNavigation(basename(__FILE__));
3418

3519
function showAttachments()
3620
{
@@ -49,22 +33,10 @@ function showAttachments()
4933
file_description text,
5034
file_uid int(10) NOT NULL DEFAULT '0',
5135
*/
52-
$kw = '';
53-
$fn = '';
54-
$ty = '';
55-
$ds = '';
56-
if (!empty($_GET['kw'])) {
57-
$kw = cleaner($_GET['kw']);
58-
}
59-
if (!empty($_GET['fn'])) {
60-
$fn = cleaner($_GET['fn']);
61-
}
62-
if (!empty($_GET['ty'])) {
63-
$ty = cleaner($_GET['ty']);
64-
}
65-
if (!empty($_GET['ds'])) {
66-
$ds = cleaner($_GET['ds']);
67-
}
36+
$kw = Request::getString('kw', '', 'get');
37+
$fn = Request::getString('fn', '', 'get');;
38+
$ty = Request::getString('ty', '', 'get');;
39+
$ds = Request::getString('ds', '', 'get');;
6840

6941
$q_kw = '%' . $wikiPage->escapeForDB($kw) . '%';
7042
$q_fn = '%' . $wikiPage->escapeForDB($fn) . '%';

Diff for: ‎admin/footer.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111

1212
//echo '<div align="right"><small>'._AM_FBCOM_ADMENU_TRADEMARK.'</small><br></div>';
1313
echo "<br><br><div align=\"center\"><a href=\"http://geekwright.com/\" target=\"_blank\"><img src=\"../assets/images/admin/gwlogo-small.png\" alt=\"geekwright\" title=\"geekwright\"></a></div>";
14-
echo "<div align=\"center\"><small><strong>GWiki</strong> is maintained by <a class='tooltip' rel='external' href='http://geekwright.com/'>geekwright, LLC</a></small></div>";
14+
echo "<div align=\"center\"><small><strong>gwiki</strong> is maintained by <a class='tooltip' rel='external' href='http://geekwright.com/'>geekwright, LLC</a></small></div>";
1515

1616
xoops_cp_footer();

Diff for: ‎admin/functions.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,6 @@ function adminTableEnd($links)
6262
}
6363

6464
$dir = basename(dirname(__DIR__));
65-
include_once XOOPS_ROOT_PATH . '/modules/' . $dir . '/class/gwikiPage.php';
65+
include_once XOOPS_ROOT_PATH . '/modules/' . $dir . '/class/GwikiPage.php';
6666
global $wikiPage;
6767
$wikiPage = new GwikiPage;

Diff for: ‎admin/header.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* @package gwiki
1010
*/
1111

12-
include dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
12+
include __DIR__ . '/../../../include/cp_header.php';
1313

1414
if (is_object($GLOBALS['xoops'])) {
1515
if (file_exists($GLOBALS['xoops']->path('Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))) {
@@ -31,4 +31,4 @@
3131

3232
xoops_cp_header();
3333

34-
$moduleAdmin = new ModuleAdmin();
34+
$moduleAdmin = \Xmf\Module\Admin::getInstance();

Diff for: ‎admin/help.php

-27
This file was deleted.

Diff for: ‎admin/helppages.sql

-44
This file was deleted.

Diff for: ‎admin/index.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*/
1111
include __DIR__ . '/header.php';
1212

13-
echo $moduleAdmin->addNavigation(basename(__FILE__));
13+
$moduleAdmin->displayNavigation(basename(__FILE__));
1414
$welcome = _AD_GW_ADMENU_WELCOME;
1515
$moduleAdmin->addInfoBox($welcome);
1616
$moduleAdmin->addInfoBoxLine($welcome, _AD_GW_ADMENU_MESSAGE, '', '', 'information');

0 commit comments

Comments
 (0)