joomla
/
weblinks
mirror of https://github.com/joomla-extensions/weblinks.git
30
1
Fork 0
Code Issues Releases Activity

Merge remote-tracking branch 'upstream/master' into phpcs

This commit is contained in:
Yves Hoppe 2016-07-30 19:32:37 +02:00
parent d353ec9833 afa26265d8
commit 778a84e568
48 changed files with 1259 additions and 612 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.github/CONTRIBUTING.md vendored
View File

@ -29,19 +29,12 @@ If you find any new bugs, or want to raise any type of support issue, please use
## Release Procedure ## Release Procedure
This is the procedure and checklist for creating a new package. This is the procedure and checklist for creating a new package:
* Update the version number in `build.ini`. * Update the version number in `jorobo.ini`
* Run `phing set-version`. * Modify `jorobo.ini`, add your GitHub token and add ` Release` after `Package`
* Pun `phing` to make the new package for the version. * Run `robo build` to make the new package and auto-upload and release it on GitHub.
* Run `phing tag`. * Go to the releases page on GitHub, review the Changelog and change the status from Pre-Release to Stable.
* Push the commits and tags up to Github.
* Go to the releases page on Github.
* Click on the new tag.
- Click the `Edit Tag` button.
- Fill in the title and description for the release.
- Attach the zip-file for the package to the release. Wait for the file to complete uploading!
- Click the `Publish Release` button.
* Create a new `<update>` tag in the `manifest.xml` file. * Create a new `<update>` tag in the `manifest.xml` file.
- Change the `<version>` tag to the new version. - Change the `<version>` tag to the new version.
- Change the `<downloadurl>` tag to match the URL of the new release. - Change the `<downloadurl>` tag to match the URL of the new release.

2
composer.json
View File

@ -15,7 +15,7 @@
"joomla-projects/joomla-browser": "v3.6.0", "joomla-projects/joomla-browser": "v3.6.0",
"codegyre/robo": "~0.5", "codegyre/robo": "~0.5",
"joomla-projects/robo": "dev-master", "joomla-projects/robo": "dev-master",
"joomla-projects/selenium-server-standalone": "v2.53.0.1", "joomla-projects/selenium-server-standalone": "v2.53.1",
"fzaninotto/faker": "^1.5", "fzaninotto/faker": "^1.5",
"joomla-projects/jorobo": "0.4", "joomla-projects/jorobo": "0.4",
"Behat/Gherkin": "^4.4.1" "Behat/Gherkin": "^4.4.1"

387
composer.lock generated
View File

@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"hash": "87c538127e912beb7f81120234148278", "hash": "50cba84cd1ef0c67853e0f620724ba96",
"content-hash": "9f0da75ef3fec4dd00045e1882077fb2", "content-hash": "0cc9ac9fe4280ae049d92e46bec772e5",
"packages": [], "packages": [],
"packages-dev": [ "packages-dev": [
{ {
@ -68,16 +68,16 @@
}, },
{ {
"name": "codeception/codeception", "name": "codeception/codeception",
"version": "2.2.1", "version": "2.2.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/Codeception/Codeception.git", "url": "https://github.com/Codeception/Codeception.git",
"reference": "f137636f0c185e7d4a495b9cea70c1afae27dfc7" "reference": "8d80bb4ec7470e8df5de0e4c401785bc3fa1f4f6"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/Codeception/Codeception/zipball/f137636f0c185e7d4a495b9cea70c1afae27dfc7", "url": "https://api.github.com/repos/Codeception/Codeception/zipball/8d80bb4ec7470e8df5de0e4c401785bc3fa1f4f6",
"reference": "f137636f0c185e7d4a495b9cea70c1afae27dfc7", "reference": "8d80bb4ec7470e8df5de0e4c401785bc3fa1f4f6",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -90,6 +90,8 @@
"php": ">=5.4.0 <8.0", "php": ">=5.4.0 <8.0",
"phpunit/php-code-coverage": ">=2.1.3", "phpunit/php-code-coverage": ">=2.1.3",
"phpunit/phpunit": ">4.8.20 <5.5", "phpunit/phpunit": ">4.8.20 <5.5",
"sebastian/comparator": "~1.1",
"sebastian/diff": "^1.4",
"symfony/browser-kit": ">=2.7 <4.0", "symfony/browser-kit": ">=2.7 <4.0",
"symfony/console": ">=2.7 <4.0", "symfony/console": ">=2.7 <4.0",
"symfony/css-selector": ">=2.7 <4.0", "symfony/css-selector": ">=2.7 <4.0",
@ -153,19 +155,19 @@
"functional testing", "functional testing",
"unit testing" "unit testing"
], ],
"time": "2016-06-03 12:44:06" "time": "2016-06-29 00:59:28"
}, },
{ {
"name": "codegyre/robo", "name": "codegyre/robo",
"version": "0.6.0", "version": "0.6.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/Codegyre/Robo.git", "url": "https://github.com/consolidation-org/Robo.git",
"reference": "d18185f0494c854d36aa5ee0ad931ee23bbef552" "reference": "d18185f0494c854d36aa5ee0ad931ee23bbef552"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/Codegyre/Robo/zipball/d18185f0494c854d36aa5ee0ad931ee23bbef552", "url": "https://api.github.com/repos/consolidation-org/Robo/zipball/d18185f0494c854d36aa5ee0ad931ee23bbef552",
"reference": "d18185f0494c854d36aa5ee0ad931ee23bbef552", "reference": "d18185f0494c854d36aa5ee0ad931ee23bbef552",
"shasum": "" "shasum": ""
}, },
@ -324,19 +326,20 @@
}, },
{ {
"name": "facebook/webdriver", "name": "facebook/webdriver",
"version": "1.1.1", "version": "1.1.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/facebook/php-webdriver.git", "url": "https://github.com/facebook/php-webdriver.git",
"reference": "1c98108ba3eb435b681655764de11502a0653705" "reference": "0b889d7de7461439f8a3bbcca46e0f696cb27986"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/facebook/php-webdriver/zipball/1c98108ba3eb435b681655764de11502a0653705", "url": "https://api.github.com/repos/facebook/php-webdriver/zipball/0b889d7de7461439f8a3bbcca46e0f696cb27986",
"reference": "1c98108ba3eb435b681655764de11502a0653705", "reference": "0b889d7de7461439f8a3bbcca46e0f696cb27986",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-curl": "*",
"php": ">=5.3.19" "php": ">=5.3.19"
}, },
"require-dev": { "require-dev": {
@ -363,7 +366,7 @@
"selenium", "selenium",
"webdriver" "webdriver"
], ],
"time": "2015-12-31 15:58:49" "time": "2016-06-04 00:02:34"
}, },
{ {
"name": "fzaninotto/faker", "name": "fzaninotto/faker",
@ -444,6 +447,7 @@
], ],
"description": "Composer installable Coding Standards Definition.", "description": "Composer installable Coding Standards Definition.",
"homepage": "https://github.com/GreenCape/coding-standards", "homepage": "https://github.com/GreenCape/coding-standards",
"abandoned": "greencape/coding-standards",
"time": "2015-07-03 12:01:28" "time": "2015-07-03 12:01:28"
}, },
{ {
@ -561,16 +565,16 @@
}, },
{ {
"name": "guzzlehttp/psr7", "name": "guzzlehttp/psr7",
"version": "1.3.0", "version": "1.3.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/psr7.git", "url": "https://github.com/guzzle/psr7.git",
"reference": "31382fef2889136415751badebbd1cb022a4ed72" "reference": "5c6447c9df362e8f8093bda8f5d8873fe5c7f65b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/31382fef2889136415751badebbd1cb022a4ed72", "url": "https://api.github.com/repos/guzzle/psr7/zipball/5c6447c9df362e8f8093bda8f5d8873fe5c7f65b",
"reference": "31382fef2889136415751badebbd1cb022a4ed72", "reference": "5c6447c9df362e8f8093bda8f5d8873fe5c7f65b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -586,7 +590,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.0-dev" "dev-master": "1.4-dev"
} }
}, },
"autoload": { "autoload": {
@ -615,7 +619,7 @@
"stream", "stream",
"uri" "uri"
], ],
"time": "2016-04-13 19:56:01" "time": "2016-06-24 23:00:38"
}, },
{ {
"name": "henrikbjorn/lurker", "name": "henrikbjorn/lurker",
@ -1469,16 +1473,16 @@
}, },
{ {
"name": "joomla-projects/selenium-server-standalone", "name": "joomla-projects/selenium-server-standalone",
"version": "v2.53.0.1", "version": "v2.53.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/joomla-projects/selenium-server-standalone.git", "url": "https://github.com/joomla-projects/selenium-server-standalone.git",
"reference": "4c9428e1450de6a9fa956f3bd726351a9b281b53" "reference": "24bc596a89fe0f6e524c72a7950c09a4927a4020"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/joomla-projects/selenium-server-standalone/zipball/4c9428e1450de6a9fa956f3bd726351a9b281b53", "url": "https://api.github.com/repos/joomla-projects/selenium-server-standalone/zipball/24bc596a89fe0f6e524c72a7950c09a4927a4020",
"reference": "4c9428e1450de6a9fa956f3bd726351a9b281b53", "reference": "24bc596a89fe0f6e524c72a7950c09a4927a4020",
"shasum": "" "shasum": ""
}, },
"bin": [ "bin": [
@ -1501,7 +1505,7 @@
"selenium", "selenium",
"testing" "testing"
], ],
"time": "2016-05-30 15:21:57" "time": "2016-07-04 17:23:12"
}, },
{ {
"name": "joomla/compat", "name": "joomla/compat",
@ -1920,38 +1924,87 @@
"time": "2016-03-10 15:15:04" "time": "2016-03-10 15:15:04"
}, },
{ {
"name": "phpdocumentor/reflection-docblock", "name": "phpdocumentor/reflection-common",
"version": "2.0.4", "version": "1.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
"reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8" "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d68dbdc53dc358a816f00b300704702b2eaff7b8", "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
"reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8", "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.3" "php": ">=5.5"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "~4.0" "phpunit/phpunit": "^4.6"
},
"suggest": {
"dflydev/markdown": "~1.0",
"erusev/parsedown": "~1.0"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.0.x-dev" "dev-master": "1.0.x-dev"
} }
}, },
"autoload": { "autoload": {
"psr-0": { "psr-4": {
"phpDocumentor": [ "phpDocumentor\\Reflection\\": [
"src"
]
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Jaap van Otterdijk",
"email": "opensource@ijaap.nl"
}
],
"description": "Common reflection classes used by phpdocumentor to reflect the code structure",
"homepage": "http://www.phpdoc.org",
"keywords": [
"FQSEN",
"phpDocumentor",
"phpdoc",
"reflection",
"static analysis"
],
"time": "2015-12-27 11:43:31"
},
{
"name": "phpdocumentor/reflection-docblock",
"version": "3.1.0",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
"reference": "9270140b940ff02e58ec577c237274e92cd40cdd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9270140b940ff02e58ec577c237274e92cd40cdd",
"reference": "9270140b940ff02e58ec577c237274e92cd40cdd",
"shasum": ""
},
"require": {
"php": ">=5.5",
"phpdocumentor/reflection-common": "^1.0@dev",
"phpdocumentor/type-resolver": "^0.2.0",
"webmozart/assert": "^1.0"
},
"require-dev": {
"mockery/mockery": "^0.9.4",
"phpunit/phpunit": "^4.4"
},
"type": "library",
"autoload": {
"psr-4": {
"phpDocumentor\\Reflection\\": [
"src/" "src/"
] ]
} }
@ -1963,10 +2016,58 @@
"authors": [ "authors": [
{ {
"name": "Mike van Riel", "name": "Mike van Riel",
"email": "mike.vanriel@naenius.com" "email": "me@mikevanriel.com"
} }
], ],
"time": "2015-02-03 12:10:50" "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
"time": "2016-06-10 09:48:41"
},
{
"name": "phpdocumentor/type-resolver",
"version": "0.2",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/TypeResolver.git",
"reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/b39c7a5b194f9ed7bd0dd345c751007a41862443",
"reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443",
"shasum": ""
},
"require": {
"php": ">=5.5",
"phpdocumentor/reflection-common": "^1.0"
},
"require-dev": {
"mockery/mockery": "^0.9.4",
"phpunit/phpunit": "^5.2||^4.8.24"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
}
},
"autoload": {
"psr-4": {
"phpDocumentor\\Reflection\\": [
"src/"
]
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Mike van Riel",
"email": "me@mikevanriel.com"
}
],
"time": "2016-06-10 07:14:17"
}, },
{ {
"name": "phploc/phploc", "name": "phploc/phploc",
@ -2152,32 +2253,32 @@
}, },
{ {
"name": "phpspec/prophecy", "name": "phpspec/prophecy",
"version": "v1.6.0", "version": "v1.6.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpspec/prophecy.git", "url": "https://github.com/phpspec/prophecy.git",
"reference": "3c91bdf81797d725b14cb62906f9a4ce44235972" "reference": "58a8137754bc24b25740d4281399a4a3596058e0"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/3c91bdf81797d725b14cb62906f9a4ce44235972", "url": "https://api.github.com/repos/phpspec/prophecy/zipball/58a8137754bc24b25740d4281399a4a3596058e0",
"reference": "3c91bdf81797d725b14cb62906f9a4ce44235972", "reference": "58a8137754bc24b25740d4281399a4a3596058e0",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"doctrine/instantiator": "^1.0.2", "doctrine/instantiator": "^1.0.2",
"php": "^5.3|^7.0", "php": "^5.3|^7.0",
"phpdocumentor/reflection-docblock": "~2.0", "phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
"sebastian/comparator": "~1.1", "sebastian/comparator": "^1.1",
"sebastian/recursion-context": "~1.0" "sebastian/recursion-context": "^1.0"
}, },
"require-dev": { "require-dev": {
"phpspec/phpspec": "~2.0" "phpspec/phpspec": "^2.0"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.5.x-dev" "dev-master": "1.6.x-dev"
} }
}, },
"autoload": { "autoload": {
@ -2210,7 +2311,7 @@
"spy", "spy",
"stub" "stub"
], ],
"time": "2016-02-15 07:46:21" "time": "2016-06-07 08:13:47"
}, },
{ {
"name": "phpunit/php-code-coverage", "name": "phpunit/php-code-coverage",
@ -2800,16 +2901,16 @@
}, },
{ {
"name": "sebastian/exporter", "name": "sebastian/exporter",
"version": "1.2.1", "version": "1.2.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/exporter.git", "url": "https://github.com/sebastianbergmann/exporter.git",
"reference": "7ae5513327cb536431847bcc0c10edba2701064e" "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/7ae5513327cb536431847bcc0c10edba2701064e", "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/42c4c2eec485ee3e159ec9884f95b431287edde4",
"reference": "7ae5513327cb536431847bcc0c10edba2701064e", "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2817,12 +2918,13 @@
"sebastian/recursion-context": "~1.0" "sebastian/recursion-context": "~1.0"
}, },
"require-dev": { "require-dev": {
"ext-mbstring": "*",
"phpunit/phpunit": "~4.4" "phpunit/phpunit": "~4.4"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.2.x-dev" "dev-master": "1.3.x-dev"
} }
}, },
"autoload": { "autoload": {
@ -2862,7 +2964,7 @@
"export", "export",
"exporter" "exporter"
], ],
"time": "2015-06-21 07:55:53" "time": "2016-06-17 09:04:28"
}, },
{ {
"name": "sebastian/finder-facade", "name": "sebastian/finder-facade",
@ -2905,16 +3007,16 @@
}, },
{ {
"name": "sebastian/git", "name": "sebastian/git",
"version": "2.1.2", "version": "2.1.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/git.git", "url": "https://github.com/sebastianbergmann/git.git",
"reference": "607dcc6003502acdd0e6199b60ba954ce00f3004" "reference": "5100bc50cd9e70f424c643618e142214225024f3"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/git/zipball/607dcc6003502acdd0e6199b60ba954ce00f3004", "url": "https://api.github.com/repos/sebastianbergmann/git/zipball/5100bc50cd9e70f424c643618e142214225024f3",
"reference": "607dcc6003502acdd0e6199b60ba954ce00f3004", "reference": "5100bc50cd9e70f424c643618e142214225024f3",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2946,7 +3048,7 @@
"keywords": [ "keywords": [
"git" "git"
], ],
"time": "2016-03-12 23:31:06" "time": "2016-06-15 09:30:19"
}, },
{ {
"name": "sebastian/global-state", "name": "sebastian/global-state",
@ -3215,16 +3317,16 @@
}, },
{ {
"name": "symfony/browser-kit", "name": "symfony/browser-kit",
"version": "v3.1.0", "version": "v3.1.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/browser-kit.git", "url": "https://github.com/symfony/browser-kit.git",
"reference": "b645a9b23d6c0eeba5ac823fa87bf010db9aff22" "reference": "dcf41ed026b0499254385b5c88f03247b2ba010b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/browser-kit/zipball/b645a9b23d6c0eeba5ac823fa87bf010db9aff22", "url": "https://api.github.com/repos/symfony/browser-kit/zipball/dcf41ed026b0499254385b5c88f03247b2ba010b",
"reference": "b645a9b23d6c0eeba5ac823fa87bf010db9aff22", "reference": "dcf41ed026b0499254385b5c88f03247b2ba010b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3268,20 +3370,20 @@
], ],
"description": "Symfony BrowserKit Component", "description": "Symfony BrowserKit Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2016-03-04 07:56:56" "time": "2016-06-29 05:41:56"
}, },
{ {
"name": "symfony/config", "name": "symfony/config",
"version": "v2.8.6", "version": "v2.8.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/config.git", "url": "https://github.com/symfony/config.git",
"reference": "edbbcf33cffa2a85104fc80de8dc052cc51596bb" "reference": "0926e69411eba491803dbafb9f1f233e2ced58d0"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/config/zipball/edbbcf33cffa2a85104fc80de8dc052cc51596bb", "url": "https://api.github.com/repos/symfony/config/zipball/0926e69411eba491803dbafb9f1f233e2ced58d0",
"reference": "edbbcf33cffa2a85104fc80de8dc052cc51596bb", "reference": "0926e69411eba491803dbafb9f1f233e2ced58d0",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3321,20 +3423,20 @@
], ],
"description": "Symfony Config Component", "description": "Symfony Config Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2016-04-20 18:52:26" "time": "2016-06-29 05:31:50"
}, },
{ {
"name": "symfony/console", "name": "symfony/console",
"version": "v2.8.6", "version": "v2.8.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/console.git", "url": "https://github.com/symfony/console.git",
"reference": "48221d3de4dc22d2cd57c97e8b9361821da86609" "reference": "c392a6ec72f2122748032c2ad6870420561ffcfa"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/48221d3de4dc22d2cd57c97e8b9361821da86609", "url": "https://api.github.com/repos/symfony/console/zipball/c392a6ec72f2122748032c2ad6870420561ffcfa",
"reference": "48221d3de4dc22d2cd57c97e8b9361821da86609", "reference": "c392a6ec72f2122748032c2ad6870420561ffcfa",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3381,20 +3483,20 @@
], ],
"description": "Symfony Console Component", "description": "Symfony Console Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2016-04-26 12:00:47" "time": "2016-06-29 07:02:14"
}, },
{ {
"name": "symfony/css-selector", "name": "symfony/css-selector",
"version": "v3.1.0", "version": "v3.1.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/css-selector.git", "url": "https://github.com/symfony/css-selector.git",
"reference": "e17f386efef7258ac671c24e727673abd086b0cf" "reference": "2851e1932d77ce727776154d659b232d061e816a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/css-selector/zipball/e17f386efef7258ac671c24e727673abd086b0cf", "url": "https://api.github.com/repos/symfony/css-selector/zipball/2851e1932d77ce727776154d659b232d061e816a",
"reference": "e17f386efef7258ac671c24e727673abd086b0cf", "reference": "2851e1932d77ce727776154d659b232d061e816a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3434,20 +3536,20 @@
], ],
"description": "Symfony CssSelector Component", "description": "Symfony CssSelector Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2016-03-04 07:56:56" "time": "2016-06-29 05:41:56"
}, },
{ {
"name": "symfony/dependency-injection", "name": "symfony/dependency-injection",
"version": "v2.8.6", "version": "v2.8.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/dependency-injection.git", "url": "https://github.com/symfony/dependency-injection.git",
"reference": "bd04588c087651ceffdc45d40dc4de05af9c7c52" "reference": "2dd85de8216079d1360b2b14988cd5cdbbb49063"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/dependency-injection/zipball/bd04588c087651ceffdc45d40dc4de05af9c7c52", "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/2dd85de8216079d1360b2b14988cd5cdbbb49063",
"reference": "bd04588c087651ceffdc45d40dc4de05af9c7c52", "reference": "2dd85de8216079d1360b2b14988cd5cdbbb49063",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3497,20 +3599,20 @@
], ],
"description": "Symfony DependencyInjection Component", "description": "Symfony DependencyInjection Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2016-05-09 18:12:35" "time": "2016-06-29 05:31:50"
}, },
{ {
"name": "symfony/dom-crawler", "name": "symfony/dom-crawler",
"version": "v3.1.0", "version": "v3.1.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/dom-crawler.git", "url": "https://github.com/symfony/dom-crawler.git",
"reference": "12aa63fd41b060d2bee9a34623d29eda70bc8fe3" "reference": "99ec4a23330fcd0c8667095f3ef7aa204ffd9dc0"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/dom-crawler/zipball/12aa63fd41b060d2bee9a34623d29eda70bc8fe3", "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/99ec4a23330fcd0c8667095f3ef7aa204ffd9dc0",
"reference": "12aa63fd41b060d2bee9a34623d29eda70bc8fe3", "reference": "99ec4a23330fcd0c8667095f3ef7aa204ffd9dc0",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3553,20 +3655,20 @@
], ],
"description": "Symfony DomCrawler Component", "description": "Symfony DomCrawler Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2016-05-13 15:49:09" "time": "2016-06-29 05:41:56"
}, },
{ {
"name": "symfony/event-dispatcher", "name": "symfony/event-dispatcher",
"version": "v2.8.6", "version": "v2.8.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/event-dispatcher.git", "url": "https://github.com/symfony/event-dispatcher.git",
"reference": "a158f13992a3147d466af7a23b564ac719a4ddd8" "reference": "b180b70439dca70049b6b9b7e21d75e6e5d7aca9"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a158f13992a3147d466af7a23b564ac719a4ddd8", "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b180b70439dca70049b6b9b7e21d75e6e5d7aca9",
"reference": "a158f13992a3147d466af7a23b564ac719a4ddd8", "reference": "b180b70439dca70049b6b9b7e21d75e6e5d7aca9",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3613,20 +3715,20 @@
], ],
"description": "Symfony EventDispatcher Component", "description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2016-05-03 18:59:18" "time": "2016-06-29 05:29:29"
}, },
{ {
"name": "symfony/filesystem", "name": "symfony/filesystem",
"version": "v2.8.6", "version": "v2.8.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/filesystem.git", "url": "https://github.com/symfony/filesystem.git",
"reference": "dee379131dceed90a429e951546b33edfe7dccbb" "reference": "7258ddd6f987053f21fa43d03430580ba54e6096"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/dee379131dceed90a429e951546b33edfe7dccbb", "url": "https://api.github.com/repos/symfony/filesystem/zipball/7258ddd6f987053f21fa43d03430580ba54e6096",
"reference": "dee379131dceed90a429e951546b33edfe7dccbb", "reference": "7258ddd6f987053f21fa43d03430580ba54e6096",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3662,20 +3764,20 @@
], ],
"description": "Symfony Filesystem Component", "description": "Symfony Filesystem Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2016-04-12 18:01:21" "time": "2016-06-29 05:31:50"
}, },
{ {
"name": "symfony/finder", "name": "symfony/finder",
"version": "v2.8.6", "version": "v2.8.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/finder.git", "url": "https://github.com/symfony/finder.git",
"reference": "ca24cf2cd4e3826f571e0067e535758e73807aa1" "reference": "bf0506ef4e7778fd3f0f1f141ab5e8c1ef35dd7d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/ca24cf2cd4e3826f571e0067e535758e73807aa1", "url": "https://api.github.com/repos/symfony/finder/zipball/bf0506ef4e7778fd3f0f1f141ab5e8c1ef35dd7d",
"reference": "ca24cf2cd4e3826f571e0067e535758e73807aa1", "reference": "bf0506ef4e7778fd3f0f1f141ab5e8c1ef35dd7d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3711,7 +3813,7 @@
], ],
"description": "Symfony Finder Component", "description": "Symfony Finder Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2016-03-10 10:53:53" "time": "2016-06-29 05:29:29"
}, },
{ {
"name": "symfony/polyfill-mbstring", "name": "symfony/polyfill-mbstring",
@ -3830,16 +3932,16 @@
}, },
{ {
"name": "symfony/process", "name": "symfony/process",
"version": "v2.8.6", "version": "v2.8.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/process.git", "url": "https://github.com/symfony/process.git",
"reference": "1276bd9be89be039748cf753a2137f4ef149cd74" "reference": "89f33c16796415ccfd8bb3cf8d520cbb79899bfe"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/1276bd9be89be039748cf753a2137f4ef149cd74", "url": "https://api.github.com/repos/symfony/process/zipball/89f33c16796415ccfd8bb3cf8d520cbb79899bfe",
"reference": "1276bd9be89be039748cf753a2137f4ef149cd74", "reference": "89f33c16796415ccfd8bb3cf8d520cbb79899bfe",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3875,20 +3977,20 @@
], ],
"description": "Symfony Process Component", "description": "Symfony Process Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2016-04-14 15:22:22" "time": "2016-06-29 05:29:29"
}, },
{ {
"name": "symfony/yaml", "name": "symfony/yaml",
"version": "v3.1.0", "version": "v3.1.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/yaml.git", "url": "https://github.com/symfony/yaml.git",
"reference": "eca51b7b65eb9be6af88ad7cc91685f1556f5c9a" "reference": "2884c26ce4c1d61aebf423a8b912950fe7c764de"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/eca51b7b65eb9be6af88ad7cc91685f1556f5c9a", "url": "https://api.github.com/repos/symfony/yaml/zipball/2884c26ce4c1d61aebf423a8b912950fe7c764de",
"reference": "eca51b7b65eb9be6af88ad7cc91685f1556f5c9a", "reference": "2884c26ce4c1d61aebf423a8b912950fe7c764de",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3924,7 +4026,7 @@
], ],
"description": "Symfony Yaml Component", "description": "Symfony Yaml Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2016-05-26 21:46:24" "time": "2016-06-29 05:41:56"
}, },
{ {
"name": "theseer/fdomdocument", "name": "theseer/fdomdocument",
@ -4026,6 +4128,55 @@
"templating" "templating"
], ],
"time": "2016-05-30 09:11:59" "time": "2016-05-30 09:11:59"
},
{
"name": "webmozart/assert",
"version": "1.0.2",
"source": {
"type": "git",
"url": "https://github.com/webmozart/assert.git",
"reference": "30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/webmozart/assert/zipball/30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde",
"reference": "30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
"phpunit/phpunit": "^4.6"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
}
},
"autoload": {
"psr-4": {
"Webmozart\\Assert\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Bernhard Schussek",
"email": "bschussek@gmail.com"
}
],
"description": "Assertions to validate method input/output with nice error messages.",
"keywords": [
"assert",
"check",
"validate"
],
"time": "2015-08-24 13:29:44"
} }
], ],
"aliases": [], "aliases": [],

33
jorobo.dist.ini
View File

@ -2,3 +2,36 @@ extension = weblinks
version = 3.5.0 version = 3.5.0
source = src source = src
target = package target = package
; Create a pre-release of the extension on GitHub
; Add your personal GitHub access tocken
; and add Release to the target (separated by space) above
[github]
remote = origin
branch = develop
token =
owner = joomla-extensions
repository = weblinks
changelog_source = commits
; Automatic upload of the built extension package to an FTP server
[ftp]
host =
port = 21
user =
password =
ssl = false
target = /
; Adds / replaces copyright headers at the beginning of files in the source folder
[header]
files = php,js
exclude =
text = "
/**
* @package Weblinks
*
* @copyright Copyright (C) 2005 - ##YEAR## Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
"

2
manifest.xml
View File

@ -11,6 +11,6 @@
<downloads> <downloads>
<downloadurl type="full" format="zip">https://github.com/joomla-extensions/weblinks/releases/download/3.5.0/pkg-weblinks-3.5.0.zip</downloadurl> <downloadurl type="full" format="zip">https://github.com/joomla-extensions/weblinks/releases/download/3.5.0/pkg-weblinks-3.5.0.zip</downloadurl>
</downloads> </downloads>
<targetplatform name="joomla" version="3.[456789]" /> <targetplatform name="joomla" version="3.[56789]" />
</update> </update>
</updates> </updates>

13
src/administrator/components/com_weblinks/config.xml
View File

@ -5,6 +5,19 @@
description="COM_WEBLINKS_COMPONENT_DESC" description="COM_WEBLINKS_COMPONENT_DESC"
> >
<field
name="captcha"
type="plugins"
label="COM_WEBLINKS_FIELD_CAPTCHA_LABEL"
description="COM_WEBLINKS_FIELD_CAPTCHA_DESC"
default=""
folder="captcha"
filter="cmd"
>
<option value="">JOPTION_USE_DEFAULT</option>
<option value="0">JOPTION_DO_NOT_USE</option>
</field>
<field name="target" type="list" <field name="target" type="list"
default="0" default="0"
description="COM_WEBLINKS_FIELD_TARGET_DESC" description="COM_WEBLINKS_FIELD_TARGET_DESC"

3
src/administrator/components/com_weblinks/controller.php
View File

@ -20,7 +20,8 @@ class WeblinksController extends JControllerLegacy
* Method to display a view. * Method to display a view.
* *
* @param boolean $cacheable If true, the view output will be cached * @param boolean $cacheable If true, the view output will be cached
* @param array $urlparams An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}. * @param array $urlparams An array of safe url parameters and their variable types,
* for valid values see {@link JFilterInput::clean()}.
* *
* @return JControllerLegacy This object to support chaining. * @return JControllerLegacy This object to support chaining.
* *

53
src/administrator/components/com_weblinks/helpers/weblinks.php
View File

@ -39,4 +39,57 @@ class WeblinksHelper extends JHelperContent
$vName == 'categories' $vName == 'categories'
); );
} }
/**
* Adds Count Items for WebLinks Category Manager.
*
* @param stdClass[] &$items The weblinks category objects.
*
* @return stdClass[] The weblinks category objects.
*
* @since 3.6.0
*/
public static function countItems(&$items)
{
$db = JFactory::getDbo();
foreach ($items as $item)
{
$item->count_trashed = 0;
$item->count_archived = 0;
$item->count_unpublished = 0;
$item->count_published = 0;
$query = $db->getQuery(true)
->select('state, COUNT(*) AS count')
->from($db->qn('#__weblinks'))
->where($db->qn('catid') . ' = ' . (int) $item->id)
->group('state');
$db->setQuery($query);
$weblinks = $db->loadObjectList();
foreach ($weblinks as $weblink)
{
if ($weblink->state == 1)
{
$item->count_published = $weblink->count;
}
elseif ($weblink->state == 0)
{
$item->count_unpublished = $weblink->count;
}
elseif ($weblink->state == 2)
{
$item->count_archived = $weblink->count;
}
elseif ($weblink->state == -2)
{
$item->count_trashed = $weblink->count;
}
}
}
return $items;
}
} }

106
src/administrator/components/com_weblinks/models/forms/filter_weblinks.xml Normal file
View File

@ -0,0 +1,106 @@
<?xml version="1.0" encoding="utf-8"?>
<form>
<fields name="filter">
<field
name="search"
type="text"
label="COM_WEBLINKS_FILTER_SEARCH_LABEL"
description="COM_WEBLINKS_FILTER_SEARCH_DESC"
hint="JSEARCH_FILTER"
/>
<field
name="published"
type="status"
label="JOPTION_FILTER_PUBLISHED"
description="JOPTION_FILTER_PUBLISHED_DESC"
onchange="this.form.submit();"
>
<option value="">JOPTION_SELECT_PUBLISHED</option>
</field>
<field
name="category_id"
type="category"
label="JOPTION_FILTER_CATEGORY"
description="JOPTION_FILTER_CATEGORY_DESC"
extension="com_weblinks"
onchange="this.form.submit();"
>
<option value="">JOPTION_SELECT_CATEGORY</option>
</field>
<field
name="access"
type="accesslevel"
label="JOPTION_FILTER_ACCESS"
description="JOPTION_FILTER_ACCESS_DESC"
onchange="this.form.submit();"
>
<option value="">JOPTION_SELECT_ACCESS</option>
</field>
<field
name="language"
type="contentlanguage"
label="JOPTION_FILTER_LANGUAGE"
description="JOPTION_FILTER_LANGUAGE_DESC"
onchange="this.form.submit();"
>
<option value="">JOPTION_SELECT_LANGUAGE</option>
<option value="*">JALL</option>
</field>
<field
name="tag"
type="tag"
label="JOPTION_FILTER_TAG"
description="JOPTION_FILTER_TAG_DESC"
mode="nested"
onchange="this.form.submit();"
>
<option value="">JOPTION_SELECT_TAG</option>
</field>
<field
name="level"
type="integer"
label="JOPTION_FILTER_LEVEL"
description="JOPTION_FILTER_LEVEL_DESC"
first="1"
last="10"
step="1"
languages="*"
onchange="this.form.submit();"
>
<option value="">JOPTION_SELECT_MAX_LEVELS</option>
</field>
</fields>
<fields name="list">
<field
name="fullordering"
type="list"
onchange="this.form.submit();"
default="a.title ASC"
>
<option value="">JGLOBAL_SORT_BY</option>
<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
<option value="a.state ASC">JSTATUS_ASC</option>
<option value="a.state DESC">JSTATUS_DESC</option>
<option value="a.title ASC">JGLOBAL_TITLE_ASC</option>
<option value="a.title DESC">JGLOBAL_TITLE_DESC</option>
<option value="category_title ASC">JCATEGORY_ASC</option>
<option value="category_title DESC">JCATEGORY_DESC</option>
<option value="access_level ASC">JGRID_HEADING_ACCESS_ASC</option>
<option value="access_level DESC">JGRID_HEADING_ACCESS_DESC</option>
<option value="a.hits ASC">JGLOBAL_HITS_ASC</option>
<option value="a.hits DESC">JGLOBAL_HITS_DESC</option>
<option value="language_title ASC">JGRID_HEADING_LANGUAGE_ASC</option>
<option value="language_title DESC">JGRID_HEADING_LANGUAGE_DESC</option>
<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
</field>
<field
name="limit"
type="limitbox"
class="input-mini"
default="25"
onchange="this.form.submit();"
/>
</fields>
</form>

93
src/administrator/components/com_weblinks/models/weblinks.php
View File

@ -19,7 +19,7 @@ class WeblinksModelWeblinks extends JModelList
/** /**
* Constructor. * Constructor.
* *
* @param array An optional associative array of configuration settings. * @param array $config An optional associative array of configuration settings.
* *
* @see JControllerLegacy * @see JControllerLegacy
* @since 1.6 * @since 1.6
@ -34,18 +34,23 @@ class WeblinksModelWeblinks extends JModelList
'alias', 'a.alias', 'alias', 'a.alias',
'checked_out', 'a.checked_out', 'checked_out', 'a.checked_out',
'checked_out_time', 'a.checked_out_time', 'checked_out_time', 'a.checked_out_time',
'catid', 'a.catid', 'category_title', 'catid', 'a.catid', 'category_id',
'state', 'a.state', 'c.title', 'category_title',
'access', 'a.access', 'access_level', 'state', 'a.state', 'published',
'access', 'a.access',
'ag.title', 'access_level',
'created', 'a.created', 'created', 'a.created',
'created_by', 'a.created_by', 'created_by', 'a.created_by',
'ordering', 'a.ordering', 'ordering', 'a.ordering',
'featured', 'a.featured', 'featured', 'a.featured',
'language', 'a.language', 'language', 'a.language',
'l.title', 'language_title',
'hits', 'a.hits', 'hits', 'a.hits',
'publish_up', 'a.publish_up', 'publish_up', 'a.publish_up',
'publish_down', 'a.publish_down', 'publish_down', 'a.publish_down',
'url', 'a.url', 'url', 'a.url',
'tag',
'level', 'c.level',
); );
} }
@ -55,38 +60,31 @@ class WeblinksModelWeblinks extends JModelList
/** /**
* Method to auto-populate the model state. * Method to auto-populate the model state.
* *
* @param string $ordering An optional ordering field.
* @param string $direction An optional direction (asc|desc).
*
* @return void * @return void
* *
* @note Calling getState in this method will result in recursion. * @note Calling getState in this method will result in recursion.
* @since 1.6 * @since 1.6
*/ */
protected function populateState($ordering = null, $direction = null) protected function populateState($ordering = 'a.title', $direction = 'asc')
{ {
// Load the filter state. // Load the filter state.
$search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search'); $this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '', 'string'));
$this->setState('filter.search', $search); $this->setState('filter.access', $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', '', 'cmd'));
$this->setState('filter.published', $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '', 'string'));
$accessId = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', null, 'int'); $this->setState('filter.category_id', $this->getUserStateFromRequest($this->context . '.filter.category_id', 'filter_category_id', '', 'cmd'));
$this->setState('filter.access', $accessId); $this->setState('filter.language', $this->getUserStateFromRequest($this->context . '.filter.language', 'filter_language', '', 'string'));
$this->setState('filter.tag', $this->getUserStateFromRequest($this->context . '.filter.tag', 'filter_tag', '', 'string'));
$published = $this->getUserStateFromRequest($this->context . '.filter.state', 'filter_state', '', 'string'); $this->setState('filter.level', $this->getUserStateFromRequest($this->context . '.filter.level', 'filter_level', '', 'cmd'));
$this->setState('filter.state', $published);
$categoryId = $this->getUserStateFromRequest($this->context . '.filter.category_id', 'filter_category_id', '');
$this->setState('filter.category_id', $categoryId);
$language = $this->getUserStateFromRequest($this->context . '.filter.language', 'filter_language', '');
$this->setState('filter.language', $language);
$tag = $this->getUserStateFromRequest($this->context . '.filter.tag', 'filter_tag', '');
$this->setState('filter.tag', $tag);
// Load the parameters. // Load the parameters.
$params = JComponentHelper::getParams('com_weblinks'); $params = JComponentHelper::getParams('com_weblinks');
$this->setState('params', $params); $this->setState('params', $params);
// List state information. // List state information.
parent::populateState('a.title', 'asc'); parent::populateState($ordering, $direction);
} }
/** /**
@ -107,9 +105,11 @@ class WeblinksModelWeblinks extends JModelList
// Compile the store id. // Compile the store id.
$id .= ':' . $this->getState('filter.search'); $id .= ':' . $this->getState('filter.search');
$id .= ':' . $this->getState('filter.access'); $id .= ':' . $this->getState('filter.access');
$id .= ':' . $this->getState('filter.state'); $id .= ':' . $this->getState('filter.published');
$id .= ':' . $this->getState('filter.category_id'); $id .= ':' . $this->getState('filter.category_id');
$id .= ':' . $this->getState('filter.language'); $id .= ':' . $this->getState('filter.language');
$id .= ':' . $this->getState('filter.tag');
$id .= ':' . $this->getState('filter.level');
return parent::getStoreId($id); return parent::getStoreId($id);
} }
@ -136,47 +136,48 @@ class WeblinksModelWeblinks extends JModelList
'a.hits, a.state, a.access, a.ordering, a.language, a.publish_up, a.publish_down' 'a.hits, a.state, a.access, a.ordering, a.language, a.publish_up, a.publish_down'
) )
); );
$query->from($db->quoteName('#__weblinks') . ' AS a'); $query->from($db->quoteName('#__weblinks', 'a'));
// Join over the language // Join over the language
$query->select('l.title AS language_title, l.image AS language_image') $query->select($db->quoteName('l.title', 'language_title'))
->join('LEFT', $db->quoteName('#__languages') . ' AS l ON l.lang_code = a.language'); ->select($db->quoteName('l.image', 'language_image'))
->join('LEFT', $db->quoteName('#__languages', 'l') . ' ON ' . $db->qn('l.lang_code') . ' = ' . $db->qn('a.language'));
// Join over the users for the checked out user. // Join over the users for the checked out user.
$query->select('uc.name AS editor') $query->select($db->quoteName('uc.name', 'editor'))
->join('LEFT', '#__users AS uc ON uc.id=a.checked_out'); ->join('LEFT', $db->quoteName('#__users', 'uc') . ' ON ' . $db->qn('uc.id') . ' = ' . $db->qn('a.checked_out'));
// Join over the asset groups. // Join over the asset groups.
$query->select('ag.title AS access_level') $query->select($db->quoteName('ag.title', 'access_level'))
->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access'); ->join('LEFT', $db->quoteName('#__viewlevels', 'ag') . ' ON ' . $db->qn('ag.id') . ' = ' . $db->qn('a.access'));
// Join over the categories. // Join over the categories.
$query->select('c.title AS category_title') $query->select('c.title AS category_title')
->join('LEFT', '#__categories AS c ON c.id = a.catid'); ->join('LEFT', $db->quoteName('#__categories', 'c') . ' ON ' . $db->qn('c.id') . ' = ' . $db->qn('a.catid'));
// Filter by access level. // Filter by access level.
if ($access = $this->getState('filter.access')) if ($access = $this->getState('filter.access'))
{ {
$query->where('a.access = ' . (int) $access); $query->where($db->quoteName('a.access') . ' = ' . (int) $access);
} }
// Implement View Level Access // Implement View Level Access
if (!$user->authorise('core.admin')) if (!$user->authorise('core.admin'))
{ {
$groups = implode(',', $user->getAuthorisedViewLevels()); $groups = implode(',', $user->getAuthorisedViewLevels());
$query->where('a.access IN (' . $groups . ')'); $query->where($db->quoteName('a.access') . ' IN (' . $groups . ')');
} }
// Filter by published state // Filter by published state
$published = $this->getState('filter.state'); $published = $this->getState('filter.published');
if (is_numeric($published)) if (is_numeric($published))
{ {
$query->where('a.state = ' . (int) $published); $query->where($db->quoteName('a.state') . ' = ' . (int) $published);
} }
elseif ($published === '') elseif ($published === '')
{ {
$query->where('(a.state IN (0, 1))'); $query->where('(' . $db->quoteName('a.state') . ' IN (0, 1))');
} }
// Filter by category. // Filter by category.
@ -184,7 +185,13 @@ class WeblinksModelWeblinks extends JModelList
if (is_numeric($categoryId)) if (is_numeric($categoryId))
{ {
$query->where('a.catid = ' . (int) $categoryId); $query->where($db->quoteName('a.catid') . ' = ' . (int) $categoryId);
}
// Filter on the level.
if ($level = $this->getState('filter.level'))
{
$query->where($db->quoteName('c.level') . ' <= ' . (int) $level);
} }
// Filter by search in title // Filter by search in title
@ -194,19 +201,19 @@ class WeblinksModelWeblinks extends JModelList
{ {
if (stripos($search, 'id:') === 0) if (stripos($search, 'id:') === 0)
{ {
$query->where('a.id = ' . (int) substr($search, 3)); $query->where($db->quoteName('a.id') . ' = ' . (int) substr($search, 3));
} }
else else
{ {
$search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%')); $search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%'));
$query->where('(a.title LIKE ' . $search . ' OR a.alias LIKE ' . $search . ')'); $query->where('(' . $db->quoteName('a.title') . ' LIKE ' . $search . ' OR ' . $db->quoteName('a.alias') . ' LIKE ' . $search . ')');
} }
} }
// Filter on the language. // Filter on the language.
if ($language = $this->getState('filter.language')) if ($language = $this->getState('filter.language'))
{ {
$query->where('a.language = ' . $db->quote($language)); $query->where($db->quoteName('a.language') . ' = ' . $db->quote($language));
} }
$tagId = $this->getState('filter.tag'); $tagId = $this->getState('filter.tag');
@ -223,8 +230,8 @@ class WeblinksModelWeblinks extends JModelList
} }
// Add the list ordering clause. // Add the list ordering clause.
$orderCol = $this->state->get('list.ordering'); $orderCol = $this->state->get('list.ordering', 'a.title');
$orderDirn = $this->state->get('list.direction'); $orderDirn = $this->state->get('list.direction', 'ASC');
if ($orderCol == 'a.ordering' || $orderCol == 'category_title') if ($orderCol == 'a.ordering' || $orderCol == 'category_title')
{ {

45
src/administrator/components/com_weblinks/script.php
View File

@ -151,11 +151,26 @@ class Com_WeblinksInstallerScript
$query->values( $query->values(
$db->quote('Weblink') . ', ' $db->quote('Weblink') . ', '
. $db->quote('com_weblinks.weblink') . ', ' . $db->quote('com_weblinks.weblink') . ', '
. $db->quote('{"special":{"dbtable":"#__weblinks","key":"id","type":"Weblink","prefix":"WeblinksTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}') . ', ' . $db->quote(
'{"special":{"dbtable":"#__weblinks","key":"id","type":"Weblink","prefix":"WeblinksTable","config":"array()"},
"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}') . ', '
. $db->quote('') . ', ' . $db->quote('') . ', '
. $db->quote('{"common":{"core_content_item_id":"id","core_title":"title","core_state":"state","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"description", "core_hits":"hits","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"params", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"url", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "core_xreference":"xreference", "asset_id":"null"}, "special":{}}') . ', ' . $db->quote(
'{"common":{"core_content_item_id":"id","core_title":"title","core_state":"state","core_alias":"alias",
"core_created_time":"created","core_modified_time":"modified","core_body":"description", "core_hits":"hits",
"core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"params",
"core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"url",
"core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc",
"core_catid":"catid", "core_xreference":"xreference", "asset_id":"null"}, "special":{}}') . ', '
. $db->quote('WeblinksHelperRoute::getWeblinkRoute') . ', ' . $db->quote('WeblinksHelperRoute::getWeblinkRoute') . ', '
. $db->quote('{"formFile":"administrator\\/components\\/com_weblinks\\/models\\/forms\\/weblink.xml", "hideFields":["asset_id","checked_out","checked_out_time","version","featured","images"], "ignoreChanges":["modified_by", "modified", "checked_out", "checked_out_time", "version", "hits"], "convertToInt":["publish_up", "publish_down", "featured", "ordering"], "displayLookup":[{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"created_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"} ]}') . $db->quote(
'{"formFile":"administrator\\/components\\/com_weblinks\\/models\\/forms\\/weblink.xml",
"hideFields":["asset_id","checked_out","checked_out_time","version","featured","images"], "ignoreChanges":["modified_by",
"modified", "checked_out", "checked_out_time", "version", "hits"], "convertToInt":["publish_up", "publish_down", "featured",
"ordering"], "displayLookup":[{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"},
{"sourceColumn":"created_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},
{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},
{"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"} ]}')
); );
$db->setQuery($query); $db->setQuery($query);
@ -172,11 +187,29 @@ class Com_WeblinksInstallerScript
$query->values( $query->values(
$db->quote('Weblinks Category') . ', ' $db->quote('Weblinks Category') . ', '
. $db->quote('com_weblinks.category') . ', ' . $db->quote('com_weblinks.category') . ', '
. $db->quote('{"special":{"dbtable":"#__categories","key":"id","type":"Category","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}') . ', ' . $db->quote('
{"special":{"dbtable":"#__categories","key":"id","type":"Category","prefix":"JTable","config":"array()"},
"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}') . ', '
. $db->quote('') . ', ' . $db->quote('') . ', '
. $db->quote('{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "core_xreference":"null", "asset_id":"asset_id"}, "special":{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}') . ', ' . $db->quote('
{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias",
"core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description",
"core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access",
"core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language",
"core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey",
"core_metadesc":"metadesc", "core_catid":"parent_id", "core_xreference":"null", "asset_id":"asset_id"},
"special":{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}') . ', '
. $db->quote('WeblinksHelperRoute::getCategoryRoute') . ', ' . $db->quote('WeblinksHelperRoute::getCategoryRoute') . ', '
. $db->quote('{"formFile":"administrator\\/components\\/com_categories\\/models\\/forms\\/category.xml", "hideFields":["asset_id","checked_out","checked_out_time","version","lft","rgt","level","path","extension"], "ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"],"convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}]}') . $db->quote('
{"formFile":"administrator\\/components\\/com_categories\\/models\\/forms\\/category.xml",
"hideFields":["asset_id","checked_out","checked_out_time","version","lft","rgt","level","path","extension"],
"ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version",
"hits", "path"],"convertToInt":["publish_up", "publish_down"],
"displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id",
"displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id",
"displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id",
"displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id",
"displayColumn":"title"}]}')
); );
$db->setQuery($query); $db->setQuery($query);

4
src/administrator/components/com_weblinks/sql/install.mysql.sql
View File

@ -14,7 +14,7 @@ CREATE TABLE IF NOT EXISTS `#__weblinks` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT, `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`catid` int(11) NOT NULL DEFAULT 0, `catid` int(11) NOT NULL DEFAULT 0,
`title` varchar(250) NOT NULL DEFAULT '', `title` varchar(250) NOT NULL DEFAULT '',
`alias` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '', `alias` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '',
`url` varchar(250) NOT NULL DEFAULT '', `url` varchar(250) NOT NULL DEFAULT '',
`description` text NOT NULL, `description` text NOT NULL,
`hits` int(11) NOT NULL DEFAULT 0, `hits` int(11) NOT NULL DEFAULT 0,
@ -48,4 +48,4 @@ CREATE TABLE IF NOT EXISTS `#__weblinks` (
KEY `idx_featured_catid` (`featured`,`catid`), KEY `idx_featured_catid` (`featured`,`catid`),
KEY `idx_language` (`language`), KEY `idx_language` (`language`),
KEY `idx_xreference` (`xreference`) KEY `idx_xreference` (`xreference`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;

25
src/administrator/components/com_weblinks/sql/updates/mysql/3.5.1.sql Normal file
View File

@ -0,0 +1,25 @@
# Conversion to utf8mb4
--
-- Step 1.1: Enlarge columns to avoid data loss on later conversion to utf8mb4
--
ALTER TABLE `#__weblinks` MODIFY `alias` varchar(400) NOT NULL DEFAULT '';
--
-- Step 1.2: Convert table to utf8mb4 chracter set with utf8mb4_unicode_ci collation
--
ALTER TABLE `#__weblinks` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
--
-- Step 1.3: Set collation to utf8mb4_bin for formerly utf8_bin collated columns
--
ALTER TABLE `#__weblinks` MODIFY `alias` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '';
--
-- Step 1.4: Set default character set and collation for all tables
--
ALTER TABLE `#__weblinks` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;

4
src/administrator/components/com_weblinks/tables/weblink.php
View File

@ -45,7 +45,7 @@ class WeblinksTableWeblink extends JTable
/** /**
* Overload the store method for the Weblinks table. * Overload the store method for the Weblinks table.
* *
* @param boolean Toggle whether null values should be updated. * @param boolean $updateNulls Toggle whether null values should be updated.
* *
* @return boolean True on success, false on failure. * @return boolean True on success, false on failure.
* *
@ -122,7 +122,7 @@ class WeblinksTableWeblink extends JTable
return false; return false;
} }
// check for valid name // Check for valid name
if (trim($this->title) == '') if (trim($this->title) == '')
{ {
$this->setError(JText::_('COM_WEBLINKS_ERR_TABLES_TITLE')); $this->setError(JText::_('COM_WEBLINKS_ERR_TABLES_TITLE'));

27
src/administrator/components/com_weblinks/views/weblink/tmpl/edit_params.php
View File

@ -9,20 +9,17 @@
defined('_JEXEC') or die; defined('_JEXEC') or die;
$fieldSets = $this->form->getFieldsets('params'); $fieldSets = $this->form->getFieldsets('params'); ?>
foreach ($fieldSets as $name => $fieldSet) : <?php foreach ($fieldSets as $name => $fieldSet) : ?>
?> <div class="tab-pane" id="params-<?php echo $name; ?>">
<div class="tab-pane" id="params-<?php echo $name;?>"> <?php if (isset($fieldSet->description) && trim($fieldSet->description)) : ?>
<?php <?php echo '<p class="alert alert-info">' . $this->escape(JText::_($fieldSet->description)) . '</p>'; ?>
if (isset($fieldSet->description) && trim($fieldSet->description)) : <?php endif; ?>
echo '<p class="alert alert-info">'.$this->escape(JText::_($fieldSet->description)).'</p>'; <?php foreach ($this->form->getFieldset($name) as $field) : ?>
endif; <div class="control-group">
?> <div class="control-label"><?php echo $field->label; ?></div>
<?php foreach ($this->form->getFieldset($name) as $field) : ?> <div class="controls"><?php echo $field->input; ?></div>
<div class="control-group"> </div>
<div class="control-label"><?php echo $field->label; ?></div> <?php endforeach; ?>
<div class="controls"><?php echo $field->input; ?></div>
</div>
<?php endforeach; ?>
</div> </div>
<?php endforeach; ?> <?php endforeach; ?>

24
src/administrator/components/com_weblinks/views/weblink/view.html.php
View File

@ -23,40 +23,48 @@ class WeblinksViewWeblink extends JViewLegacy
protected $form; protected $form;
/** /**
* Display the view * Display the view.
*
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return mixed A string if successful, otherwise an Error object.
*/ */
public function display($tpl = null) public function display($tpl = null)
{ {
$this->state = $this->get('State'); $this->state = $this->get('State');
$this->item = $this->get('Item'); $this->item = $this->get('Item');
$this->form = $this->get('Form'); $this->form = $this->get('Form');
// Check for errors. // Check for errors.
if (count($errors = $this->get('Errors'))) if (count($errors = $this->get('Errors')))
{ {
JError::raiseError(500, implode("\n", $errors)); JError::raiseError(500, implode("\n", $errors));
return false; return false;
} }
$this->addToolbar(); $this->addToolbar();
parent::display($tpl); parent::display($tpl);
} }
/** /**
* Add the page title and toolbar. * Add the page title and toolbar.
* *
* @return void
*
* @since 1.6 * @since 1.6
*/ */
protected function addToolbar() protected function addToolbar()
{ {
JFactory::getApplication()->input->set('hidemainmenu', true); JFactory::getApplication()->input->set('hidemainmenu', true);
$user = JFactory::getUser(); $user = JFactory::getUser();
$isNew = ($this->item->id == 0); $isNew = ($this->item->id == 0);
$checkedOut = !($this->item->checked_out == 0 || $this->item->checked_out == $user->get('id')); $checkedOut = !($this->item->checked_out == 0 || $this->item->checked_out == $user->get('id'));
// Since we don't track these assets at the item level, use the category id. // Since we don't track these assets at the item level, use the category id.
$canDo = JHelperContent::getActions('com_weblinks', 'category', $this->item->catid); $canDo = JHelperContent::getActions('com_weblinks', 'category', $this->item->catid);
JToolbarHelper::title($isNew ? JText::_('COM_WEBLINKS_MANAGER_WEBLINK_NEW') : JText::_('COM_WEBLINKS_MANAGER_WEBLINK_EDIT'), 'link weblinks'); JToolbarHelper::title($isNew ? JText::_('COM_WEBLINKS_MANAGER_WEBLINK_NEW') : JText::_('COM_WEBLINKS_MANAGER_WEBLINK_EDIT'), 'link weblinks');

115
src/administrator/components/com_weblinks/views/weblinks/tmpl/default.php
View File

@ -9,7 +9,7 @@
defined('_JEXEC') or die; defined('_JEXEC') or die;
JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html'); JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
JHtml::_('bootstrap.tooltip'); JHtml::_('bootstrap.tooltip');
JHtml::_('behavior.multiselect'); JHtml::_('behavior.multiselect');
@ -26,64 +26,17 @@ if ($saveOrder)
$saveOrderingUrl = 'index.php?option=com_weblinks&task=weblinks.saveOrderAjax&tmpl=component'; $saveOrderingUrl = 'index.php?option=com_weblinks&task=weblinks.saveOrderAjax&tmpl=component';
JHtml::_('sortablelist.sortable', 'weblinkList', 'adminForm', strtolower($listDirn), $saveOrderingUrl); JHtml::_('sortablelist.sortable', 'weblinkList', 'adminForm', strtolower($listDirn), $saveOrderingUrl);
} }
$sortFields = $this->getSortFields();
JFactory::getDocument()->addScriptDeclaration('
Joomla.orderTable = function()
{
table = document.getElementById("sortTable");
direction = document.getElementById("directionTable");
order = table.options[table.selectedIndex].value;
if (order != "' . $listOrder . '")
{
dirn = "asc";
}
else
{
dirn = direction.options[direction.selectedIndex].value;
}
Joomla.tableOrdering(order, dirn, "");
};
');
?> ?>
<form action="<?php echo JRoute::_('index.php?option=com_weblinks&view=weblinks'); ?>" method="post" name="adminForm" id="adminForm"> <form action="<?php echo JRoute::_('index.php?option=com_weblinks&view=weblinks'); ?>" method="post" name="adminForm" id="adminForm">
<?php if (!empty( $this->sidebar)) : ?> <?php if (!empty($this->sidebar)) : ?>
<div id="j-sidebar-container" class="span2"> <div id="j-sidebar-container" class="span2">
<?php echo $this->sidebar; ?> <?php echo $this->sidebar; ?>
</div> </div>
<div id="j-main-container" class="span10"> <div id="j-main-container" class="span10">
<?php else : ?> <?php else : ?>
<div id="j-main-container"> <div id="j-main-container">
<?php endif;?> <?php endif;?>
<div id="filter-bar" class="btn-toolbar"> <?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
<div class="filter-search btn-group pull-left">
<label for="filter_search" class="element-invisible"><?php echo JText::_('COM_WEBLINKS_SEARCH_IN_TITLE');?></label>
<input type="text" name="filter_search" id="filter_search" placeholder="<?php echo JText::_('JSEARCH_FILTER'); ?>" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" class="hasTooltip" title="<?php echo JHtml::tooltipText('COM_WEBLINKS_SEARCH_IN_TITLE'); ?>" />
</div>
<div class="btn-group pull-left">
<button type="submit" class="btn hasTooltip" title="<?php echo JHtml::tooltipText('JSEARCH_FILTER_SUBMIT'); ?>"><i class="icon-search"></i></button>
<button type="button" class="btn hasTooltip" title="<?php echo JHtml::tooltipText('JSEARCH_FILTER_CLEAR'); ?>" onclick="document.getElementById('filter_search').value='';this.form.submit();"><i class="icon-remove"></i></button>
</div>
<div class="btn-group pull-right hidden-phone">
<label for="limit" class="element-invisible"><?php echo JText::_('JFIELD_PLG_SEARCH_SEARCHLIMIT_DESC');?></label>
<?php echo $this->pagination->getLimitBox(); ?>
</div>
<div class="btn-group pull-right hidden-phone">
<label for="directionTable" class="element-invisible"><?php echo JText::_('JFIELD_ORDERING_DESC');?></label>
<select name="directionTable" id="directionTable" class="input-medium" onchange="Joomla.orderTable()">
<option value=""><?php echo JText::_('JFIELD_ORDERING_DESC');?></option>
<option value="asc" <?php if ($listDirn == 'asc') echo 'selected="selected"'; ?>><?php echo JText::_('JGLOBAL_ORDER_ASCENDING');?></option>
<option value="desc" <?php if ($listDirn == 'desc') echo 'selected="selected"'; ?>><?php echo JText::_('JGLOBAL_ORDER_DESCENDING');?></option>
</select>
</div>
<div class="btn-group pull-right">
<label for="sortTable" class="element-invisible"><?php echo JText::_('JGLOBAL_SORT_BY');?></label>
<select name="sortTable" id="sortTable" class="input-medium" onchange="Joomla.orderTable()">
<option value=""><?php echo JText::_('JGLOBAL_SORT_BY');?></option>
<?php echo JHtml::_('select.options', $sortFields, 'value', 'text', $listOrder);?>
</select>
</div>
</div>
<div class="clearfix"> </div> <div class="clearfix"> </div>
<?php if (empty($this->items)) : ?> <?php if (empty($this->items)) : ?>
<div class="alert alert-no-items"> <div class="alert alert-no-items">
@ -94,34 +47,34 @@ JFactory::getDocument()->addScriptDeclaration('
<thead> <thead>
<tr> <tr>
<th width="1%" class="nowrap center hidden-phone"> <th width="1%" class="nowrap center hidden-phone">
<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?> <?php echo JHtml::_('searchtools.sort', '', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
</th> </th>
<th width="1%" class="hidden-phone center"> <th width="1%" class="nowrap center">
<?php echo JHtml::_('grid.checkall'); ?> <?php echo JHtml::_('grid.checkall'); ?>
</th> </th>
<th width="1%" style="min-width:55px" class="nowrap center"> <th width="1%" class="nowrap center">
<?php echo JHtml::_('grid.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?> <?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
</th> </th>
<th class="title"> <th class="title">
<?php echo JHtml::_('grid.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?> <?php echo JHtml::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
</th>
<th width="5%" class="nowrap hidden-phone">
<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ACCESS', 'a.access', $listDirn, $listOrder); ?>
</th>
<th width="5%" class="nowrap center hidden-phone">
<?php echo JHtml::_('grid.sort', 'JGLOBAL_HITS', 'a.hits', $listDirn, $listOrder); ?>
</th> </th>
<th width="10%" class="nowrap hidden-phone"> <th width="10%" class="nowrap hidden-phone">
<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_LANGUAGE', 'a.language', $listDirn, $listOrder); ?> <?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'access_level', $listDirn, $listOrder); ?>
</th>
<th width="5%" class="nowrap center hidden-phone">
<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_HITS', 'a.hits', $listDirn, $listOrder); ?>
</th>
<th width="10%" class="nowrap hidden-phone">
<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'language_title', $listDirn, $listOrder); ?>
</th> </th>
<th width="1%" class="nowrap center hidden-phone"> <th width="1%" class="nowrap center hidden-phone">
<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?> <?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
</th> </th>
</tr> </tr>
</thead> </thead>
<tfoot> <tfoot>
<tr> <tr>
<td colspan="10"> <td colspan="8">
<?php echo $this->pagination->getListFooter(); ?> <?php echo $this->pagination->getListFooter(); ?>
</td> </td>
</tr> </tr>
@ -135,7 +88,7 @@ JFactory::getDocument()->addScriptDeclaration('
$canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out == $user->get('id') || $item->checked_out == 0; $canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out == $user->get('id') || $item->checked_out == 0;
$canChange = $user->authorise('core.edit.state', 'com_weblinks.category.' . $item->catid) && $canCheckin; $canChange = $user->authorise('core.edit.state', 'com_weblinks.category.' . $item->catid) && $canCheckin;
?> ?>
<tr class="row<?php echo $i % 2; ?>" sortable-group-id="<?php echo $item->catid?>"> <tr class="row<?php echo $i % 2; ?>" sortable-group-id="<?php echo $item->catid; ?>">
<td class="order nowrap center hidden-phone"> <td class="order nowrap center hidden-phone">
<?php <?php
$iconClass = ''; $iconClass = '';
@ -152,30 +105,40 @@ JFactory::getDocument()->addScriptDeclaration('
<i class="icon-menu"></i> <i class="icon-menu"></i>
</span> </span>
<?php if ($canChange && $saveOrder) : ?> <?php if ($canChange && $saveOrder) : ?>
<input type="text" style="display:none" name="order[]" size="5" value="<?php echo $item->ordering;?>" class="width-20 text-area-order " /> <input type="text" style="display:none" name="order[]" size="5" value="<?php echo $item->ordering; ?>" class="width-20 text-area-order " />
<?php endif; ?> <?php endif; ?>
</td> </td>
<td class="center hidden-phone"> <td class="center">
<?php echo JHtml::_('grid.id', $i, $item->id); ?> <?php echo JHtml::_('grid.id', $i, $item->id); ?>
</td> </td>
<td class="center"> <td class="center">
<?php echo JHtml::_('jgrid.published', $item->state, $i, 'weblinks.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?> <div class="btn-group">
<?php echo JHtml::_('jgrid.published', $item->state, $i, 'weblinks.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?>
<?php // Create dropdown items and render the dropdown list.
if ($canChange)
{
JHtml::_('actionsdropdown.' . ((int) $item->state === 2 ? 'un' : '') . 'archive', 'cb' . $i, 'weblinks');
JHtml::_('actionsdropdown.' . ((int) $item->state === -2 ? 'un' : '') . 'trash', 'cb' . $i, 'weblinks');
echo JHtml::_('actionsdropdown.render', $this->escape($item->title));
}
?>
</div>
</td> </td>
<td class="nowrap has-context"> <td class="nowrap has-context">
<?php if ($item->checked_out) : ?> <?php if ($item->checked_out) : ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'weblinks.', $canCheckin); ?> <?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'weblinks.', $canCheckin); ?>
<?php endif; ?> <?php endif; ?>
<?php if ($canEdit) : ?> <?php if ($canEdit) : ?>
<a href="<?php echo JRoute::_('index.php?option=com_weblinks&task=weblink.edit&id='.(int) $item->id); ?>"> <a href="<?php echo JRoute::_('index.php?option=com_weblinks&task=weblink.edit&id=' . (int) $item->id); ?>">
<?php echo $this->escape($item->title); ?></a> <?php echo $this->escape($item->title); ?></a>
<?php else : ?> <?php else : ?>
<?php echo $this->escape($item->title); ?> <?php echo $this->escape($item->title); ?>
<?php endif; ?> <?php endif; ?>
<span class="small"> <span class="small">
<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias));?> <?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias)); ?>
</span> </span>
<div class="small"> <div class="small">
<?php echo $this->escape($item->category_title); ?> <?php echo JText::_('JCATEGORY') . ': ' . $this->escape($item->category_title); ?>
</div> </div>
</td> </td>
<td class="small hidden-phone"> <td class="small hidden-phone">
@ -185,9 +148,9 @@ JFactory::getDocument()->addScriptDeclaration('
<?php echo $item->hits; ?> <?php echo $item->hits; ?>
</td> </td>
<td class="small nowrap hidden-phone"> <td class="small nowrap hidden-phone">
<?php if ($item->language == '*'):?> <?php if ($item->language == '*') : ?>
<?php echo JText::alt('JALL', 'language'); ?> <?php echo JText::alt('JALL', 'language'); ?>
<?php else:?> <?php else : ?>
<?php echo $item->language_title ? JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => $item->language_title), true) . '&nbsp;' . $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> <?php echo $item->language_title ? JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => $item->language_title), true) . '&nbsp;' . $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?>
<?php endif;?> <?php endif;?>
</td> </td>
@ -205,8 +168,6 @@ JFactory::getDocument()->addScriptDeclaration('
<input type="hidden" name="task" value="" /> <input type="hidden" name="task" value="" />
<input type="hidden" name="boxchecked" value="0" /> <input type="hidden" name="boxchecked" value="0" />
<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
<?php echo JHtml::_('form.token'); ?> <?php echo JHtml::_('form.token'); ?>
</div> </div>
</form> </form>

2
src/administrator/components/com_weblinks/views/weblinks/tmpl/default_batch.php
View File

@ -9,7 +9,7 @@
defined('_JEXEC') or die; defined('_JEXEC') or die;
$published = $this->state->get('filter.state'); $published = $this->state->get('filter.published');
?> ?>
<div class="modal hide fade" id="collapseModal"> <div class="modal hide fade" id="collapseModal">
<div class="modal-header"> <div class="modal-header">

51
src/administrator/components/com_weblinks/views/weblinks/view.html.php
View File

@ -23,15 +23,19 @@ class WeblinksViewWeblinks extends JViewLegacy
protected $state; protected $state;
/** /**
* Display the view * Display the view.
* *
* @return void * @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return mixed A string if successful, otherwise an Error object.
*/ */
public function display($tpl = null) public function display($tpl = null)
{ {
$this->state = $this->get('State'); $this->state = $this->get('State');
$this->items = $this->get('Items'); $this->items = $this->get('Items');
$this->pagination = $this->get('Pagination'); $this->pagination = $this->get('Pagination');
$this->filterForm = $this->get('FilterForm');
$this->activeFilters = $this->get('ActiveFilters');
WeblinksHelper::addSubmenu('weblinks'); WeblinksHelper::addSubmenu('weblinks');
@ -50,6 +54,8 @@ class WeblinksViewWeblinks extends JViewLegacy
/** /**
* Add the page title and toolbar. * Add the page title and toolbar.
* *
* @return void
*
* @since 1.6 * @since 1.6
*/ */
protected function addToolbar() protected function addToolbar()
@ -84,7 +90,7 @@ class WeblinksViewWeblinks extends JViewLegacy
JToolbarHelper::checkin('weblinks.checkin'); JToolbarHelper::checkin('weblinks.checkin');
} }
if ($state->get('filter.state') == -2 && $canDo->get('core.delete')) if ($state->get('filter.published') == -2 && $canDo->get('core.delete'))
{ {
JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'weblinks.delete', 'JTOOLBAR_EMPTY_TRASH'); JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'weblinks.delete', 'JTOOLBAR_EMPTY_TRASH');
} }
@ -113,39 +119,6 @@ class WeblinksViewWeblinks extends JViewLegacy
} }
JToolbarHelper::help('JHELP_COMPONENTS_WEBLINKS_LINKS'); JToolbarHelper::help('JHELP_COMPONENTS_WEBLINKS_LINKS');
JHtmlSidebar::setAction('index.php?option=com_weblinks&view=weblinks');
JHtmlSidebar::addFilter(
JText::_('JOPTION_SELECT_PUBLISHED'),
'filter_state',
JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.state'), true)
);
JHtmlSidebar::addFilter(
JText::_('JOPTION_SELECT_CATEGORY'),
'filter_category_id',
JHtml::_('select.options', JHtml::_('category.options', 'com_weblinks'), 'value', 'text', $this->state->get('filter.category_id'))
);
JHtmlSidebar::addFilter(
JText::_('JOPTION_SELECT_ACCESS'),
'filter_access',
JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access'))
);
JHtmlSidebar::addFilter(
JText::_('JOPTION_SELECT_LANGUAGE'),
'filter_language',
JHtml::_('select.options', JHtml::_('contentlanguage.existing', true, true), 'value', 'text', $this->state->get('filter.language'))
);
JHtmlSidebar::addFilter(
JText::_('JOPTION_SELECT_TAG'),
'filter_tag',
JHtml::_('select.options', JHtml::_('tag.options', true, true), 'value', 'text', $this->state->get('filter.tag'))
);
} }
/** /**

2
src/administrator/components/com_weblinks/weblinks.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<extension type="component" version="3.1" method="upgrade"> <extension type="component" version="3.5" method="upgrade">
<name>com_weblinks</name> <name>com_weblinks</name>
<author>Joomla! Project</author> <author>Joomla! Project</author>
<creationDate>##DATE##</creationDate> <creationDate>##DATE##</creationDate>

4
src/administrator/language/en-GB/en-GB.com_weblinks.ini
View File

@ -21,6 +21,8 @@ COM_WEBLINKS_ERROR_UNIQUE_ALIAS="Another web link from this category has the sam
COM_WEBLINKS_FIELD_ALIAS_DESC="The alias is for internal use only. Leave this blank and Joomla will fill in a default value from the title. It has to be unique for each web link in the same category." COM_WEBLINKS_FIELD_ALIAS_DESC="The alias is for internal use only. Leave this blank and Joomla will fill in a default value from the title. It has to be unique for each web link in the same category."
COM_WEBLINKS_FIELD_CATEGORY_DESC="Choose a category for this Web link." COM_WEBLINKS_FIELD_CATEGORY_DESC="Choose a category for this Web link."
COM_WEBLINKS_FIELD_CATEGORYCHOOSE_DESC="Please choose a Web Links category to display." COM_WEBLINKS_FIELD_CATEGORYCHOOSE_DESC="Please choose a Web Links category to display."
COM_WEBLINKS_FIELD_CAPTCHA_DESC="Select the captcha plugin that will be used in the web link submit form. You may need to enter required information for your captcha plugin in the Plugin Manager.<br />If 'Use Default' is selected, make sure a captcha plugin is selected in Global Configuration."
COM_WEBLINKS_FIELD_CAPTCHA_LABEL="Allow Captcha on Web Link"
COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_DESC="Show/Hide the number of Web Links in each Category." COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_DESC="Show/Hide the number of Web Links in each Category."
COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_LABEL="# Web Links" COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_LABEL="# Web Links"
COM_WEBLINKS_FIELD_CONFIG_COUNTCLICKS_DESC="If set to yes, the number of times the link has been clicked will be recorded." COM_WEBLINKS_FIELD_CONFIG_COUNTCLICKS_DESC="If set to yes, the number of times the link has been clicked will be recorded."
@ -79,6 +81,8 @@ COM_WEBLINKS_FIELD_WIDTH_LABEL="Width"
COM_WEBLINKS_FIELDSET_IMAGES="Images" COM_WEBLINKS_FIELDSET_IMAGES="Images"
COM_WEBLINKS_FIELDSET_OPTIONS="Options" COM_WEBLINKS_FIELDSET_OPTIONS="Options"
COM_WEBLINKS_FILTER_CATEGORY="Filter Category" COM_WEBLINKS_FILTER_CATEGORY="Filter Category"
COM_WEBLINKS_FILTER_SEARCH_DESC="Search in web link title and alias. Prefix with ID: to search for an web link ID."
COM_WEBLINKS_FILTER_SEARCH_LABEL="Search Web Links"
COM_WEBLINKS_FILTER_STATE="Filter State" COM_WEBLINKS_FILTER_STATE="Filter State"
COM_WEBLINKS_FLOAT_DESC="Controls placement of the image." COM_WEBLINKS_FLOAT_DESC="Controls placement of the image."
COM_WEBLINKS_FLOAT_LABEL="Image Float" COM_WEBLINKS_FLOAT_LABEL="Image Float"

20
src/components/com_weblinks/controller.php
View File

@ -20,8 +20,8 @@ class WeblinksController extends JControllerLegacy
* Method to display a view. * Method to display a view.
* *
* @param boolean $cacheable If true, the view output will be cached * @param boolean $cacheable If true, the view output will be cached
* @param array $urlparams An array of safe url parameters and their variable types, * @param array $urlparams An array of safe url parameters and their variable types,
* for valid values see {@link JFilterInput::clean()}. * for valid values see {@link JFilterInput::clean()}.
* *
* @return WeblinksController This object to support chaining. * @return WeblinksController This object to support chaining.
* *
@ -29,8 +29,8 @@ class WeblinksController extends JControllerLegacy
*/ */
public function display($cacheable = false, $urlparams = false) public function display($cacheable = false, $urlparams = false)
{ {
$cacheable = true; // Huh? Why not just put that in the constructor? // Huh? Why not just put that in the constructor?
$user = JFactory::getUser(); $cacheable = true;
// Set the default view name and format from the Request. // Set the default view name and format from the Request.
// Note we are using w_id to avoid collisions with the router and the return page. // Note we are using w_id to avoid collisions with the router and the return page.
@ -45,12 +45,12 @@ class WeblinksController extends JControllerLegacy
} }
$safeurlparams = array( $safeurlparams = array(
'id' => 'INT', 'id' => 'INT',
'limit' => 'UINT', 'limit' => 'UINT',
'limitstart' => 'UINT', 'limitstart' => 'UINT',
'filter_order' => 'CMD', 'filter_order' => 'CMD',
'filter_order_Dir' => 'CMD', 'filter_order_Dir' => 'CMD',
'lang' => 'CMD' 'lang' => 'CMD'
); );
// Check for edit form. // Check for edit form.

10
src/components/com_weblinks/controllers/weblink.php
View File

@ -227,11 +227,21 @@ class WeblinksControllerWeblink extends JControllerForm
*/ */
public function save($key = null, $urlVar = 'w_id') public function save($key = null, $urlVar = 'w_id')
{ {
// Get the application
$app = JFactory::getApplication();
// Get the data from POST
$data = $this->input->post->get('jform', array(), 'array');
// Save the data in the session.
$app->setUserState('com_weblinks.edit.weblink.data', $data);
$result = parent::save($key, $urlVar); $result = parent::save($key, $urlVar);
// If ok, redirect to the return page. // If ok, redirect to the return page.
if ($result) if ($result)
{ {
// Flush the data from the session
$app->setUserState('com_weblinks.edit.weblink.data', null);
$this->setRedirect($this->getReturnPage()); $this->setRedirect($this->getReturnPage());
} }

7
src/components/com_weblinks/helpers/association.php
View File

@ -10,6 +10,7 @@
defined('_JEXEC') or die; defined('_JEXEC') or die;
JLoader::register('WeblinksHelper', JPATH_ADMINISTRATOR . '/components/com_weblinks/helpers/weblinks.php'); JLoader::register('WeblinksHelper', JPATH_ADMINISTRATOR . '/components/com_weblinks/helpers/weblinks.php');
JLoader::register('WeblinksHelperRoute', JPATH_SITE . '/components/com_weblinks/helpers/route.php');
JLoader::register('CategoryHelperAssociation', JPATH_ADMINISTRATOR . '/components/com_categories/helpers/association.php'); JLoader::register('CategoryHelperAssociation', JPATH_ADMINISTRATOR . '/components/com_categories/helpers/association.php');
/** /**
@ -31,11 +32,9 @@ abstract class WeblinksHelperAssociation extends CategoryHelperAssociation
*/ */
public static function getAssociations($id = 0, $view = null) public static function getAssociations($id = 0, $view = null)
{ {
jimport('helper.route', JPATH_COMPONENT_SITE);
$jinput = JFactory::getApplication()->input; $jinput = JFactory::getApplication()->input;
$view = is_null($view) ? $jinput->get('view') : $view; $view = is_null($view) ? $jinput->get('view') : $view;
$id = empty($id) ? $jinput->getInt('id') : $id; $id = empty($id) ? $jinput->getInt('id') : $id;
if ($view == 'category' || $view == 'categories') if ($view == 'category' || $view == 'categories')
{ {

2
src/components/com_weblinks/helpers/icon.php
View File

@ -63,7 +63,7 @@ class JHtmlIcon
$url = WeblinksHelperRoute::getFormRoute($weblink->id, base64_encode($uri)); $url = WeblinksHelperRoute::getFormRoute($weblink->id, base64_encode($uri));
$icon = $weblink->state ? 'edit.png' : 'edit_unpublished.png'; $icon = $weblink->state ? 'edit.png' : 'edit_unpublished.png';
$text = JHtml::_('image', 'system/'.$icon, JText::_('JGLOBAL_EDIT'), null, true); $text = JHtml::_('image', 'system/' . $icon, JText::_('JGLOBAL_EDIT'), null, true);
if ($weblink->state == 0) if ($weblink->state == 0)
{ {

35
src/components/com_weblinks/helpers/route.php
View File

@ -21,18 +21,20 @@ abstract class WeblinksHelperRoute
protected static $lang_lookup = array(); protected static $lang_lookup = array();
/** /**
* @param integer The route of the weblink * Get the route of the weblink
*
* @param integer $id Web link ID
* @param integer $catid Category ID
* @param string $language Language
* *
* @return string * @return string
*/ */
public static function getWeblinkRoute($id, $catid, $language = 0) public static function getWeblinkRoute($id, $catid, $language = 0)
{ {
$needles = array( $needles = array('weblink' => array((int) $id));
'weblink' => array((int) $id)
);
// Create the link // Create the link
$link = 'index.php?option=com_weblinks&view=weblink&id='. $id; $link = 'index.php?option=com_weblinks&view=weblink&id=' . $id;
if ($catid > 1) if ($catid > 1)
{ {
@ -67,6 +69,8 @@ abstract class WeblinksHelperRoute
} }
/** /**
* Ge the form route
*
* @param integer $id The id of the weblink. * @param integer $id The id of the weblink.
* @param string $return The return page variable. * @param string $return The return page variable.
* *
@ -77,7 +81,7 @@ abstract class WeblinksHelperRoute
// Create the link. // Create the link.
if ($id) if ($id)
{ {
$link = 'index.php?option=com_weblinks&task=weblink.edit&w_id='. $id; $link = 'index.php?option=com_weblinks&task=weblink.edit&w_id=' . $id;
} }
else else
{ {
@ -86,13 +90,15 @@ abstract class WeblinksHelperRoute
if ($return) if ($return)
{ {
$link .= '&return='.$return; $link .= '&return=' . $return;
} }
return $link; return $link;
} }
/** /**
* Get the Category Route
*
* @param JCategoryNode|string|integer $catid JCategoryNode object or category ID * @param JCategoryNode|string|integer $catid JCategoryNode object or category ID
* @param integer $language Language code * @param integer $language Language code
* *
@ -120,7 +126,7 @@ abstract class WeblinksHelperRoute
$needles = array(); $needles = array();
// Create the link // Create the link
$link = 'index.php?option=com_weblinks&view=category&id='.$id; $link = 'index.php?option=com_weblinks&view=category&id=' . $id;
$catids = array_reverse($category->getPath()); $catids = array_reverse($category->getPath());
$needles['category'] = $catids; $needles['category'] = $catids;
@ -139,7 +145,7 @@ abstract class WeblinksHelperRoute
if ($item = self::_findItem($needles)) if ($item = self::_findItem($needles))
{ {
$link .= '&Itemid='.$item; $link .= '&Itemid=' . $item;
} }
} }
@ -147,6 +153,8 @@ abstract class WeblinksHelperRoute
} }
/** /**
* Do a language lookup
*
* @return void * @return void
*/ */
protected static function buildLanguageLookup() protected static function buildLanguageLookup()
@ -169,6 +177,13 @@ abstract class WeblinksHelperRoute
} }
} }
/**
* Find items per given $needles
*
* @params array $needles
*
* @return void
*/
protected static function _findItem($needles = null) protected static function _findItem($needles = null)
{ {
$app = JFactory::getApplication(); $app = JFactory::getApplication();
@ -208,7 +223,7 @@ abstract class WeblinksHelperRoute
if (isset($item->query['id'])) if (isset($item->query['id']))
{ {
// here it will become a bit tricky // Here it will become a bit tricky
// language != * can override existing entries // language != * can override existing entries
// language == * cannot override existing entries // language == * cannot override existing entries
if (!isset(self::$lookup[$language][$view][$item->query['id']]) || $item->language != '*') if (!isset(self::$lookup[$language][$view][$item->query['id']]) || $item->language != '*')

27
src/components/com_weblinks/models/categories.php
View File

@ -40,6 +40,11 @@ class WeblinksModelCategories extends JModelList
* *
* Note. Calling getState in this method will result in recursion. * Note. Calling getState in this method will result in recursion.
* *
* @param string $ordering An optional ordering field.
* @param string $direction An optional direction (asc|desc).
*
* @return void
*
* @since 1.6 * @since 1.6
*/ */
protected function populateState($ordering = null, $direction = null) protected function populateState($ordering = null, $direction = null)
@ -54,8 +59,8 @@ class WeblinksModelCategories extends JModelList
$params = $app->getParams(); $params = $app->getParams();
$this->setState('params', $params); $this->setState('params', $params);
$this->setState('filter.published', 1); $this->setState('filter.published', 1);
$this->setState('filter.access', true); $this->setState('filter.access', true);
} }
/** /**
@ -72,18 +77,18 @@ class WeblinksModelCategories extends JModelList
protected function getStoreId($id = '') protected function getStoreId($id = '')
{ {
// Compile the store id. // Compile the store id.
$id .= ':'.$this->getState('filter.extension'); $id .= ':' . $this->getState('filter.extension');
$id .= ':'.$this->getState('filter.published'); $id .= ':' . $this->getState('filter.published');
$id .= ':'.$this->getState('filter.access'); $id .= ':' . $this->getState('filter.access');
$id .= ':'.$this->getState('filter.parentId'); $id .= ':' . $this->getState('filter.parentId');
return parent::getStoreId($id); return parent::getStoreId($id);
} }
/** /**
* redefine the function an add some properties to make the styling more easy * Redefine the function and add some properties to make the styling more easy
* *
* @return mixed An array of data items on success, false on failure. * @return mixed An array of data items on success, false on failure.
*/ */
public function getItems() public function getItems()
{ {
@ -117,12 +122,18 @@ class WeblinksModelCategories extends JModelList
return $this->_items; return $this->_items;
} }
/**
* Get the parent
*
* @return mixed An array of data items on success, false on failure.
*/
public function getParent() public function getParent()
{ {
if (!is_object($this->_parent)) if (!is_object($this->_parent))
{ {
$this->getItems(); $this->getItems();
} }
return $this->_parent; return $this->_parent;
} }
} }

63
src/components/com_weblinks/models/category.php
View File

@ -36,7 +36,7 @@ class WeblinksModelCategory extends JModelList
/** /**
* Constructor. * Constructor.
* *
* @param array An optional associative array of configuration settings. * @param array $config An optional associative array of configuration settings.
* *
* @see JControllerLegacy * @see JControllerLegacy
* @since 1.6 * @since 1.6
@ -121,9 +121,20 @@ class WeblinksModelCategory extends JModelList
// Filter by category. // Filter by category.
if ($categoryId = $this->getState('category.id')) if ($categoryId = $this->getState('category.id'))
{ {
$query->where('a.catid = ' . (int) $categoryId) // Group by subcategory
->join('LEFT', '#__categories AS c ON c.id = a.catid') if ($this->getState('category.group', 0))
->where('c.access IN (' . $groups . ')'); {
$query->select('c.title AS category_title')
->where('c.parent_id = ' . (int) $categoryId)
->join('LEFT', '#__categories AS c ON c.id = a.catid')
->where('c.access IN (' . $groups . ')');
}
else
{
$query->where('a.catid = ' . (int) $categoryId)
->join('LEFT', '#__categories AS c ON c.id = a.catid')
->where('c.access IN (' . $groups . ')');
}
// Filter by published category // Filter by published category
$cpublished = $this->getState('filter.c.published'); $cpublished = $this->getState('filter.c.published');
@ -141,7 +152,6 @@ class WeblinksModelCategory extends JModelList
->join('LEFT', '#__users AS uam ON uam.id = a.modified_by'); ->join('LEFT', '#__users AS uam ON uam.id = a.modified_by');
// Filter by state // Filter by state
$state = $this->getState('filter.state'); $state = $this->getState('filter.state');
if (is_numeric($state)) if (is_numeric($state))
@ -149,7 +159,7 @@ class WeblinksModelCategory extends JModelList
$query->where('a.state = ' . (int) $state); $query->where('a.state = ' . (int) $state);
} }
// do not show trashed links on the front-end // Do not show trashed links on the front-end
$query->where('a.state != -2'); $query->where('a.state != -2');
// Filter by start and end dates. // Filter by start and end dates.
@ -176,12 +186,20 @@ class WeblinksModelCategory extends JModelList
$search = $db->quote('%' . $db->escape($search, true) . '%'); $search = $db->quote('%' . $db->escape($search, true) . '%');
$query->where('(a.title LIKE ' . $search . ')'); $query->where('(a.title LIKE ' . $search . ')');
} }
// If grouping by subcategory, add the subcategory list ordering clause.
if($this->getState('category.group', 0))
{
$query->order(
$db->escape($this->getState('category.ordering', 'c.lft')) . ' ' .
$db->escape($this->getState('category.direction', 'ASC'))
);
}
// Add the list ordering clause. // Add the list ordering clause.
$query->order( $query->order(
$db->escape( $db->escape($this->getState('list.ordering', 'a.ordering')) . ' ' .
$this->getState('list.ordering', 'a.ordering')) . ' ' . $db->escape($this->getState('list.direction', 'ASC') $db->escape($this->getState('list.direction', 'ASC'))
)
); );
return $query; return $query;
@ -192,6 +210,11 @@ class WeblinksModelCategory extends JModelList
* *
* Note. Calling getState in this method will result in recursion. * Note. Calling getState in this method will result in recursion.
* *
* @param string $ordering An optional ordering field.
* @param string $direction An optional direction (asc|desc).
*
* @return void
*
* @since 1.6 * @since 1.6
*/ */
protected function populateState($ordering = null, $direction = null) protected function populateState($ordering = null, $direction = null)
@ -234,7 +257,7 @@ class WeblinksModelCategory extends JModelList
if ((!$user->authorise('core.edit.state', 'com_weblinks')) && (!$user->authorise('core.edit', 'com_weblinks'))) if ((!$user->authorise('core.edit.state', 'com_weblinks')) && (!$user->authorise('core.edit', 'com_weblinks')))
{ {
// limit to published for people who can't edit or edit.state. // Limit to published for people who can't edit or edit.state.
$this->setState('filter.state', 1); $this->setState('filter.state', 1);
// Filter by start and end dates. // Filter by start and end dates.
@ -301,8 +324,6 @@ class WeblinksModelCategory extends JModelList
/** /**
* Get the parent category * Get the parent category
* *
* @param integer An optional category id. If not supplied, the model state 'category.id' will be used.
*
* @return mixed An array of categories or false if an error occurs. * @return mixed An array of categories or false if an error occurs.
*/ */
public function getParent() public function getParent()
@ -311,40 +332,46 @@ class WeblinksModelCategory extends JModelList
{ {
$this->getCategory(); $this->getCategory();
} }
return $this->_parent; return $this->_parent;
} }
/** /**
* Get the sibling (adjacent) categories. * Get the leftsibling (adjacent) categories.
* *
* @return mixed An array of categories or false if an error occurs. * @return mixed An array of categories or false if an error occurs.
*/ */
function &getLeftSibling() public function &getLeftSibling()
{ {
if (!is_object($this->_item)) if (!is_object($this->_item))
{ {
$this->getCategory(); $this->getCategory();
} }
return $this->_leftsibling; return $this->_leftsibling;
} }
function &getRightSibling() /**
* Get the rightsibling (adjacent) categories.
*
* @return mixed An array of categories or false if an error occurs.
*/
public function &getRightSibling()
{ {
if (!is_object($this->_item)) if (!is_object($this->_item))
{ {
$this->getCategory(); $this->getCategory();
} }
return $this->_rightsibling; return $this->_rightsibling;
} }
/** /**
* Get the child categories. * Get the child categories.
* *
* @param integer An optional category id. If not supplied, the model state 'category.id' will be used.
*
* @return mixed An array of categories or false if an error occurs. * @return mixed An array of categories or false if an error occurs.
*/ */
function &getChildren() public function &getChildren()
{ {
if (!is_object($this->_item)) if (!is_object($this->_item))
{ {

2
src/components/com_weblinks/models/form.php
View File

@ -43,6 +43,8 @@ class WeblinksModelForm extends WeblinksModelWeblink
* *
* Note. Calling getState in this method will result in recursion. * Note. Calling getState in this method will result in recursion.
* *
* @return void
*
* @since 1.6 * @since 1.6
*/ */
protected function populateState() protected function populateState()

9
src/components/com_weblinks/models/forms/weblink.xml
View File

@ -89,6 +89,15 @@
size="45" size="45"
labelclass="control-label" /> labelclass="control-label" />
<field
name="captcha"
type="captcha"
label="COM_WEBLINKS_CAPTCHA_LABEL"
description="COM_WEBLINKS_CAPTCHA_DESC"
validate="captcha"
namespace="weblink"
/>
</fieldset> </fieldset>
<fields name="metadata"> <fields name="metadata">
<fieldset name="jmetadata" <fieldset name="jmetadata"

10
src/components/com_weblinks/models/weblink.php
View File

@ -32,6 +32,8 @@ class WeblinksModelWeblink extends JModelItem
* *
* Note. Calling getState in this method will result in recursion. * Note. Calling getState in this method will result in recursion.
* *
* @return void
*
* @since 1.6 * @since 1.6
*/ */
protected function populateState() protected function populateState()
@ -50,7 +52,7 @@ class WeblinksModelWeblink extends JModelItem
/** /**
* Method to get an object. * Method to get an object.
* *
* @param integer The id of the object to get. * @param integer $id The id of the object to get.
* *
* @return mixed Object on success, false on failure. * @return mixed Object on success, false on failure.
*/ */
@ -96,9 +98,9 @@ class WeblinksModelWeblink extends JModelItem
/** /**
* Returns a reference to the a Table object, always creating it. * Returns a reference to the a Table object, always creating it.
* *
* @param type The table type to instantiate * @param string $type The table type to instantiate
* @param string A prefix for the table class name. Optional. * @param string $prefix A prefix for the table class name. Optional.
* @param array Configuration array for model. Optional. * @param array $config Configuration array for model. Optional.
* *
* @return JTable A database object * @return JTable A database object
* *

18
src/components/com_weblinks/router.php
View File

@ -259,7 +259,11 @@ class WeblinksRouter extends JComponentRouterBase
/** /**
* Weblinks router functions * Weblinks router functions
* *
* These functions are proxys for the new router interface * @param array &$query An array of URL arguments
*
* @return array The URL arguments to use to assemble the subsequent URL.
*
* Note. These functions are proxies for the new router interface
* for old SEF extensions. * for old SEF extensions.
* *
* @deprecated 4.0 Use Class based routers instead * @deprecated 4.0 Use Class based routers instead
@ -271,6 +275,18 @@ function WeblinksBuildRoute(&$query)
return $router->build($query); return $router->build($query);
} }
/**
* Weblinks router functions
*
* @param array $segments The segments of the URL to parse.
*
* @return array The URL attributes to be used by the application.
*
* Note. These functions are proxies for the new router interface
* for old SEF extensions.
*
* @deprecated 4.0 Use Class based routers instead
*/
function WeblinksParseRoute($segments) function WeblinksParseRoute($segments)
{ {
$router = new WeblinksRouter; $router = new WeblinksRouter;

2
src/components/com_weblinks/views/category/tmpl/default.php
View File

@ -9,6 +9,6 @@
defined('_JEXEC') or die; defined('_JEXEC') or die;
JHtml::addIncludePath(JPATH_COMPONENT.'/helpers'); JHtml::addIncludePath(JPATH_COMPONENT . '/helpers');
$this->subtemplatename = 'items'; $this->subtemplatename = 'items';
echo JLayoutHelper::render('joomla.content.category_default', $this); echo JLayoutHelper::render('joomla.content.category_default', $this);

106
src/components/com_weblinks/views/category/tmpl/default_items.php
View File

@ -25,8 +25,8 @@ $canCreate = $user->authorise('core.create', 'com_weblinks');
$canEditState = $user->authorise('core.edit.state', 'com_weblinks'); $canEditState = $user->authorise('core.edit.state', 'com_weblinks');
$n = count($this->items); $n = count($this->items);
$listOrder = $this->escape($this->state->get('list.ordering')); $listOrder = $this->escape($this->state->get('list.ordering'));
$listDirn = $this->escape($this->state->get('list.direction')); $listDirn = $this->escape($this->state->get('list.direction'));
?> ?>
<?php if (empty($this->items)) : ?> <?php if (empty($this->items)) : ?>
@ -34,9 +34,9 @@ $listDirn = $this->escape($this->state->get('list.direction'));
<?php else : ?> <?php else : ?>
<form action="<?php echo htmlspecialchars(JUri::getInstance()->toString()); ?>" method="post" name="adminForm" id="adminForm"> <form action="<?php echo htmlspecialchars(JUri::getInstance()->toString()); ?>" method="post" name="adminForm" id="adminForm">
<?php if ($this->params->get('filter_field') != 'hide' || $this->params->get('show_pagination_limit')) :?> <?php if ($this->params->get('filter_field') != 'hide' || $this->params->get('show_pagination_limit')) : ?>
<fieldset class="filters btn-toolbar"> <fieldset class="filters btn-toolbar">
<?php if ($this->params->get('filter_field') != 'hide') :?> <?php if ($this->params->get('filter_field') != 'hide') : ?>
<div class="btn-group"> <div class="btn-group">
<label class="filter-search-lbl element-invisible" for="filter-search"><?php echo JText::_('COM_WEBLINKS_FILTER_LABEL') . '&#160;'; ?></label> <label class="filter-search-lbl element-invisible" for="filter-search"><?php echo JText::_('COM_WEBLINKS_FILTER_LABEL') . '&#160;'; ?></label>
<input type="text" name="filter-search" id="filter-search" value="<?php echo $this->escape($this->state->get('list.filter')); ?>" class="inputbox" onchange="document.adminForm.submit();" title="<?php echo JText::_('COM_WEBLINKS_FILTER_SEARCH_DESC'); ?>" placeholder="<?php echo JText::_('COM_WEBLINKS_FILTER_SEARCH_DESC'); ?>" /> <input type="text" name="filter-search" id="filter-search" value="<?php echo $this->escape($this->state->get('list.filter')); ?>" class="inputbox" onchange="document.adminForm.submit();" title="<?php echo JText::_('COM_WEBLINKS_FILTER_SEARCH_DESC'); ?>" placeholder="<?php echo JText::_('COM_WEBLINKS_FILTER_SEARCH_DESC'); ?>" />
@ -54,12 +54,11 @@ $listDirn = $this->escape($this->state->get('list.direction'));
</fieldset> </fieldset>
<?php endif; ?> <?php endif; ?>
<ul class="category list-striped list-condensed"> <ul class="category list-striped list-condensed">
<?php foreach ($this->items as $i => $item) : ?> <?php foreach ($this->items as $i => $item) : ?>
<?php if (in_array($item->access, $this->user->getAuthorisedViewLevels())) : ?> <?php if (in_array($item->access, $this->user->getAuthorisedViewLevels())) : ?>
<?php if ($this->items[$i]->state == 0) : ?> <?php if ($this->items[$i]->state == 0) : ?>
<li class="system-unpublished cat-list-row<?php echo $i % 2; ?>"> <li class="system-unpublished cat-list-row<?php echo $i % 2; ?>">
<?php else: ?> <?php else : ?>
<li class="cat-list-row<?php echo $i % 2; ?>" > <li class="cat-list-row<?php echo $i % 2; ?>" >
<?php endif; ?> <?php endif; ?>
<?php if ($this->params->get('show_link_hits', 1)) : ?> <?php if ($this->params->get('show_link_hits', 1)) : ?>
@ -84,48 +83,47 @@ $listDirn = $this->escape($this->state->get('list.direction'));
<?php echo '<img src="' . $this->params->get('link_icons') . '" alt="' . JText::_('COM_WEBLINKS_LINK') . '" />'; ?> <?php echo '<img src="' . $this->params->get('link_icons') . '" alt="' . JText::_('COM_WEBLINKS_LINK') . '" />'; ?>
<?php endif; ?> <?php endif; ?>
<?php endif; ?> <?php endif; ?>
<?php // Compute the correct link ?>
<?php $menuclass = 'category' . $this->pageclass_sfx; ?>
<?php $link = $item->link; ?>
<?php $width = $item->params->get('width'); ?>
<?php $height = $item->params->get('height'); ?>
<?php if ($width == null || $height == null) : ?>
<?php $width = 600; ?>
<?php $height = 500; ?>
<?php endif; ?>
<?php if ($this->items[$i]->state == 0) : ?>
<span class="label label-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span>
<?php endif; ?>
<?php <?php
// Compute the correct link switch ($item->params->get('target', $this->params->get('target')))
$menuclass = 'category' . $this->pageclass_sfx; {
$link = $item->link; case 1:
$width = $item->params->get('width'); // Open in a new window
$height = $item->params->get('height'); echo '<a href="' . $link . '" target="_blank" class="' . $menuclass . '" rel="nofollow">' .
if ($width == null || $height == null) $this->escape($item->title) . '</a>';
{ break;
$width = 600;
$height = 500;
}
if ($this->items[$i]->state == 0) : ?>
<span class="label label-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span>
<?php endif; ?>
<?php switch ($item->params->get('target', $this->params->get('target'))) case 2:
{ // Open in a popup window
case 1: $attribs = 'toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=' . $this->escape($width) . ',height=' . $this->escape($height) . '';
// Open in a new window echo "<a href=\"$link\" onclick=\"window.open(this.href, 'targetWindow', '" . $attribs . "'); return false;\">" .
echo '<a href="' . $link . '" target="_blank" class="' . $menuclass . '" rel="nofollow">' . $this->escape($item->title) . '</a>';
$this->escape($item->title) . '</a>'; break;
break; case 3:
// Open in a modal window
JHtml::_('behavior.modal', 'a.modal');
echo '<a class="modal" href="' . $link . '" rel="{handler: \'iframe\', size: {x:' . $this->escape($width) . ', y:' . $this->escape($height) . '}}">' .
$this->escape($item->title) . ' </a>';
break;
case 2: default:
// Open in a popup window // Open in parent window
$attribs = 'toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=' . $this->escape($width) . ',height=' . $this->escape($height) . ''; echo '<a href="' . $link . '" class="' . $menuclass . '" rel="nofollow">' .
echo "<a href=\"$link\" onclick=\"window.open(this.href, 'targetWindow', '" . $attribs . "'); return false;\">" . $this->escape($item->title) . ' </a>';
$this->escape($item->title) . '</a>'; break;
break; }
case 3:
// Open in a modal window
JHtml::_('behavior.modal', 'a.modal');
echo '<a class="modal" href="' . $link . '" rel="{handler: \'iframe\', size: {x:' . $this->escape($width) . ', y:' . $this->escape($height) . '}}">' .
$this->escape($item->title) . ' </a>';
break;
default:
// Open in parent window
echo '<a href="' . $link . '" class="' . $menuclass . '" rel="nofollow">' .
$this->escape($item->title) . ' </a>';
break;
}
?> ?>
</div> </div>
<?php $tagsData = $item->tags->getItemTags('com_weblinks.weblink', $item->id); ?> <?php $tagsData = $item->tags->getItemTags('com_weblinks.weblink', $item->id); ?>
@ -133,38 +131,32 @@ $listDirn = $this->escape($this->state->get('list.direction'));
<?php $this->item->tagLayout = new JLayoutFile('joomla.content.tags'); ?> <?php $this->item->tagLayout = new JLayoutFile('joomla.content.tags'); ?>
<?php echo $this->item->tagLayout->render($tagsData); ?> <?php echo $this->item->tagLayout->render($tagsData); ?>
<?php endif; ?> <?php endif; ?>
<?php if (($this->params->get('show_link_description')) and ($item->description != '')) : ?> <?php if (($this->params->get('show_link_description')) and ($item->description != '')) : ?>
<?php $images = json_decode($item->images); ?> <?php $images = json_decode($item->images); ?>
<?php if (isset($images->image_first) and !empty($images->image_first)) : ?> <?php if (isset($images->image_first) and !empty($images->image_first)) : ?>
<?php $imgfloat = (empty($images->float_first)) ? $this->params->get('float_first') : $images->float_first; ?> <?php $imgfloat = (empty($images->float_first)) ? $this->params->get('float_first') : $images->float_first; ?>
<div class="img-intro-<?php echo htmlspecialchars($imgfloat); ?>"> <img <div class="img-intro-<?php echo htmlspecialchars($imgfloat); ?>"> <img
<?php if ($images->image_first_caption): <?php if ($images->image_first_caption) : ?>
echo 'class="caption"'.' title="' .htmlspecialchars($images->image_first_caption) .'"'; <?php echo 'class="caption" title="' . htmlspecialchars($images->image_first_caption) . '"'; ?>
endif; ?> <?php endif; ?>
src="<?php echo htmlspecialchars($images->image_first); ?>" alt="<?php echo htmlspecialchars($images->image_first_alt); ?>"/> </div> src="<?php echo htmlspecialchars($images->image_first); ?>" alt="<?php echo htmlspecialchars($images->image_first_alt); ?>"/> </div>
<?php endif; ?> <?php endif; ?>
<?php if (isset($images->image_second) and !empty($images->image_second)) : ?> <?php if (isset($images->image_second) and !empty($images->image_second)) : ?>
<?php $imgfloat = (empty($images->float_second)) ? $this->params->get('float_second') : $images->float_second; ?> <?php $imgfloat = (empty($images->float_second)) ? $this->params->get('float_second') : $images->float_second; ?>
<div class="pull-<?php echo htmlspecialchars($imgfloat); ?> item-image"> <img <div class="pull-<?php echo htmlspecialchars($imgfloat); ?> item-image"> <img
<?php if ($images->image_second_caption): <?php if ($images->image_second_caption) : ?>
echo 'class="caption"'.' title="' .htmlspecialchars($images->image_second_caption) .'"'; <?php echo 'class="caption" title="' . htmlspecialchars($images->image_second_caption) . '"'; ?>
endif; ?> <?php endif; ?>
src="<?php echo htmlspecialchars($images->image_second); ?>" alt="<?php echo htmlspecialchars($images->image_second_alt); ?>"/> </div> src="<?php echo htmlspecialchars($images->image_second); ?>" alt="<?php echo htmlspecialchars($images->image_second_alt); ?>"/> </div>
<?php endif; ?> <?php endif; ?>
<?php echo $item->description; ?> <?php echo $item->description; ?>
<?php endif; ?> <?php endif; ?>
</li> </li>
<?php endif;?> <?php endif;?>
<?php endforeach; ?> <?php endforeach; ?>
</ul> </ul>
<?php // Code to add a link to submit a weblink. ?> <?php // Code to add a link to submit a weblink. ?>
<?php /* if ($canCreate) : // TODO This is not working due to some problem in the router, I think. Ref issue #23685 ?>
<?php echo JHtml::_('icon.create', $item, $item->params); ?>
<?php endif; */ ?>
<?php if ($this->params->get('show_pagination')) : ?> <?php if ($this->params->get('show_pagination')) : ?>
<div class="pagination"> <div class="pagination">
<?php if ($this->params->def('show_pagination_results', 1)) : ?> <?php if ($this->params->def('show_pagination_results', 1)) : ?>

56
src/components/com_weblinks/views/form/tmpl/edit.php
View File

@ -14,6 +14,18 @@ JHtml::_('behavior.formvalidation');
JHtml::_('formbehavior.chosen', 'select'); JHtml::_('formbehavior.chosen', 'select');
JHtml::_('behavior.modal', 'a.modal_jform_contenthistory'); JHtml::_('behavior.modal', 'a.modal_jform_contenthistory');
$captchaEnabled = false;
$captchaSet = $this->params->get('captcha', JFactory::getApplication()->get('captcha', '0'));
foreach (JPluginHelper::getPlugin('captcha') as $plugin)
{
if ($captchaSet === $plugin->name)
{
$captchaEnabled = true;
break;
}
}
// Create shortcut to parameters. // Create shortcut to parameters.
$params = $this->state->get('params'); $params = $this->state->get('params');
?> ?>
@ -34,7 +46,32 @@ $params = $this->state->get('params');
<?php echo $this->escape($this->params->get('page_heading')); ?> <?php echo $this->escape($this->params->get('page_heading')); ?>
</h1> </h1>
<?php endif; ?> <?php endif; ?>
<form action="<?php echo JRoute::_('index.php?option=com_weblinks&view=form&w_id='.(int) $this->item->id); ?>" method="post" name="adminForm" id="adminForm" class="form-validate form-vertical"> <form action="<?php echo JRoute::_('index.php?option=com_weblinks&view=form&w_id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="adminForm" class="form-validate form-vertical">
<?php echo $this->form->renderField('title'); ?>
<?php echo $this->form->renderField('alias'); ?>
<?php echo $this->form->renderField('catid'); ?>
<?php echo $this->form->renderField('url'); ?>
<?php echo $this->form->renderField('tags'); ?>
<?php if ($params->get('save_history', 0)) : ?>
<?php echo $this->form->renderField('version_note'); ?>
<?php endif; ?>
<?php if ($this->user->authorise('core.edit.state', 'com_weblinks.weblink')) : ?>
<?php echo $this->form->renderField('state'); ?>
<?php endif; ?>
<?php echo $this->form->renderField('language'); ?>
<?php echo $this->form->renderField('description'); ?>
<hr class="hr-condensed" />
<?php if ($captchaEnabled) : ?>
<div class="btn-group">
<?php echo $this->form->renderField('captcha'); ?>
</div>
<?php endif; ?>
<div class="btn-toolbar"> <div class="btn-toolbar">
<div class="btn-group"> <div class="btn-group">
<button type="button" class="btn btn-primary" onclick="Joomla.submitbutton('weblink.save')"> <button type="button" class="btn btn-primary" onclick="Joomla.submitbutton('weblink.save')">
@ -53,23 +90,6 @@ $params = $this->state->get('params');
<?php endif; ?> <?php endif; ?>
</div> </div>
<hr class="hr-condensed" />
<?php echo $this->form->renderField('title'); ?>
<?php echo $this->form->renderField('alias'); ?>
<?php echo $this->form->renderField('catid'); ?>
<?php echo $this->form->renderField('url'); ?>
<?php echo $this->form->renderField('tags'); ?>
<?php if ($params->get('save_history', 0)) : ?>
<?php echo $this->form->renderField('version_note'); ?>
<?php endif; ?>
<?php if ($this->user->authorise('core.edit.state', 'com_weblinks.weblink')) : ?>
<?php echo $this->form->renderField('state'); ?>
<?php endif; ?>
<?php echo $this->form->renderField('language'); ?>
<?php echo $this->form->renderField('description'); ?>
<input type="hidden" name="return" value="<?php echo $this->return_page;?>" /> <input type="hidden" name="return" value="<?php echo $this->return_page;?>" />
<input type="hidden" name="task" value="" /> <input type="hidden" name="task" value="" />
<?php echo JHtml::_('form.token'); ?> <?php echo JHtml::_('form.token'); ?>

21
src/components/com_weblinks/views/form/view.html.php
View File

@ -24,9 +24,18 @@ class WeblinksViewForm extends JViewLegacy
protected $state; protected $state;
/**
* Display the view.
*
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return mixed A string if successful, otherwise an Error object.
*/
public function display($tpl = null) public function display($tpl = null)
{ {
$user = JFactory::getUser(); $user = JFactory::getUser();
// Get the application
$app = JFactory::getApplication();
// Get model data. // Get model data.
$this->state = $this->get('State'); $this->state = $this->get('State');
@ -40,7 +49,7 @@ class WeblinksViewForm extends JViewLegacy
} }
else else
{ {
$authorised = $user->authorise('core.edit', 'com_weblinks.category.'.$this->item->catid); $authorised = $user->authorise('core.edit', 'com_weblinks.category.' . $this->item->catid);
} }
if ($authorised !== true) if ($authorised !== true)
@ -52,6 +61,12 @@ class WeblinksViewForm extends JViewLegacy
if (!empty($this->item)) if (!empty($this->item))
{ {
// Override the base weblink data with any data in the session.
$temp = (array) $app->getUserState('com_weblinks.edit.weblink.data', array());
foreach ($temp as $k => $v)
{
$this->item->$k = $v;
}
$this->form->bind($this->item); $this->form->bind($this->item);
} }
@ -66,7 +81,7 @@ class WeblinksViewForm extends JViewLegacy
// Create a shortcut to the parameters. // Create a shortcut to the parameters.
$params = &$this->state->params; $params = &$this->state->params;
//Escape strings for HTML output // Escape strings for HTML output
$this->pageclass_sfx = htmlspecialchars($params->get('pageclass_sfx')); $this->pageclass_sfx = htmlspecialchars($params->get('pageclass_sfx'));
$this->params = $params; $this->params = $params;
@ -78,6 +93,8 @@ class WeblinksViewForm extends JViewLegacy
/** /**
* Prepares the document * Prepares the document
*
* @return void
*/ */
protected function _prepareDocument() protected function _prepareDocument()
{ {

14
src/components/com_weblinks/views/weblink/view.html.php
View File

@ -20,25 +20,33 @@ class WeblinksViewWeblink extends JViewLegacy
protected $item; protected $item;
/**
* Display the view.
*
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return mixed A string if successful, otherwise an Error object.
*/
public function display($tpl = null) public function display($tpl = null)
{ {
// Get some data from the models // Get some data from the models
$item = $this->get('Item'); $item = $this->get('Item');
if ($this->getLayout() == 'edit') if ($this->getLayout() == 'edit')
{ {
$this->_displayEdit($tpl); $this->_displayEdit($tpl);
return; return;
} }
if ($item->url) if ($item->url)
{ {
// redirects to url if matching id found // Redirects to url if matching id found
JFactory::getApplication()->redirect($item->url); JFactory::getApplication()->redirect($item->url);
} }
else else
{ {
//TODO create proper error handling // @TODO create proper error handling
JFactory::getApplication()->redirect(JRoute::_('index.php'), JText::_('COM_WEBLINKS_ERROR_WEBLINK_NOT_FOUND'), 'notice'); JFactory::getApplication()->redirect(JRoute::_('index.php'), JText::_('COM_WEBLINKS_ERROR_WEBLINK_NOT_FOUND'), 'notice');
} }
} }

2
src/language/en-GB/en-GB.com_weblinks.ini
View File

@ -3,6 +3,8 @@
; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
; Note : All ini files need to be saved as UTF-8 - No BOM ; Note : All ini files need to be saved as UTF-8 - No BOM
COM_WEBLINKS_CAPTCHA_LABEL="Captcha"
COM_WEBLINKS_CAPTCHA_DESC="Please complete the security check."
COM_WEBLINKS_CONTENT_TYPE_WEBLINK="Web Link" COM_WEBLINKS_CONTENT_TYPE_WEBLINK="Web Link"
COM_WEBLINKS_CONTENT_TYPE_CATEGORY="Web Links Category" COM_WEBLINKS_CONTENT_TYPE_CATEGORY="Web Links Category"
COM_WEBLINKS_DEFAULT_PAGE_TITLE="Web Links" COM_WEBLINKS_DEFAULT_PAGE_TITLE="Web Links"

10
src/language/en-GB/en-GB.mod_weblinks.ini
View File

@ -5,6 +5,16 @@
MOD_WEBLINKS="Web Links" MOD_WEBLINKS="Web Links"
MOD_WEBLINKS_FIELD_CATEGORY_DESC="Choose the Web Links category to display." MOD_WEBLINKS_FIELD_CATEGORY_DESC="Choose the Web Links category to display."
MOD_WEBLINKS_FIELD_GROUPBY_DESC="If set to yes, weblinks will be grouped by subcategories."
MOD_WEBLINKS_FIELD_GROUPBY_LABEL="Group By Subcategories"
MOD_WEBLINKS_FIELD_GROUPBYSHOWTITLE_DESC="If set to yes, will show groups titles (valid only if grouping)."
MOD_WEBLINKS_FIELD_GROUPBYSHOWTITLE_LABEL="Show Group Title"
MOD_WEBLINKS_FIELD_GROUPBYORDERING_DESC="Ordering for the subcategories (valid only if grouping)."
MOD_WEBLINKS_FIELD_GROUPBYORDERING_LABEL="Group Ordering"
MOD_WEBLINKS_FIELD_GROUPBYDIRECTION_DESC="Direction for the subcategories (valid only if grouping)."
MOD_WEBLINKS_FIELD_GROUPBYDIRECTION_LABEL="Group Ordering Direction"
MOD_WEBLINKS_FIELD_COLUMNS_DESC="When grouping by subcategories, split into # columns."
MOD_WEBLINKS_FIELD_COLUMNS_LABEL="Columns"
MOD_WEBLINKS_FIELD_COUNT_DESC="Number of Web Links to display." MOD_WEBLINKS_FIELD_COUNT_DESC="Number of Web Links to display."
MOD_WEBLINKS_FIELD_COUNT_LABEL="Count" MOD_WEBLINKS_FIELD_COUNT_LABEL="Count"
MOD_WEBLINKS_FIELD_COUNTCLICKS_DESC="If set to yes, the number of times the link has been clicked will be recorded." MOD_WEBLINKS_FIELD_COUNTCLICKS_DESC="If set to yes, the number of times the link has been clicked will be recorded."

3
src/modules/mod_weblinks/helper.php
View File

@ -57,6 +57,9 @@ class ModWeblinksHelper
$catid = (int) $params->get('catid', 0); $catid = (int) $params->get('catid', 0);
$model->setState('category.id', $catid); $model->setState('category.id', $catid);
$model->setState('category.group', $params->get('groupby', 0));
$model->setState('category.ordering', $params->get('groupby_ordering', 'c.lft'));
$model->setState('category.direction', $params->get('groupby_direction', 'ASC'));
// Create query object // Create query object
$db = JFactory::getDbo(); $db = JFactory::getDbo();

255
src/modules/mod_weblinks/mod_weblinks.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<extension type="module" version="3.1" client="site" method="upgrade"> <extension type="module" version="3.5" client="site" method="upgrade">
<name>mod_weblinks</name> <name>mod_weblinks</name>
<author>Joomla! Project</author> <author>Joomla! Project</author>
<creationDate>##DATE##</creationDate> <creationDate>##DATE##</creationDate>
@ -20,141 +20,204 @@
<fields name="params"> <fields name="params">
<fieldset name="basic"> <fieldset name="basic">
<field <field
name="catid" name="catid"
type="category" type="category"
extension="com_weblinks" extension="com_weblinks"
required="true" required="true"
label="JCATEGORY" label="JCATEGORY"
description="MOD_WEBLINKS_FIELD_CATEGORY_DESC" /> description="MOD_WEBLINKS_FIELD_CATEGORY_DESC" />
<field <field
name="count" name="groupby"
type="text" type="radio"
default="5" class="btn-group btn-group-yesno"
label="MOD_WEBLINKS_FIELD_COUNT_LABEL" default="0"
description="MOD_WEBLINKS_FIELD_COUNT_DESC" /> label="MOD_WEBLINKS_FIELD_GROUPBY_LABEL"
<field description="MOD_WEBLINKS_FIELD_GROUPBY_DESC">
name="ordering"
type="list"
default="title"
label="MOD_WEBLINKS_FIELD_ORDERING_LABEL"
description="MOD_WEBLINKS_FIELD_ORDERING_DESC">
<option <option
value="title">JGLOBAL_TITLE</option> value="1">JYES</option>
<option <option
value="order">MOD_WEBLINKS_FIELD_VALUE_ORDER</option> value="0">JNO</option>
<option
value="hits">MOD_WEBLINKS_FIELD_VALUE_HITS</option>
</field> </field>
<field <field
name="direction" name="groupby_showtitle"
type="list" type="radio"
default="asc" class="btn-group btn-group-yesno"
label="MOD_WEBLINKS_FIELD_ORDERDIRECTION_LABEL" default="1"
description="MOD_WEBLINKS_FIELD_ORDERDIRECTION_DESC"> label="MOD_WEBLINKS_FIELD_GROUPBYSHOWTITLE_LABEL"
description="MOD_WEBLINKS_FIELD_GROUPBYSHOWTITLE_DESC">
<option <option
value="asc">MOD_WEBLINKS_FIELD_VALUE_ASCENDING</option> value="1">JYES</option>
<option <option
value="desc">MOD_WEBLINKS_FIELD_VALUE_DESCENDING</option> value="0">JNO</option>
</field> </field>
<field <field
name="target" name="groupby_ordering"
type="list" type="list"
default="3" default="c.lft"
label="MOD_WEBLINKS_FIELD_TARGET_LABEL" label="MOD_WEBLINKS_FIELD_GROUPBYORDERING_LABEL"
description="MOD_WEBLINKS_FIELD_TARGET_DESC"> description="MOD_WEBLINKS_FIELD_GROUPBYORDERING_DESC">
<option <option
value="1">JBROWSERTARGET_NEW</option> value="c.title">JGLOBAL_TITLE</option>
<option <option
value="2">JBROWSERTARGET_POPUP</option> value="c.lft">MOD_WEBLINKS_FIELD_VALUE_ORDER</option>
<option
value="3">JBROWSERTARGET_PARENT</option>
</field> </field>
<field <field
name="follow" name="groupby_direction"
type="list" type="list"
default="0" default="asc"
label="MOD_WEBLINKS_FIELD_FOLLOW_LABEL" label="MOD_WEBLINKS_FIELD_GROUPBYDIRECTION_LABEL"
description="MOD_WEBLINKS_FIELD_FOLLOW_DESC"> description="MOD_WEBLINKS_FIELD_GROUPBYDIRECTION_DESC">
<option <option
value="follow">MOD_WEBLINKS_FIELD_VALUE_FOLLOW</option> value="asc">MOD_WEBLINKS_FIELD_VALUE_ASCENDING</option>
<option <option
value="nofollow">MOD_WEBLINKS_FIELD_VALUE_NOFOLLOW</option> value="desc">MOD_WEBLINKS_FIELD_VALUE_DESCENDING</option>
</field> </field>
<field <field
name="description" name="groupby_columns"
type="radio" type="list"
class="btn-group btn-group-yesno" default="3"
default="0" label="MOD_WEBLINKS_FIELD_COLUMNS_LABEL"
label="MOD_WEBLINKS_FIELD_DESCRIPTION_LABEL" description="MOD_WEBLINKS_FIELD_COLUMNS_DESC">
description="MOD_WEBLINKS_FIELD_DESCRIPTION_DESC">
<option <option
value="1">JSHOW</option> value="1">1</option>
<option
value="2">2</option>
<option <option
value="0">JHIDE</option> value="3">3</option>
<option
value="4">4</option>
<option
value="6">6</option>
</field> </field>
<field <field
name="hits" name="count"
type="radio" type="text"
class="btn-group btn-group-yesno" default="5"
default="0" label="MOD_WEBLINKS_FIELD_COUNT_LABEL"
label="MOD_WEBLINKS_FIELD_HITS_LABEL" description="MOD_WEBLINKS_FIELD_COUNT_DESC" />
description="MOD_WEBLINKS_FIELD_HITS_DESC"> <field
name="ordering"
type="list"
default="title"
label="MOD_WEBLINKS_FIELD_ORDERING_LABEL"
description="MOD_WEBLINKS_FIELD_ORDERING_DESC">
<option <option
value="1">JSHOW</option> value="title">JGLOBAL_TITLE</option>
<option <option
value="0">JHIDE</option> value="order">MOD_WEBLINKS_FIELD_VALUE_ORDER</option>
<option
value="hits">MOD_WEBLINKS_FIELD_VALUE_HITS</option>
</field>
<field
name="direction"
type="list"
default="asc"
label="MOD_WEBLINKS_FIELD_ORDERDIRECTION_LABEL"
description="MOD_WEBLINKS_FIELD_ORDERDIRECTION_DESC">
<option
value="asc">MOD_WEBLINKS_FIELD_VALUE_ASCENDING</option>
<option
value="desc">MOD_WEBLINKS_FIELD_VALUE_DESCENDING</option>
</field>
<field
name="target"
type="list"
default="3"
label="MOD_WEBLINKS_FIELD_TARGET_LABEL"
description="MOD_WEBLINKS_FIELD_TARGET_DESC">
<option
value="1">JBROWSERTARGET_NEW</option>
<option
value="2">JBROWSERTARGET_POPUP</option>
<option
value="3">JBROWSERTARGET_PARENT</option>
</field>
<field
name="follow"
type="list"
default="0"
label="MOD_WEBLINKS_FIELD_FOLLOW_LABEL"
description="MOD_WEBLINKS_FIELD_FOLLOW_DESC">
<option
value="follow">MOD_WEBLINKS_FIELD_VALUE_FOLLOW</option>
<option
value="nofollow">MOD_WEBLINKS_FIELD_VALUE_NOFOLLOW</option>
</field>
<field
name="description"
type="radio"
class="btn-group btn-group-yesno"
default="0"
label="MOD_WEBLINKS_FIELD_DESCRIPTION_LABEL"
description="MOD_WEBLINKS_FIELD_DESCRIPTION_DESC">
<option
value="1">JSHOW</option>
<option
value="0">JHIDE</option>
</field>
<field
name="hits"
type="radio"
class="btn-group btn-group-yesno"
default="0"
label="MOD_WEBLINKS_FIELD_HITS_LABEL"
description="MOD_WEBLINKS_FIELD_HITS_DESC">
<option
value="1">JSHOW</option>
<option
value="0">JHIDE</option>
</field> </field>
<field <field
name="count_clicks" name="count_clicks"
type="list" type="list"
class="chzn-color" class="chzn-color"
default="0" default="0"
label="MOD_WEBLINKS_FIELD_COUNTCLICKS_LABEL" label="MOD_WEBLINKS_FIELD_COUNTCLICKS_LABEL"
description="MOD_WEBLINKS_FIELD_COUNTCLICKS_DESC"> description="MOD_WEBLINKS_FIELD_COUNTCLICKS_DESC">
<option
value="">JGLOBAL_USE_GLOBAL</option>
<option <option
value="">JGLOBAL_USE_GLOBAL</option> value="0">JNO</option>
<option <option
value="0">JNO</option> value="1">JYES</option>
<option
value="1">JYES</option>
</field> </field>
</fieldset> </fieldset>
<fieldset <fieldset
name="advanced"> name="advanced">
<field <field
name="layout" name="layout"
type="modulelayout" type="modulelayout"
label="JFIELD_ALT_LAYOUT_LABEL" label="JFIELD_ALT_LAYOUT_LABEL"
description="JFIELD_ALT_MODULE_LAYOUT_DESC" /> description="JFIELD_ALT_MODULE_LAYOUT_DESC" />
<field <field
name="moduleclass_sfx" name="moduleclass_sfx"
type="textarea" rows="3" type="textarea" rows="3"
label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL" label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC" /> description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC" />
<field <field
name="cache" name="cache"
type="list" type="list"
default="1" default="1"
label="COM_MODULES_FIELD_CACHING_LABEL" label="COM_MODULES_FIELD_CACHING_LABEL"
description="COM_MODULES_FIELD_CACHING_DESC"> description="COM_MODULES_FIELD_CACHING_DESC">
<option <option
value="1">JGLOBAL_USE_GLOBAL</option> value="1">JGLOBAL_USE_GLOBAL</option>
<option <option
value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option> value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
</field> </field>
<field <field
name="cache_time" name="cache_time"
type="text" type="text"
default="900" default="900"
label="COM_MODULES_FIELD_CACHE_TIME_LABEL" label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
description="COM_MODULES_FIELD_CACHE_TIME_DESC" /> description="COM_MODULES_FIELD_CACHE_TIME_DESC" />
<field <field
name="cachemode" name="cachemode"
type="hidden" type="hidden"
default="static"> default="static">
<option <option
value="static"></option> value="static"></option>
</field> </field>
</fieldset> </fieldset>
</fields> </fields>

151
src/modules/mod_weblinks/tmpl/default.php
View File

@ -9,47 +9,120 @@
defined('_JEXEC') or die; defined('_JEXEC') or die;
?> ?>
<ul class="weblinks<?php echo $moduleclass_sfx; ?>"> <?php
<?php if($params->get('groupby', 0)) :
foreach ($list as $item) :
?>
<li>
<?php
$link = $item->link;
switch ($params->get('target', 3)) $cats = array();
{ $cols = $params->get('groupby_columns', 3);
case 1:
// Open in a new window
echo '<a href="' . $link . '" target="_blank" rel="' . $params->get('follow', 'nofollow') . '">' .
htmlspecialchars($item->title, ENT_COMPAT, 'UTF-8') . '</a>';
break;
case 2: foreach ($list as $l)
// Open in a popup window $cats[] = array('catid' => $l->catid, 'title' => $l->category_title);
echo "<a href=\"#\" onclick=\"window.open('" . $link . "', '', 'toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=780,height=550'); return false\">" .
htmlspecialchars($item->title, ENT_COMPAT, 'UTF-8') . '</a>';
break;
default: $cats = array_values(array_map('unserialize', array_unique(array_map('serialize', $cats))));
// Open in parent window
echo '<a href="' . $link . '" rel="' . $params->get('follow', 'nofollow') . '">' .
htmlspecialchars($item->title, ENT_COMPAT, 'UTF-8') . '</a>';
break;
}
if ($params->get('description', 0)) foreach ($cats as $k => $cat) :
{
echo nl2br($item->description);
}
if ($params->get('hits', 0)) $items = array();
{
echo '(' . $item->hits . ' ' . JText::_('MOD_WEBLINKS_HITS') . ')'; foreach ($list as $item)
} if ($item->catid == $cat['catid'])
?> $items[] = $item;
</li> ?>
<?php <?php if($cols > 1) : ?>
endforeach; <?php if($k % $cols == 0) : ?>
?> <div class="row row-fluid">
</ul> <?php endif; ?>
<div class="span<?php echo (12 / $cols); ?>">
<?php endif; ?>
<?php if($params->get('groupby_showtitle', 1)) : ?>
<h4><?php echo htmlspecialchars($cat['title']); ?></h4>
<?php endif; ?>
<ul class="weblinks<?php echo $moduleclass_sfx; ?>">
<?php foreach ($items as $item) : ?>
<li>
<?php
$link = $item->link;
switch ($item->params->get('target', 3))
{
case 1:
// Open in a new window
echo '<a href="' . $link . '" target="_blank" rel="' . $params->get('follow', 'nofollow') . '">' .
htmlspecialchars($item->title, ENT_COMPAT, 'UTF-8') . '</a>';
break;
case 2:
// Open in a popup window
echo "<a href=\"#\" onclick=\"window.open('" . $link . "', '', 'toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=780,height=550'); return false\">" .
htmlspecialchars($item->title, ENT_COMPAT, 'UTF-8') . '</a>';
break;
default:
// Open in parent window
echo '<a href="' . $link . '" rel="' . $params->get('follow', 'nofollow') . '">' .
htmlspecialchars($item->title, ENT_COMPAT, 'UTF-8') . '</a>';
break;
}
if ($params->get('description', 0))
{
echo nl2br($item->description);
}
if ($params->get('hits', 0))
{
echo '(' . $item->hits . ' ' . JText::_('MOD_WEBLINKS_HITS') . ')';
}
?>
</li>
<?php endforeach; ?>
</ul>
<?php if($cols > 1) : ?>
</div>
<?php if(($k + 1) % $cols == 0 || $k == count($cats) - 1) : ?>
</div>
<?php endif; ?>
<?php endif; ?>
<?php endforeach; ?>
<?php else : ?>
<ul class="weblinks<?php echo $moduleclass_sfx; ?>">
<?php foreach ($list as $item) : ?>
<li>
<?php
$link = $item->link;
switch ($item->params->get('target', 3))
{
case 1:
// Open in a new window
echo '<a href="' . $link . '" target="_blank" rel="' . $params->get('follow', 'nofollow') . '">' .
htmlspecialchars($item->title, ENT_COMPAT, 'UTF-8') . '</a>';
break;
case 2:
// Open in a popup window
echo "<a href=\"#\" onclick=\"window.open('" . $link . "', '', 'toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=780,height=550'); return false\">" .
htmlspecialchars($item->title, ENT_COMPAT, 'UTF-8') . '</a>';
break;
default:
// Open in parent window
echo '<a href="' . $link . '" rel="' . $params->get('follow', 'nofollow') . '">' .
htmlspecialchars($item->title, ENT_COMPAT, 'UTF-8') . '</a>';
break;
}
if ($params->get('description', 0))
{
echo nl2br($item->description);
}
if ($params->get('hits', 0))
{
echo '(' . $item->hits . ' ' . JText::_('MOD_WEBLINKS_HITS') . ')';
}
?>
</li>
<?php endforeach; ?>
</ul>
<?php endif; ?>

2
src/pkg_weblinks.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<extension type="package" version="3.0" method="upgrade"> <extension type="package" version="3.5" method="upgrade">
<name>pkg_weblinks</name> <name>pkg_weblinks</name>
<packagename>weblinks</packagename> <packagename>weblinks</packagename>
<creationDate>December 2012</creationDate> <creationDate>December 2012</creationDate>

2
src/plugins/finder/weblinks/weblinks.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<extension version="3.1" type="plugin" group="finder" method="upgrade"> <extension version="3.5" type="plugin" group="finder" method="upgrade">
<name>plg_finder_weblinks</name> <name>plg_finder_weblinks</name>
<author>Joomla! Project</author> <author>Joomla! Project</author>
<creationDate>##DATE##</creationDate> <creationDate>##DATE##</creationDate>

2
src/plugins/search/weblinks/weblinks.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<extension version="3.1" type="plugin" group="search" method="upgrade"> <extension version="3.5" type="plugin" group="search" method="upgrade">
<name>plg_search_weblinks</name> <name>plg_search_weblinks</name>
<author>Joomla! Project</author> <author>Joomla! Project</author>
<creationDate>##DATE##</creationDate> <creationDate>##DATE##</creationDate>

2
tests/acceptance/administrator/AdministratorCategoriesCest.php
View File

@ -185,6 +185,6 @@ class AdministratorCategoriesCest
$I->amOnPage('administrator/index.php?option=com_categories&extension=com_weblinks'); $I->amOnPage('administrator/index.php?option=com_categories&extension=com_weblinks');
$I->clickToolbarButton('New'); $I->clickToolbarButton('New');
$I->waitForText('Web Links: New Category', '30', ['css' => 'h1']); $I->waitForText('Web Links: New Category', '30', ['css' => 'h1']);
$I->verifyAvailableTabs(['Category', 'Publishing', 'Permissions', 'Options']); $I->verifyAvailableTabs(['Category', 'Options', 'Publishing', 'Permissions']);
} }
} }

24
tests/acceptance/administrator/AdministratorSmartSearchCest.php
View File

@ -20,8 +20,9 @@ class AdministratorSmartSearchCest
/** /**
* Before the tests proper, switch the WYSIWYG editor off. This is to make it easier to create test content. * Before the tests proper, switch the WYSIWYG editor off. This is to make it easier to create test content.
*/ */
public function administratorDisableEditor(\Step\Acceptance\weblink $I) public function administratorDisableEditor(\Step\Acceptance\weblink $I, $scenario)
{ {
$scenario->skip('Temporarilly skipped, see: https://github.com/joomla-extensions/weblinks/issues/239');
$I->am('Administrator'); $I->am('Administrator');
$I->wantToTest('Disable the editor before the tests proper'); $I->wantToTest('Disable the editor before the tests proper');
@ -59,8 +60,9 @@ class AdministratorSmartSearchCest
/** /**
* Before the tests proper, the Weblinks Smart Search plugin must be enabled. * Before the tests proper, the Weblinks Smart Search plugin must be enabled.
*/ */
public function administratorEnableSmartsearchWeblinksPlugin(\Step\Acceptance\weblink $I) public function administratorEnableSmartsearchWeblinksPlugin(\Step\Acceptance\weblink $I, $scenario)
{ {
$scenario->skip('Temporarilly skipped, see: https://github.com/joomla-extensions/weblinks/issues/239');
$I->am('Administrator'); $I->am('Administrator');
$I->wantToTest('Enabling the Smart Search Weblinks plugin'); $I->wantToTest('Enabling the Smart Search Weblinks plugin');
@ -79,8 +81,9 @@ class AdministratorSmartSearchCest
/** /**
* Purge the index. * Purge the index.
*/ */
public function administratorPurgeIndex(\Step\Acceptance\weblink $I) public function administratorPurgeIndex(\Step\Acceptance\weblink $I, $scenario)
{ {
$scenario->skip('Temporarilly skipped, see: https://github.com/joomla-extensions/weblinks/issues/239');
$I->am('Administrator'); $I->am('Administrator');
$I->wantToTest('Purging the index'); $I->wantToTest('Purging the index');
@ -96,8 +99,9 @@ class AdministratorSmartSearchCest
$I->see('All items have been successfully deleted', ['class' => 'alert-message']); $I->see('All items have been successfully deleted', ['class' => 'alert-message']);
} }
public function administratorCreateWeblink(\Step\Acceptance\weblink $I) public function administratorCreateWeblink(\Step\Acceptance\weblink $I, $scenario)
{ {
$scenario->skip('Temporarilly skipped, see: https://github.com/joomla-extensions/weblinks/issues/239');
$I->doAdministratorLogin(); $I->doAdministratorLogin();
$I->createWeblink($this->title, $this->url); $I->createWeblink($this->title, $this->url);
@ -106,8 +110,9 @@ class AdministratorSmartSearchCest
/** /**
* Index the current content. * Index the current content.
*/ */
public function administratorRunTheIndexer(\Step\Acceptance\weblink $I) public function administratorRunTheIndexer(\Step\Acceptance\weblink $I, $scenario)
{ {
$scenario->skip('Temporarilly skipped, see: https://github.com/joomla-extensions/weblinks/issues/239');
$I->am('Administrator'); $I->am('Administrator');
$I->wantToTest('Smart Search Indexer'); $I->wantToTest('Smart Search Indexer');
@ -125,8 +130,9 @@ class AdministratorSmartSearchCest
/** /**
* After the tests, the Smart Search content plugin must be disabled, ready for the next test. * After the tests, the Smart Search content plugin must be disabled, ready for the next test.
*/ */
public function administratorDisableContentPlugin(\Step\Acceptance\weblink $I) public function administratorDisableContentPlugin(\Step\Acceptance\weblink $I, $scenario)
{ {
$scenario->skip('Temporarilly skipped, see: https://github.com/joomla-extensions/weblinks/issues/239');
$I->am('Administrator'); $I->am('Administrator');
$I->wantToTest('Disabling the Smart Search content plugin, ready for the next test run'); $I->wantToTest('Disabling the Smart Search content plugin, ready for the next test run');
@ -145,8 +151,9 @@ class AdministratorSmartSearchCest
/** /**
* After the tests, the Smart Search content plugin must be disabled, ready for the next test. * After the tests, the Smart Search content plugin must be disabled, ready for the next test.
*/ */
public function administratorDisableSmartsearchWeblinksPlugin(\Step\Acceptance\weblink $I) public function administratorDisableSmartsearchWeblinksPlugin(\Step\Acceptance\weblink $I, $scenario)
{ {
$scenario->skip('Temporarilly skipped, see: https://github.com/joomla-extensions/weblinks/issues/239');
$I->am('Administrator'); $I->am('Administrator');
$I->wantToTest('Disabling the Smart Search content plugin, ready for the next test run'); $I->wantToTest('Disabling the Smart Search content plugin, ready for the next test run');
@ -162,8 +169,9 @@ class AdministratorSmartSearchCest
$I->waitForText('Plugin successfully disabled', 30, ['class' => 'alert-message']); $I->waitForText('Plugin successfully disabled', 30, ['class' => 'alert-message']);
} }
public function cleanUp(\Step\Acceptance\weblink $I) public function cleanUp(\Step\Acceptance\weblink $I, $scenario)
{ {
$scenario->skip('Temporarilly skipped, see: https://github.com/joomla-extensions/weblinks/issues/239');
$I->doAdministratorLogin(); $I->doAdministratorLogin();
$I->administratorDeleteWeblink($this->title); $I->administratorDeleteWeblink($this->title);

4
tests/acceptance/administrator/AdministratorWeblinksCest.php
View File

@ -99,7 +99,9 @@ class AdministratorWeblinksCest
$I->amOnPage('administrator/index.php?option=com_weblinks'); $I->amOnPage('administrator/index.php?option=com_weblinks');
$I->waitForText('Web Links','30',['css' => 'h1']); $I->waitForText('Web Links','30',['css' => 'h1']);
$I->expectTo('see weblinks page'); $I->expectTo('see weblinks page');
$I->selectOptionInChosen('- Select Status -', 'Trashed'); $I->click('Search Tools');
$I->wait(2);
$I->selectOptionInChosenById('filter_published', 'Trashed');
$I->amGoingTo('Search the just saved weblink'); $I->amGoingTo('Search the just saved weblink');
$I->searchForItem($this->title); $I->searchForItem($this->title);
$I->waitForText('Web Links','30',['css' => 'h1']); $I->waitForText('Web Links','30',['css' => 'h1']);