Compare commits

...

43 Commits

Author SHA1 Message Date
Carsten Götzinger 51eb572d73 Updated composer.json with repositories block 2018-04-23 07:09:21 +02:00
Carsten Götzinger 2de2194556 Updated composer.json with repositories block 2018-04-23 07:00:45 +02:00
Carsten Götzinger c0cae89ce5 Updated composer.json with repositories block 2018-04-23 06:59:33 +02:00
Carsten Götzinger 9e3946a03d Updated composer.json with repositories block 2018-04-23 06:58:08 +02:00
Carsten Götzinger e195e77ee7 Updated composer.json with repositories block 2018-04-23 06:32:05 +02:00
Carsten Götzinger e42a1753d1 Final commit?! 2018-02-15 13:58:00 +01:00
Carsten Götzinger 06fb02136c ID korrigiert 2018-02-15 13:47:24 +01:00
Carsten Götzinger 3c4848f0be Überflüssiges div entfernt 2018-02-15 13:44:19 +01:00
Carsten Götzinger 09d1e7ca4b Test entfernt 2018-02-15 13:42:24 +01:00
Carsten Götzinger 8cf0ca8014 test 2018-02-15 13:41:03 +01:00
Carsten Götzinger c6057936d7 news_full template 2018-02-15 13:38:39 +01:00
Carsten Götzinger ad82178c75 korrektur 2018-02-15 13:25:50 +01:00
Carsten Götzinger 03dda889a9 Templates korrigiert 2018-02-15 12:44:10 +01:00
Carsten Götzinger 129146a92c Verzicht auf article_rateit_* 2018-02-15 12:39:33 +01:00
Carsten Götzinger f4a1ff3c73 added templates 2018-02-15 12:32:42 +01:00
Carsten Götzinger f16141a390 Templates überarbeitet 2018-02-15 12:28:15 +01:00
Carsten Götzinger 3c75287785 deleted exportEXCEL.gif 2018-02-15 10:30:33 +01:00
Carsten Götzinger ac7e49cabc size attribute für exportEXCEL 2018-02-15 10:27:26 +01:00
Carsten Götzinger 3e3377bfa8 added exportEXCEL.svg 2018-02-15 10:24:21 +01:00
Carsten Götzinger dfdc956121 Use svg-image in backend 2018-02-15 10:20:25 +01:00
Carsten Götzinger 3e63d90c19 Backend url generation fixed 2018-02-15 09:33:14 +01:00
Carsten Götzinger 3bd810e662 fix BackenModule 2018-02-15 08:15:13 +01:00
Carsten Götzinger 78a97b83c4 fix BackenModule 2018-02-15 07:33:58 +01:00
Carsten Götzinger d4aafb186f fix BackenModule 2018-02-15 07:21:44 +01:00
Carsten Götzinger 4460c9f8bb send response in ajax Controller/AjaxRateItController.php 2018-02-15 07:08:22 +01:00
Carsten Götzinger 25403155b1 JsonResponse angepasst 2018-02-15 06:57:39 +01:00
Carsten Götzinger 01dc5be820 Korrektes JSON zurückgeben 2018-02-15 06:27:02 +01:00
Carsten Götzinger 1ab4a1c6de Umstellung auf eigene Ajax-Verarbeitung über Route "rateit" 2018-02-15 06:16:05 +01:00
Carsten Götzinger 1dd2979664 Umstellung auf eigene Ajax-Verarbeitung über Route "rateit" 2018-02-15 06:14:26 +01:00
Carsten Götzinger 107e32c3be Event-Verarbeitung 2018-02-15 05:01:49 +01:00
Carsten Götzinger 38d4df8232 Anpassung Pfad zu public Ressourcen 2018-02-14 16:17:58 +01:00
Carsten Götzinger 9cef234103 GROUP BY korrigiert 2018-02-14 16:11:30 +01:00
Carsten Götzinger c63c4dd127 Klasse tl_settings_rateit hinzugefügt 2018-02-14 13:36:52 +01:00
Carsten Götzinger 08fd8c1319 use statement korrigiert 2018-02-14 13:14:48 +01:00
Carsten Götzinger 93e4d2dd63 Imports für DcaHelper ergänzt 2018-02-14 12:51:55 +01:00
Carsten Götzinger d15a1b43d2 Klassenname in config.php korrigiert 2018-02-14 09:55:54 +01:00
Carsten Götzinger ff5be550eb runonce integriert 2018-02-14 09:41:11 +01:00
Carsten Götzinger 02cf727e11 Umstellung auf Events für simple-ajax 2018-02-14 09:32:24 +01:00
Carsten Götzinger 7915541c6e composer.json korrigiert 2018-02-14 09:00:31 +01:00
Carsten Götzinger c1f05e556c Vendor-Ordner zu .gitignore hinzugefügt 2018-02-14 08:32:25 +01:00
Carsten Götzinger b1d3d540bb Umstellung auf Contao 4 Bundle 2018-02-14 08:30:39 +01:00
Carsten Götzinger b922fe527c Updated to xls_export 3.1.0 2018-02-14 05:24:21 +01:00
Carsten Götzinger 2a4001f77c Updated composer.json 2018-02-14 05:16:50 +01:00
140 changed files with 1176 additions and 2743 deletions

3
.gitignore vendored Normal file
View File

@ -0,0 +1,3 @@
/.project
/vendor

View File

@ -1,9 +1,18 @@
{
"name":"cgo-it/rate-it",
"description":"RateIt extension for the Contao Open Source CMS",
"keywords":["contao", "rating", "rateit", "bewertung"],
"type":"contao-module",
"name":"cgo-it/contao-rate-it-bundle",
"description":"RateIt extension for the Contao Open Source CMS as contao 4 bundle",
"keywords":["contao", "rating", "rateit", "bewertung", "bundle"],
"type":"contao-bundle",
"homepage":"https://cgo-it.de",
"license":"LGPL-3.0+",
"prefer-stable": true,
"config": {
"preferred-install": {
"cgo-it/*": "dist",
"*": "dist"
},
"gitlab-domains": [ "git.cgo-it.de" ]
},
"authors":[
{
"name":"cgo IT",
@ -13,34 +22,46 @@
}
],
"support": {
"email": "info@cgo-it.de",
"issues": "https://bitbucket.org/cgo-it/contao-rate-it/issues?status=new&status=open",
"issues": "https://git.cgo-it.de/contao/rate-it/issues",
"forum": "https://community.contao.org/de/showthread.php?38471-Rate-It",
"source": "https://bitbucket.org/cgo-it/contao-rate-it/src"
"source": "https://git.cgo-it.de/contao/rate-it.git"
},
"require":{
"php":">=5.3",
"contao/core":">=3.0",
"contao-community-alliance/composer-plugin": "~2.0",
"cgo-it/xls_export":"3.0.0"
"php":">=7.0",
"contao/core-bundle": "^4.4",
"cgo-it/contao-xls_export-bundle": "^4.0"
},
"replace": {
"cgo-it/rate-it": "<3.5.4"
"require-dev": {
"contao/manager-plugin": "^2.0"
},
"conflict": {
"contao/core": "2.11.*"
"conflict": {
"contao/core": "*",
"contao/manager-plugin": "<2.0 || >=3.0"
},
"extra":{
"contao": {
"sources":{
"":"system/modules/rateit"
},
"transifex":{
"project": "rateit",
"prefix": "core-",
"languages_cto": "languages",
"languages_tx": "languages"
}
"repositories": [
{
"type": "gitlab",
"url": "https://git.cgo-it.de/contao/rate-it.git"
}
],
"autoload": {
"psr-4": {
"cgoIT\\rateit\\": "src/"
},
"classmap": [
"src/Resources/contao/"
],
"exclude-from-classmap": [
"src/Resources/contao/config/",
"src/Resources/contao/dca/",
"src/Resources/contao/languages/",
"src/Resources/contao/templates/"
]
},
"extra": {
"contao": {
"runonce": ["src/Resources/contao/runonce/create-initial-data.php"]
},
"contao-manager-plugin": "cgoIT\\rateit\\ContaoManagerPlugin"
}
}

View File

@ -1,7 +0,0 @@
;;
; Configure what you want the autoload creator to register
;;
register_namespaces = true
register_classes = true
register_templates = true

View File

@ -1,73 +0,0 @@
<?php
/**
* Contao Open Source CMS
*
* Copyright (c) 2005-2014 Leo Feyer
*
* @package Rateit
* @link https://contao.org
* @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
*/
/**
* Register the namespaces
*/
ClassLoader::addNamespaces(array
(
'cgoIT',
));
/**
* Register the classes
*/
ClassLoader::addClasses(array
(
// Classes
'cgoIT\rateit\DcaHelper' => 'system/modules/rateit/classes/DcaHelper.php',
'cgoIT\rateit\RateItArticle' => 'system/modules/rateit/classes/RateItArticle.php',
'cgoIT\rateit\RateItBackend' => 'system/modules/rateit/classes/RateItBackend.php',
'cgoIT\rateit\RateItCE' => 'system/modules/rateit/classes/RateItCE.php',
'cgoIT\rateit\RateItFaq' => 'system/modules/rateit/classes/RateItFaq.php',
'cgoIT\rateit\RateItFrontend' => 'system/modules/rateit/classes/RateItFrontend.php',
'cgoIT\rateit\RateItHybrid' => 'system/modules/rateit/classes/RateItHybrid.php',
'cgoIT\rateit\RateItModule' => 'system/modules/rateit/classes/RateItModule.php',
'cgoIT\rateit\RateItNews' => 'system/modules/rateit/classes/RateItNews.php',
'cgoIT\rateit\RateItPage' => 'system/modules/rateit/classes/RateItPage.php',
'cgoIT\rateit\RateItRating' => 'system/modules/rateit/classes/RateItRating.php',
'cgoIT\rateit\RateItBackendModule' => 'system/modules/rateit/classes/RateItBackendModule.php',
'cgoIT\rateit\RateItTopRatingsModule' => 'system/modules/rateit/classes/RateItTopRatingsModule.php',
'cgoIT\rateit\RateIt' => 'system/modules/rateit/public/php/rateit.php',
'simple_html_dom' => 'system/modules/rateit/classes/extern/simple_html_dom.php',
));
/**
* Register the templates
*/
TemplateLoader::addFiles(array
(
'article_rateit_default' => 'system/modules/rateit/templates',
'article_rateit_default_microdata' => 'system/modules/rateit/templates',
'gallery_rateit_default' => 'system/modules/rateit/templates',
'j_colorbox_rateit' => 'system/modules/rateit/templates',
'mod_article_list_rateit' => 'system/modules/rateit/templates',
'mod_article_rateit_default_microdata_teaser' => 'system/modules/rateit/templates',
'mod_article_rateit_default_teaser' => 'system/modules/rateit/templates',
'mod_rateit_top_ratings' => 'system/modules/rateit/templates',
'moo_mediabox_rateit' => 'system/modules/rateit/templates',
'news_full_rateit' => 'system/modules/rateit/templates',
'news_full_rateit_microdata' => 'system/modules/rateit/templates',
'news_latest_rateit' => 'system/modules/rateit/templates',
'news_latest_rateit_microdata' => 'system/modules/rateit/templates',
'news_short_rateit' => 'system/modules/rateit/templates',
'news_short_rateit_microdata' => 'system/modules/rateit/templates',
'news_simple_rateit' => 'system/modules/rateit/templates',
'news_simple_rateit_microdata' => 'system/modules/rateit/templates',
'rateitbe_ratinglist' => 'system/modules/rateit/templates',
'rateitbe_ratingview' => 'system/modules/rateit/templates',
'rateit_default' => 'system/modules/rateit/templates',
'rateit_microdata' => 'system/modules/rateit/templates',
));

Binary file not shown.

Before

Width:  |  Height:  |  Size: 282 B

View File

@ -1,139 +0,0 @@
<?php
/**
* Contao Open Source CMS
* Copyright (C) 2005-2011 Leo Feyer
*
* Formerly known as TYPOlight Open Source CMS.
*
* This program is free software: you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation, either
* version 3 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this program. If not, please visit the Free
* Software Foundation website at <http://www.gnu.org/licenses/>.
*
* PHP version 5
* @copyright Leo Unglaub 2012
* @author Leo Unglaub <leo@leo-unglaub.net>
* @package simple_ajax
* @license LGPL
*/
// simple trick for Contao < 2.10
$arrPost = $_POST;
unset($_POST);
// inizialize the contao framework
define('TL_MODE', 'FE');
require('../../../../initialize.php');
// write the post data back into the array
$_POST = $arrPost;
/**
* Class RateitAjax
* Contain methods to catch ajax requests and send responses back to the client.
*
* Description
* ```````````
*
* The usage of the RateitAjax extensions is very easy. The extension provides
* the hook $GLOBALS['TL_HOOKS']['rateitAjax'] for extension developers. You
* simply have to register your class/method and the extension will call
* your class if there is an incomming ajax request.
*
* You simply have to deside if it's an ajax request for your module and return
* the data you want.
*
* There are a few thinks you should know about the extension:
* * YOU have the full controll over the response. That also means
* that you have to set the correct header.
* * YOU have to terminate the request after you have send the response.
* * If the ajax request is not for your method you simply have nothing to
* * return.
*
*
* Usage
* `````
* // config.php
* $GLOBALS['TL_HOOKS']['rateitAjax'][] = array('MyClass', 'myMethod');
*
* // MyClass.php
* class MyClass extends System
* {
* public function myMethod()
* {
* if ($this->Input->get('acid') == 'myrequest')
* {
* $arrReturn = array('foo', 'bar', 'foobar');
*
* header('Content-Type: application/json');
* echo json_encode($arrReturn);
* exit;
* }
* }
* }
*/
class RateitAjax extends Controller
{
/**
* Call the parent constructor.
*
* !!! DON'T REMOVE THIS !!!
*
* If you remove this you get the following error message:
* Fatal error: Call to protected System::__construct() from invalid
* context
*
* @param void
* @return void
*/
public function __construct()
{
parent::__construct();
}
/**
* Get the ajax request and call all hooks
*
* @param void
* @return void
*/
public function run()
{
// check if a hook is registered
if (is_array($GLOBALS['TL_HOOKS']['rateitAjax']) && count($GLOBALS['TL_HOOKS']['rateitAjax']) > 0)
{
// execute every registered callback
foreach ($GLOBALS['TL_HOOKS']['rateitAjax'] as $callback)
{
$this->import($callback[0]);
$this->{$callback[0]}->{$callback[1]}();
}
}
// if there is no other output, we generate a 412 error response
header('HTTP/1.1 412 Precondition Failed');
die('Rateit Ajax: Invalid AJAX call.');
}
}
// create a rateit-ajax instance and run it
$objRateitAjax = new RateitAjax();
$objRateitAjax->run();
?>

View File

@ -1,177 +0,0 @@
<?php
/**
* Contao Open Source CMS
* Copyright (C) 2005-2011 Leo Feyer
*
* Formerly known as TYPOlight Open Source CMS.
*
* This program is free software: you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation, either
* version 3 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this program. If not, please visit the Free
* Software Foundation website at <http://www.gnu.org/licenses/>.
*
* PHP version 5
* @copyright cgo IT, 2013
* @author Carsten Götzinger (info@cgo-it.de)
* @package rateit
* @license GNU/LGPL
* @filesource
*/
namespace cgoIT\rateit;
define(RETURN_AJAX_HEADER, 'Content-Type: text/html');
class RateIt extends \Frontend {
var $allowDuplicates = false;
/**
* Initialize the controller
*/
public function __construct() {
parent::__construct();
$this->loadLanguageFile('default');
$this->allowDuplicates = $GLOBALS['TL_CONFIG']['rating_allow_duplicate_ratings'];
$this->allowDuplicatesForMembers = $GLOBALS['TL_CONFIG']['rating_allow_duplicate_ratings_for_members'];
}
/**
* doVote
*
* This is the function in charge of handling a vote and saving it to the
* database.
*
* NOTE: This method is meant to be called as part of an AJAX request. As
* such, it unitlizes the die() function to display its errors. THIS
* WOULD BE A VERY BAD FUNCTION TO CALL FROM WITHIN ANOTHER PAGE.
*
* @param integer id - The id of key to register a rating for.
* @param integer percent - The rating in percentages.
*/
function doVote() {
if ($this->Input->get('do') == 'rateit') {
$ip = $_SERVER['REMOTE_ADDR'];
$rkey = $this->Input->post('id');
$percent = $this->Input->post('vote');
$type = $this->Input->post('type');
//Make sure that the ratable ID is a number and not something crazy.
if (strstr($rkey, '|')) {
$arrRkey = explode('|', $rkey);
foreach ($arrRkey as $key) {
if (!is_numeric($key)) {
header(RETURN_AJAX_HEADER);
echo $GLOBALS['TL_LANG']['rateit']['error']['invalid_rating'];
exit;
}
$id = $rkey;
}
} else {
if (is_numeric($rkey)) {
$id = $rkey;
} else {
header(RETURN_AJAX_HEADER);
echo $GLOBALS['TL_LANG']['rateit']['error']['invalid_rating'];
exit;
}
}
//Make sure the percent is a number and under 100.
if (is_numeric($percent) && $percent < 101) {
$rating = $percent;
} else {
header(RETURN_AJAX_HEADER);
echo $GLOBALS['TL_LANG']['rateit']['error']['invalid_rating'];
exit;
}
//Make sure that the ratable type is 'page' or 'ce' or 'module'
if (!($type === 'page' || $type === 'article' || $type === 'ce' || $type === 'module' || $type === 'news' || $type === 'faq' || $type === 'galpic' || $type === 'news4ward')) {
header(RETURN_AJAX_HEADER);
echo $GLOBALS['TL_LANG']['rateit']['error']['invalid_type'];
exit;
}
$strHash = sha1(session_id() . (!$GLOBALS['TL_CONFIG']['disableIpCheck'] ? \Environment::get('ip') : '') . 'FE_USER_AUTH');
// FrontendUser auslesen
if (FE_USER_LOGGED_IN) {
$objUser = $this->Database->prepare("SELECT pid FROM tl_session WHERE hash=?")
->limit(1)
->execute($strHash);
if ($objUser->numRows) {
$userId = $objUser->pid;
}
}
$ratableKeyId = $this->Database->prepare('SELECT id FROM tl_rateit_items WHERE rkey=? and typ=?')
->execute($id, $type)
->fetchAssoc();
$canVote = false;
if (isset($userId)) {
$countUser = $this->Database->prepare('SELECT * FROM tl_rateit_ratings WHERE pid=? and memberid=?')
->execute($ratableKeyId['id'], $userId)
->count();
}
$countIp = $this->Database->prepare('SELECT * FROM tl_rateit_ratings WHERE pid=? and ip_address=?')
->execute($ratableKeyId['id'], $ip)
->count();
// Die with an error if the insert fails (duplicate IP or duplicate member id for a vote).
if ((!$this->allowDuplicatesForMembers && (isset($countUser) ? $countUser == 0 : false)) || ($this->allowDuplicatesForMembers && isset($userId))) {
// Insert the data.
$arrSet = array('pid' => $ratableKeyId['id'],
'tstamp' => time(),
'ip_address' => $ip,
'memberid' => isset($userId) ? $userId : null,
'rating' => $rating,
'createdat'=> time()
);
$this->Database->prepare('INSERT INTO tl_rateit_ratings %s')
->set($arrSet)
->execute();
} elseif (!isset($countUser) && ((!$this->allowDuplicates && $countIp == 0) || $this->allowDuplicates)) {
// Insert the data.
$arrSet = array('pid' => $ratableKeyId['id'],
'tstamp' => time(),
'ip_address' => $ip,
'memberid' => isset($userId) ? $userId : null,
'rating' => $rating,
'createdat'=> time()
);
$this->Database->prepare('INSERT INTO tl_rateit_ratings %s')
->set($arrSet)
->execute();
} else {
header(RETURN_AJAX_HEADER);
echo $GLOBALS['TL_LANG']['rateit']['error']['duplicate_vote'];
exit;
}
$this->import('rateit\\RateItFrontend', 'RateItFrontend');
$rating = $this->RateItFrontend->loadRating($id, $type);
header(RETURN_AJAX_HEADER);
echo $this->RateItFrontend->getStarMessage($rating);
exit;
}
}
}
?>

14
src/CgoITRateItBundle.php Normal file
View File

@ -0,0 +1,14 @@
<?php
namespace cgoIT\rateit;
use Symfony\Component\HttpKernel\Bundle\Bundle;
/**
* Configures the Contao aeo bundle.
*
* @author Carsten Götzinger
*/
class CgoITRateItBundle extends Bundle
{
}

View File

@ -0,0 +1,42 @@
<?php
namespace cgoIT\rateit;
use Contao\CoreBundle\ContaoCoreBundle;
use Contao\ManagerPlugin\Bundle\Config\BundleConfig;
use Contao\ManagerPlugin\Bundle\BundlePluginInterface;
use Contao\ManagerPlugin\Bundle\Parser\ParserInterface;
use Contao\ManagerPlugin\Routing\RoutingPluginInterface;
use Symfony\Component\Config\Loader\LoaderResolverInterface;
use Symfony\Component\HttpKernel\KernelInterface;
/**
* Plugin for the Contao Manager.
*
* @author Carsten Götzinger
*/
class ContaoManagerPlugin implements BundlePluginInterface, RoutingPluginInterface
{
/**
* {@inheritdoc}
*/
public function getBundles(ParserInterface $parser)
{
return [
BundleConfig::create(CgoITRateItBundle::class)
->setLoadAfter([ContaoCoreBundle::class])
->setReplace(['rate-it']),
];
}
/**
* {@inheritdoc}
*/
public function getRouteCollection(LoaderResolverInterface $resolver, KernelInterface $kernel)
{
return $resolver
->resolve(__DIR__.'/Resources/config/routing.yml')
->load(__DIR__.'/Resources/config/routing.yml')
;
}
}

View File

@ -0,0 +1,36 @@
<?php
/**
* Created by PhpStorm.
* User: darko
* Date: 23.10.17
* Time: 23:55
*/
namespace cgoIT\rateit\Controller;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Symfony\Component\HttpFoundation\Response;
use cgoIT\rateit\RateIt;
class AjaxRateItController extends Controller {
/**
* Handles rating requests.
*
* @return JsonResponse
*
* @Route("/rateit", name="ajax_rateit", defaults={"_scope" = "frontend", "_token_check" = false})
*/
public function ajaxAction() {
$this->container->get('contao.framework')->initialize();
$controller = new RateIt();
$response = $controller->doVote();
$response->send();
return new Response(null);
}
}

View File

@ -0,0 +1,3 @@
ajax_rateit:
resource: "@CgoITRateItBundle/Controller/"
type: annotation

View File

@ -0,0 +1,175 @@
<?php
/**
* Contao Open Source CMS
* Copyright (C) 2005-2011 Leo Feyer
*
* Formerly known as TYPOlight Open Source CMS.
*
* This program is free software: you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation, either
* version 3 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this program. If not, please visit the Free
* Software Foundation website at <http://www.gnu.org/licenses/>.
*
* PHP version 5
* @copyright cgo IT, 2013
* @author Carsten Götzinger (info@cgo-it.de)
* @package rateit
* @license GNU/LGPL
* @filesource
*/
namespace cgoIT\rateit;
use cgoIT\rateit\RateItFrontend;
use Symfony\Component\HttpFoundation\JsonResponse;
class RateIt extends \Frontend {
var $allowDuplicates = false;
var $rateItFrontend;
/**
* Initialize the controller
*/
public function __construct() {
parent::__construct();
// See #4099
if (!defined('BE_USER_LOGGED_IN'))
{
define('BE_USER_LOGGED_IN', false);
}
if (!defined('FE_USER_LOGGED_IN'))
{
define('FE_USER_LOGGED_IN', false);
}
$this->rateItFrontend = new RateItFrontend();
$this->loadLanguageFile('default');
$this->allowDuplicates = $GLOBALS['TL_CONFIG']['rating_allow_duplicate_ratings'];
$this->allowDuplicatesForMembers = $GLOBALS['TL_CONFIG']['rating_allow_duplicate_ratings_for_members'];
}
/**
* doVote
*
* This is the function in charge of handling a vote and saving it to the
* database.
*
* NOTE: This method is meant to be called as part of an AJAX request. As
* such, it unitlizes the die() function to display its errors. THIS
* WOULD BE A VERY BAD FUNCTION TO CALL FROM WITHIN ANOTHER PAGE.
*
* @param integer id - The id of key to register a rating for.
* @param integer percent - The rating in percentages.
*/
public function doVote() {
$ip = $_SERVER['REMOTE_ADDR'];
$rkey = $this->Input->post('id');
$percent = $this->Input->post('vote');
$type = $this->Input->post('type');
//Make sure that the ratable ID is a number and not something crazy.
if (strstr($rkey, '|')) {
$arrRkey = explode('|', $rkey);
foreach ($arrRkey as $key) {
if (!is_numeric($key)) {
return new JsonResponse($GLOBALS['TL_LANG']['rateit']['error']['invalid_rating']);
}
$id = $rkey;
}
} else {
if (is_numeric($rkey)) {
$id = $rkey;
} else {
return new JsonResponse($GLOBALS['TL_LANG']['rateit']['error']['invalid_rating']);
}
}
//Make sure the percent is a number and under 100.
if (is_numeric($percent) && $percent < 101) {
$rating = $percent;
} else {
return new JsonResponse($GLOBALS['TL_LANG']['rateit']['error']['invalid_rating']);
}
//Make sure that the ratable type is 'page' or 'ce' or 'module'
if (!($type === 'page' || $type === 'article' || $type === 'ce' || $type === 'module' || $type === 'news' || $type === 'faq' || $type === 'galpic' || $type === 'news4ward')) {
return new JsonResponse($GLOBALS['TL_LANG']['rateit']['error']['invalid_type']);
}
$strHash = sha1(session_id() . (!$GLOBALS['TL_CONFIG']['disableIpCheck'] ? \Environment::get('ip') : '') . 'FE_USER_AUTH');
// FrontendUser auslesen
if (FE_USER_LOGGED_IN) {
$objUser = $this->Database->prepare("SELECT pid FROM tl_session WHERE hash=?")
->limit(1)
->execute($strHash);
if ($objUser->numRows) {
$userId = $objUser->pid;
}
}
$ratableKeyId = $this->Database->prepare('SELECT id FROM tl_rateit_items WHERE rkey=? and typ=?')
->execute($id, $type)
->fetchAssoc();
$canVote = false;
if (isset($userId)) {
$countUser = $this->Database->prepare('SELECT * FROM tl_rateit_ratings WHERE pid=? and memberid=?')
->execute($ratableKeyId['id'], $userId)
->count();
}
$countIp = $this->Database->prepare('SELECT * FROM tl_rateit_ratings WHERE pid=? and ip_address=?')
->execute($ratableKeyId['id'], $ip)
->count();
// Die with an error if the insert fails (duplicate IP or duplicate member id for a vote).
if ((!$this->allowDuplicatesForMembers && (isset($countUser) ? $countUser == 0 : false)) || ($this->allowDuplicatesForMembers && isset($userId))) {
// Insert the data.
$arrSet = array('pid' => $ratableKeyId['id'],
'tstamp' => time(),
'ip_address' => $ip,
'memberid' => isset($userId) ? $userId : null,
'rating' => $rating,
'createdat'=> time()
);
$this->Database->prepare('INSERT INTO tl_rateit_ratings %s')
->set($arrSet)
->execute();
} elseif (!isset($countUser) && ((!$this->allowDuplicates && $countIp == 0) || $this->allowDuplicates)) {
// Insert the data.
$arrSet = array('pid' => $ratableKeyId['id'],
'tstamp' => time(),
'ip_address' => $ip,
'memberid' => isset($userId) ? $userId : null,
'rating' => $rating,
'createdat'=> time()
);
$this->Database->prepare('INSERT INTO tl_rateit_ratings %s')
->set($arrSet)
->execute();
} else {
return new JsonResponse($GLOBALS['TL_LANG']['rateit']['error']['duplicate_vote']);
}
$rating = $this->rateItFrontend->loadRating($id, $type);
return new JsonResponse($this->rateItFrontend->getStarMessage($rating));
}
}
?>

View File

@ -57,12 +57,6 @@ class RateItArticle extends RateItFrontend {
->fetchAssoc();
if ($arrArticle['addRating']) {
if ($objTemplate->multiMode && $objTemplate->showTeaser) {
$objTemplate->setName('mod_'.$arrArticle['rateit_template'].'_teaser');
} else {
$objTemplate->setName($arrArticle['rateit_template']);
}
$ratingId = $arrArticle['id'];
$rating = $this->loadRating($ratingId, 'article');
$stars = !$rating ? 0 : $this->percentToStars($rating['rating']);
@ -90,15 +84,15 @@ class RateItArticle extends RateItFrontend {
$objTemplate->rateit_rating_after = true;
}
$GLOBALS['TL_JAVASCRIPT'][] = 'system/modules/rateit/public/js/onReadyRateIt.js|static';
$GLOBALS['TL_JAVASCRIPT'][] = 'system/modules/rateit/public/js/rateit.js|static';
$GLOBALS['TL_CSS'][] = 'system/modules/rateit/public/css/rateit.min.css||static';
$GLOBALS['TL_JAVASCRIPT'][] = 'bundles/cgoitrateit/js/onReadyRateIt.js|static';
$GLOBALS['TL_JAVASCRIPT'][] = 'bundles/cgoitrateit/js/rateit.js|static';
$GLOBALS['TL_CSS'][] = 'bundles/cgoitrateit/css/rateit.min.css||static';
switch ($GLOBALS['TL_CONFIG']['rating_type']) {
case 'hearts' :
$GLOBALS['TL_CSS'][] = 'system/modules/rateit/public/css/heart.min.css||static';
$GLOBALS['TL_CSS'][] = 'bundles/cgoitrateit/css/heart.min.css||static';
break;
default:
$GLOBALS['TL_CSS'][] = 'system/modules/rateit/public/css/star.min.css||static';
$GLOBALS['TL_CSS'][] = 'bundles/cgoitrateit/css/star.min.css||static';
}
}
@ -114,7 +108,7 @@ class RateItArticle extends RateItFrontend {
->limit(1)
->execute($article['articleId'])
->fetchAssoc();
if ($arrArticle['addRating']) {
if (!$bolTemplateFixed) {
$objTemplate->setName($objTemplate->getName().'_rateit');
@ -125,7 +119,7 @@ class RateItArticle extends RateItFrontend {
$rating = $this->loadRating($ratingId, 'article');
$stars = !$rating ? 0 : $this->percentToStars($rating['rating']);
$percent = round($rating['rating'], 0)."%";
$article['descriptionId'] = 'rateItRating-'.$ratingId.'-description';
$article['description'] = $this->getStarMessage($rating);
$article['rateItID'] = 'rateItRating-'.$ratingId.'-article-'.$stars.'_'.$this->intStars;
@ -134,32 +128,32 @@ class RateItArticle extends RateItFrontend {
$article['actRating'] = $this->percentToStars($rating['rating']);
$article['maxRating'] = $this->intStars;
$article['votes'] = $rating[totalRatings];
if ($this->strTextPosition == "before") {
$article['showBefore'] = true;
}
else if ($this->strTextPosition == "after") {
$article['showAfter'] = true;
}
if ($arrArticle['rateit_position'] == 'before') {
$article['rateit_rating_before'] = true;
} else if ($arrArticle['rateit_position'] == 'after') {
$article['rateit_rating_after'] = true;
}
$GLOBALS['TL_JAVASCRIPT'][] = 'system/modules/rateit/public/js/onReadyRateIt.js|static';
$GLOBALS['TL_JAVASCRIPT'][] = 'system/modules/rateit/public/js/rateit.js|static';
$GLOBALS['TL_CSS'][] = 'system/modules/rateit/public/css/rateit.min.css||static';
$GLOBALS['TL_JAVASCRIPT'][] = 'bundles/cgoitrateit/js/onReadyRateIt.js|static';
$GLOBALS['TL_JAVASCRIPT'][] = 'bundles/cgoitrateit/js/rateit.js|static';
$GLOBALS['TL_CSS'][] = 'bundles/cgoitrateit/css/rateit.min.css||static';
switch ($GLOBALS['TL_CONFIG']['rating_type']) {
case 'hearts' :
$GLOBALS['TL_CSS'][] = 'system/modules/rateit/public/css/heart.min.css||static';
$GLOBALS['TL_CSS'][] = 'bundles/cgoitrateit/css/heart.min.css||static';
break;
default:
$GLOBALS['TL_CSS'][] = 'system/modules/rateit/public/css/star.min.css||static';
$GLOBALS['TL_CSS'][] = 'bundles/cgoitrateit/css/star.min.css||static';
}
}
$arrArticles[] = $article;
}
$objTemplate->articles = $arrArticles;
@ -172,10 +166,10 @@ class RateItArticle extends RateItFrontend {
->limit(1)
->execute($objTemplate->id)
->fetchAssoc();
if ($arrGallery['rateit_active']) {
$arrRating = array();
if (version_compare(VERSION, '3.2', '>=')) {
$objFiles = \FilesModel::findMultipleByUuids(deserialize($arrGallery['multiSRC']));
} else {
@ -185,19 +179,19 @@ class RateItArticle extends RateItFrontend {
if ($objFiles !== null) {
// Get all images
while ($objFiles->next()) {
// Continue if the files has been processed or does not exist
// Continue if the files has been processed or does not exist
if (isset($arrRating[$objFiles->path]) || !file_exists(TL_ROOT . '/' . $objFiles->path)) {
continue;
}
// Single files
if ($objFiles->type == 'file') {
$objFile = new \File($objFiles->path, true);
if (!$objFile->isGdImage) {
continue;
}
$this->addRatingForImage($arrRating, $arrGallery['id'], $objFiles->id, $objFile->path);
}
// Folders
@ -207,23 +201,23 @@ class RateItArticle extends RateItFrontend {
} else {
$objSubfiles = \FilesModel::findByPid($objFiles->id);
}
if ($objSubfiles === null) {
continue;
}
while ($objSubfiles->next()) {
// Skip subfolders
if ($objSubfiles->type == 'folder') {
continue;
}
$objFile = new \File($objSubfiles->path, true);
if (!$objFile->isGdImage) {
continue;
}
$this->addRatingForImage($arrRating, $arrGallery['id'], $objSubfiles->id, $objSubfiles->path);
}
}
@ -232,27 +226,27 @@ class RateItArticle extends RateItFrontend {
$objTemplate->arrRating = $arrRating;
$GLOBALS['TL_JAVASCRIPT'][] = 'system/modules/rateit/public/js/onReadyRateIt.js|static';
$GLOBALS['TL_JAVASCRIPT'][] = 'system/modules/rateit/public/js/rateit.js|static';
$GLOBALS['TL_CSS'][] = 'system/modules/rateit/public/css/rateit.min.css||static';
$GLOBALS['TL_JAVASCRIPT'][] = 'bundles/cgoitrateit/js/onReadyRateIt.js|static';
$GLOBALS['TL_JAVASCRIPT'][] = 'bundles/cgoitrateit/js/rateit.js|static';
$GLOBALS['TL_CSS'][] = 'bundles/cgoitrateit/css/rateit.min.css||static';
switch ($GLOBALS['TL_CONFIG']['rating_type']) {
case 'hearts' :
$GLOBALS['TL_CSS'][] = 'system/modules/rateit/public/css/heart.min.css||static';
$GLOBALS['TL_CSS'][] = 'bundles/cgoitrateit/css/heart.min.css||static';
break;
default:
$GLOBALS['TL_CSS'][] = 'system/modules/rateit/public/css/star.min.css||static';
$GLOBALS['TL_CSS'][] = 'bundles/cgoitrateit/css/star.min.css||static';
}
}
return $objTemplate;
}
private function addRatingForImage(&$arrRating, $galleryId, $picId, $picPath) {
$ratingId = $galleryId.'|'.$picId;
$rating = $this->loadRating($ratingId, 'galpic');
$stars = !$rating ? 0 : $this->percentToStars($rating['rating']);
$percent = round($rating['rating'], 0)."%";
$arrRating[$picPath] = array();
$arrRating[$picPath]['descriptionId'] = 'rateItRating-'.$ratingId.'-description';
$arrRating[$picPath]['description'] = $this->getStarMessage($rating);
@ -262,7 +256,7 @@ class RateItArticle extends RateItFrontend {
$arrRating[$picPath]['actRating'] = $this->percentToStars($rating['rating']);
$arrRating[$picPath]['maxRating'] = $this->intStars;
$arrRating[$picPath]['votes'] = $rating[totalRatings];
if ($this->strTextPosition == "before") {
$arrRating[$picPath]['showBefore'] = true;
}
@ -271,4 +265,4 @@ class RateItArticle extends RateItFrontend {
}
}
}
?>
?>

View File

@ -32,7 +32,7 @@ namespace cgoIT\rateit;
class RateItBackend
{
const path = 'system/modules/rateit/';
const path = 'bundles/cgoitrateit/';
/**
* Get a css file.
@ -41,7 +41,7 @@ class RateItBackend
*/
public static function css($file)
{
return self::path.'public/css/'. $file.'.css';
return self::path.'css/'. $file.'.css';
} // file
/**
@ -51,7 +51,7 @@ class RateItBackend
*/
public static function js($file)
{
return self::path.'public/js/'. $file.'.js';
return self::path.'js/'. $file.'.js';
} // file
/**
@ -61,7 +61,7 @@ class RateItBackend
*/
public static function image($file)
{
$url = self::path.'public/images/';
$url = self::path.'images/';
if (is_file(TL_ROOT.'/'.$url.$file.'.png')) return $url.$file.'.png';
if (is_file(TL_ROOT.'/'.$url.$file.'.gif')) return $url.$file.'.gif';
return $url.'default.png';

View File

@ -30,7 +30,7 @@
namespace cgoIT\rateit;
class rateitBackendModule extends \BackendModule
class RateItBackendModule extends \BackendModule
{
protected $strTemplate;
protected $actions = array();
@ -235,7 +235,7 @@ class rateitBackendModule extends \BackendModule
*/
protected function exportRatings()
{
$this->import('String');
$this->import('StringUtil');
$rateit = &$this->Template->rateit;
$options['order'] = 'rating desc';
@ -264,11 +264,11 @@ class rateitBackendModule extends \BackendModule
// Werte setzen
foreach($rateit->ratingitems as $item) {
$arrItem = (array)$item;
$intColCounter = 0;
foreach(array_keys($this->arrExportHeader) as $key) {
$strVal = $arrItem[$key];
$strVal = $this->String->decodeEntities($strVal);
$strVal = $this->StringUtil->decodeEntities($strVal);
$strVal = preg_replace(array('/<br.*\/*>/si'), array("\n"), $strVal);
$strVal = $this->convertEncoding($strVal, $GLOBALS['TL_CONFIG']['characterSet'], 'CP1252');
@ -299,7 +299,7 @@ class rateitBackendModule extends \BackendModule
$xls->setcell(array("sheetname" => $strXlsSheet,"row" => $intRowCounter, "col" => $intColCounter, "data" => $strVal, "type" => $cellType, "vallign" => XLSXF_VALLIGN_TOP, "fontfamily" => XLSFONT_FAMILY_NORMAL));
$intColCounter++;
}
$intRowCounter++;
}
@ -449,7 +449,7 @@ class rateitBackendModule extends \BackendModule
'typ' => $typ
);
$this->import('String');
$this->import('StringUtil');
$rateit = &$this->Template->rateit;
// query ratings
@ -480,11 +480,11 @@ class rateitBackendModule extends \BackendModule
// Werte setzen
foreach($ext->ratings as $item) {
$arrItem = (array)$item;
$intColCounter = 0;
foreach(array_keys($this->arrExportHeaderDetails) as $key) {
$strVal = $arrItem[$key];
$strVal = $this->String->decodeEntities($strVal);
$strVal = $this->StringUtil->decodeEntities($strVal);
$strVal = preg_replace(array('/<br.*\/*>/si'), array("\n"), $strVal);
$strVal = $this->convertEncoding($strVal, $GLOBALS['TL_CONFIG']['characterSet'], 'CP1252');
@ -509,7 +509,7 @@ class rateitBackendModule extends \BackendModule
$xls->setcell(array("sheetname" => $strXlsSheet,"row" => $intRowCounter, "col" => $intColCounter, "data" => $strVal, "type" => $cellType, "vallign" => XLSXF_VALLIGN_TOP, "fontfamily" => XLSFONT_FAMILY_NORMAL));
$intColCounter++;
}
$intRowCounter++;
}
@ -535,7 +535,7 @@ class rateitBackendModule extends \BackendModule
*/
protected function createPageUrl($aPage, $aParams = null)
{
$url = \Environment::get('script') . '?do='.$aPage;
$url = 'contao?do='.$aPage;
if (is_array($aParams)) {
foreach ($aParams as $key => $val)
if ($val!='')

View File

@ -30,64 +30,69 @@
namespace cgoIT\rateit;
class RateItFaq extends RateItFrontend {
use cgoIT\rateit\RateItRating;
class RateItFaq extends RateItFrontend {
var $rateItRating;
/**
* Initialize the controller
*/
public function __construct() {
parent::__construct();
$this->rateItRating = new RateItRating();
}
public function getContentElementRateIt($objRow, $strBuffer) {
if ($objRow->type == 'module') {
$objModule = $this->Database->prepare("SELECT * FROM tl_module WHERE id=? AND type IN ('faqpage', 'faqreader')")
->limit(1)
->execute($objRow->module);
if ($objModule->numRows == 1) {
$this->faq_categories = deserialize($objModule->faq_categories);
if ($objModule->type == 'faqreader') {
$strBuffer = $this->generateForFaqReader($objModule, $strBuffer);
} else {
$strBuffer = $this->generateForFaqPage($objModule, $strBuffer);
}
$GLOBALS['TL_JAVASCRIPT'][] = 'system/modules/rateit/public/js/onReadyRateIt.js|static';
$GLOBALS['TL_JAVASCRIPT'][] = 'system/modules/rateit/public/js/rateit.js|static';
$GLOBALS['TL_CSS'][] = 'system/modules/rateit/public/css/rateit.min.css||static';
$GLOBALS['TL_JAVASCRIPT'][] = 'bundles/cgoitrateit/js/onReadyRateIt.js|static';
$GLOBALS['TL_JAVASCRIPT'][] = 'bundles/cgoitrateit/js/rateit.js|static';
$GLOBALS['TL_CSS'][] = 'bundles/cgoitrateit/css/rateit.min.css||static';
switch ($GLOBALS['TL_CONFIG']['rating_type']) {
case 'hearts' :
$GLOBALS['TL_CSS'][] = 'system/modules/rateit/public/css/heart.min.css||static';
$GLOBALS['TL_CSS'][] = 'bundles/cgoitrateit/css/heart.min.css||static';
break;
default:
$GLOBALS['TL_CSS'][] = 'system/modules/rateit/public/css/star.min.css||static';
$GLOBALS['TL_CSS'][] = 'bundles/cgoitrateit/css/star.min.css||static';
}
}
}
return $strBuffer;
}
private function generateForFaqPage($objModule, $strBuffer) {
$objFaq = $this->Database
->execute("SELECT *, author AS authorId, (SELECT headline FROM tl_faq_category WHERE tl_faq_category.id=tl_faq.pid) AS category, (SELECT name FROM tl_user WHERE tl_user.id=tl_faq.author) AS author FROM tl_faq WHERE pid IN(" . implode(',', array_map('intval', $this->faq_categories)) . ")" . (!BE_USER_LOGGED_IN ? " AND published=1" : ""));
if ($objFaq->numRows < 1) {
return $strBuffer;
}
$htmlBuffer = new \simple_html_dom();
$htmlBuffer->load($strBuffer);
$arrFaqs = $objFaq->fetchAllAssoc();
foreach ($arrFaqs as $arrFaq) {
$rating = $this->generateSingle($arrFaq, $strBuffer);
$h3 = $htmlBuffer->find('#'.$arrFaq['alias']);
if (is_array($h3) && count($h3) == 1) {
if (is_array($h3) && count($h3) == 1) {
$section = $h3[0]->parent();
if ($arrFaq['rateit_position'] == 'before') {
$section->innertext = $rating.$section->innertext;
} else if ($arrFaq['rateit_position'] == 'after') {
@ -95,37 +100,37 @@ class RateItFaq extends RateItFrontend {
}
}
}
$strBuffer = $htmlBuffer->save();
// Aufräumen
$htmlBuffer->clear();
unset($htmlBuffer);
return $strBuffer;
}
private function generateForFaqReader($objModule, $strBuffer) {
// Set the item from the auto_item parameter
if ($GLOBALS['TL_CONFIG']['useAutoItem'] && isset($_GET['auto_item'])) {
$this->Input->setGet('items', $this->Input->get('auto_item'));
}
// Do not index or cache the page if no FAQ has been specified
if (!$this->Input->get('items')) {
return $strBuffer;
}
$objFaq = $this->Database->prepare("SELECT *, author AS authorId, (SELECT title FROM tl_faq_category WHERE tl_faq_category.id=tl_faq.pid) AS category, (SELECT name FROM tl_user WHERE tl_user.id=tl_faq.author) AS author FROM tl_faq WHERE pid IN(" . implode(',', array_map('intval', $this->faq_categories)) . ") AND (id=? OR alias=?)" . (!BE_USER_LOGGED_IN ? " AND published=1" : ""))
->limit(1)
->execute((is_numeric($this->Input->get('items')) ? $this->Input->get('items') : 0), $this->Input->get('items'));
if ($objFaq->numRows == 1) {
$arrFaq = $objFaq->fetchAssoc();
$rating = $this->generateSingle($arrFaq, $strBuffer);
}
if ($arrFaq['rateit_position'] == 'before') {
$strBuffer = $rating.$strBuffer;
} else if ($arrFaq['rateit_position'] == 'after') {
@ -134,26 +139,25 @@ class RateItFaq extends RateItFrontend {
return $strBuffer;
}
private function generateSingle($arrFaq, $strBuffer) {
$rating = '';
if ($arrFaq['addRating']) {
$actRecord = $this->Database->prepare("SELECT * FROM tl_rateit_items WHERE rkey=? and typ='faq'")
->execute($arrFaq['id'])
->fetchAssoc();
if ($actRecord['active']) {
$this->import('rateit\\RateItRating', 'RateItRating');
$this->RateItRating->rkey = $arrFaq['id'];
$this->RateItRating->ratingType = 'faq';
$this->RateItRating->generate();
$rating = $this->RateItRating->output();
$this->rateItRating->rkey = $arrFaq['id'];
$this->rateItRating->ratingType = 'faq';
$this->rateItRating->generate();
$rating = $this->rateItRating->output();
}
}
return $rating;
}
}
?>
?>

View File

@ -41,31 +41,31 @@ class RateItFrontend extends \Hybrid
* @var string
*/
protected $strPk = 'id';
/**
* Typ
* @var string
*/
protected $strType = 'hearts';
protected $strType = 'hearts';
/**
* Template
* @var string
*/
protected $strTemplate = 'rateit_default';
protected $strTemplate = 'rateit_default';
/**
* Anzahl der Herzen/Sterne
* @var int
*/
protected $intStars = 5;
/**
* Textposition
* @var string
*/
protected $strTextPosition = 'after';
/**
* Initialize the controller
*/
@ -77,10 +77,10 @@ class RateItFrontend extends \Hybrid
elseif ($objElement instanceof \Model\Collection) {
$this->strTable = $objElement->current()->getTable();
}
$this->strKey = $this->strPk;
}
$stars = intval($GLOBALS['TL_CONFIG']['rating_count']);
if ($stars > 0) {
$this->intStars = $stars;
@ -110,7 +110,7 @@ class RateItFrontend extends \Hybrid
*/
protected function compile() {
}
public function getStarMessage($rating) {
$this->loadLanguageFile('default');
$stars = $this->percentToStars($rating['rating']);
@ -136,12 +136,12 @@ class RateItFrontend extends \Hybrid
public function loadRating($rkey, $typ) {
$SQL_GET_RATINGS = "SELECT i.rkey AS rkey,
i.title AS title,
IFNULL(AVG(r.rating),0) AS rating,
IFNULL(AVG(r.rating),0) AS rating,
COUNT( r.rating ) AS totalRatings
FROM tl_rateit_items i
LEFT OUTER JOIN tl_rateit_ratings r
ON ( i.id = r.pid ) WHERE i.rkey = ? and typ=? and active='1'
GROUP BY i.rkey;";
GROUP BY i.rkey, i.title;";
$result = $this->Database->prepare($SQL_GET_RATINGS)
->execute($rkey, $typ)
->fetchAssoc();
@ -154,4 +154,4 @@ class RateItFrontend extends \Hybrid
}
}
?>
?>

View File

@ -66,15 +66,15 @@ abstract class RateItHybrid extends RateItFrontend
$this->strType = $GLOBALS['TL_CONFIG']['rating_type'];
$this->strTextPosition = $GLOBALS['TL_CONFIG']['rating_textposition'];
$GLOBALS['TL_JAVASCRIPT'][] = 'system/modules/rateit/public/js/onReadyRateIt.js|static';
$GLOBALS['TL_JAVASCRIPT'][] = 'system/modules/rateit/public/js/rateit.js|static';
$GLOBALS['TL_CSS'][] = 'system/modules/rateit/public/css/rateit.min.css||static';
$GLOBALS['TL_JAVASCRIPT'][] = 'bundles/cgoitrateit/js/onReadyRateIt.js|static';
$GLOBALS['TL_JAVASCRIPT'][] = 'bundles/cgoitrateit/js/rateit.js|static';
$GLOBALS['TL_CSS'][] = 'bundles/cgoitrateit/css/rateit.min.css||static';
switch ($this->strType) {
case 'hearts' :
$GLOBALS['TL_CSS'][] = 'system/modules/rateit/public/css/heart.min.css||static';
$GLOBALS['TL_CSS'][] = 'bundles/cgoitrateit/css/heart.min.css||static';
break;
default:
$GLOBALS['TL_CSS'][] = 'system/modules/rateit/public/css/star.min.css||static';
$GLOBALS['TL_CSS'][] = 'bundles/cgoitrateit/css/star.min.css||static';
}
return parent::generate();

View File

@ -69,15 +69,15 @@ class RateItNews extends RateItFrontend {
$objTemplate->rateit_rating_after = true;
}
$GLOBALS['TL_JAVASCRIPT'][] = 'system/modules/rateit/public/js/onReadyRateIt.js|static';
$GLOBALS['TL_JAVASCRIPT'][] = 'system/modules/rateit/public/js/rateit.js|static';
$GLOBALS['TL_CSS'][] = 'system/modules/rateit/public/css/rateit.min.css||static';
$GLOBALS['TL_JAVASCRIPT'][] = 'bundles/cgoitrateit/js/onReadyRateIt.js|static';
$GLOBALS['TL_JAVASCRIPT'][] = 'bundles/cgoitrateit/js/rateit.js|static';
$GLOBALS['TL_CSS'][] = 'bundles/cgoitrateit/css/rateit.min.css||static';
switch ($GLOBALS['TL_CONFIG']['rating_type']) {
case 'hearts' :
$GLOBALS['TL_CSS'][] = 'system/modules/rateit/public/css/heart.min.css||static';
$GLOBALS['TL_CSS'][] = 'bundles/cgoitrateit/css/heart.min.css||static';
break;
default:
$GLOBALS['TL_CSS'][] = 'system/modules/rateit/public/css/star.min.css||static';
$GLOBALS['TL_CSS'][] = 'bundles/cgoitrateit/css/star.min.css||static';
}
}
}

View File

@ -29,32 +29,36 @@
namespace cgoIT\rateit;
use cgoIT\rateit\RateItRating;
class RateItPage extends \Frontend {
var $rateItRating;
/**
* Initialize the controller
*/
public function __construct() {
parent::__construct();
$this->rateItRating = new RateItRating();
$this->loadDataContainer('settings');
}
public function generatePage($objPage, $objLayout, $objPageType) {
if ($objPage->addRating) {
$actRecord = $this->Database->prepare("SELECT * FROM tl_rateit_items WHERE rkey=? and typ='page'")
->execute($objPage->id)
->fetchAssoc();
if ($actRecord['active']) {
$this->import('rateit\\RateItRating', 'RateItRating');
$this->RateItRating->rkey = $objPage->id;
$this->RateItRating->generate();
$rating = $this->RateItRating->output();
$this->rateItRating->rkey = $objPage->id;
$this->rateItRating->generate();
$rating = $this->rateItRating->output();
$rating .= $this->includeJs();
$rating .= $this->includeCss();
$objTemplate = $objPageType->Template;
if ($objTemplate) {
if ($objPage->rateit_position == 'after') {
@ -72,7 +76,7 @@ class RateItPage extends \Frontend {
$strHeadTags = '';
if (is_array($GLOBALS['TL_CSS'])) {
foreach ($GLOBALS['TL_CSS'] as $script) {
if ($this->startsWith($script, 'system/modules/rateit/public/css/rateit') === true) {
if ($this->startsWith($script, 'bundles/cgoitrateit/css/rateit') === true) {
$included = true;
break;
}
@ -80,24 +84,24 @@ class RateItPage extends \Frontend {
}
if (!$included) {
$strHeadTags = '<link rel="stylesheet" href="'.$this->addStaticUrlTo('system/modules/rateit/public/css/rateit.min.css').'">';
$strHeadTags = '<link rel="stylesheet" href="'.$this->addStaticUrlTo('bundles/cgoitrateit/css/rateit.min.css').'">';
switch ($GLOBALS['TL_CONFIG']['rating_type']) {
case 'hearts' :
$strHeadTags .= '<link rel="stylesheet" href="'.$this->addStaticUrlTo('system/modules/rateit/public/css/heart.min.css').'">';
$strHeadTags .= '<link rel="stylesheet" href="'.$this->addStaticUrlTo('bundles/cgoitrateit/css/heart.min.css').'">';
break;
default:
$strHeadTags .= '<link rel="stylesheet" href="'.$this->addStaticUrlTo('system/modules/rateit/public/css/star.min.css').'">';
$strHeadTags .= '<link rel="stylesheet" href="'.$this->addStaticUrlTo('bundles/cgoitrateit/css/star.min.css').'">';
}
}
return $strHeadTags;
}
private function includeJs() {
$included = false;
$strHeadTags = '';
if (is_array($GLOBALS['TL_JAVASCRIPT'])) {
foreach ($GLOBALS['TL_JAVASCRIPT'] as $script) {
if ($this->startsWith($script, 'system/modules/rateit/public/js/rateit') === true) {
if ($this->startsWith($script, 'bundles/cgoitrateit/js/rateit') === true) {
$included = true;
break;
}
@ -105,15 +109,15 @@ class RateItPage extends \Frontend {
}
if (!$included) {
$strHeadTags = '<script' . (($objPage->outputFormat == 'xhtml') ? ' type="text/javascript"' : '') . ' src="' . $this->addStaticUrlTo('system/modules/rateit/public/js/onReadyRateIt.js') . '"></script>' . "\n";
$strHeadTags .= '<script' . (($objPage->outputFormat == 'xhtml') ? ' type="text/javascript"' : '') . ' src="' . $this->addStaticUrlTo('system/modules/rateit/public/js/rateit.js') . '"></script>' . "\n";
$strHeadTags = '<script' . (($objPage->outputFormat == 'xhtml') ? ' type="text/javascript"' : '') . ' src="' . $this->addStaticUrlTo('bundles/cgoitrateit/js/onReadyRateIt.js') . '"></script>' . "\n";
$strHeadTags .= '<script' . (($objPage->outputFormat == 'xhtml') ? ' type="text/javascript"' : '') . ' src="' . $this->addStaticUrlTo('bundles/cgoitrateit/js/rateit.js') . '"></script>' . "\n";
}
return $strHeadTags;
}
function startsWith($haystack, $needle) {
// search backwards starting from haystack length characters from the end
return $needle === "" || strrpos($haystack, $needle, -strlen($haystack)) !== FALSE;
}
}
?>
?>

View File

@ -36,13 +36,13 @@ namespace cgoIT\rateit;
class RateItTopRatingsModule extends RateItFrontend
{
private static $arrUrlCache = array();
/**
* Initialize the controller
*/
public function __construct($objElement) {
parent::__construct($objElement);
$this->strKey = "rateit_top_ratings";
}
@ -62,22 +62,22 @@ class RateItTopRatingsModule extends RateItFrontend
return $objTemplate->parse();
}
$this->strTemplate = $this->rateit_template;
$this->arrTypes = deserialize($this->rateit_types);
$GLOBALS['TL_JAVASCRIPT'][] = 'system/modules/rateit/public/js/onReadyRateIt.js|static';
$GLOBALS['TL_JAVASCRIPT'][] = 'system/modules/rateit/public/js/rateit.js|static';
$GLOBALS['TL_CSS'][] = 'system/modules/rateit/public/css/rateit.min.css||static';
$GLOBALS['TL_JAVASCRIPT'][] = 'bundles/cgoitrateit/js/onReadyRateIt.js|static';
$GLOBALS['TL_JAVASCRIPT'][] = 'bundles/cgoitrateit/js/rateit.js|static';
$GLOBALS['TL_CSS'][] = 'bundles/cgoitrateit/css/rateit.min.css||static';
switch ($GLOBALS['TL_CONFIG']['rating_type']) {
case 'hearts' :
$GLOBALS['TL_CSS'][] = 'system/modules/rateit/public/css/heart.min.css||static';
$GLOBALS['TL_CSS'][] = 'bundles/cgoitrateit/css/heart.min.css||static';
break;
default:
$GLOBALS['TL_CSS'][] = 'system/modules/rateit/public/css/star.min.css||static';
$GLOBALS['TL_CSS'][] = 'bundles/cgoitrateit/css/star.min.css||static';
}
return parent::generate();
}
@ -86,9 +86,9 @@ class RateItTopRatingsModule extends RateItFrontend
*/
protected function compile() {
$this->Template = new \FrontendTemplate($this->strTemplate);
$this->Template->setData($this->arrData);
$this->import("\\Database", "Database");
$arrResult = $this->Database->prepare("SELECT i.id AS item_id,
i.rkey AS rkey,
@ -114,32 +114,32 @@ class RateItTopRatingsModule extends RateItFrontend
$return = new \stdClass();
$return->title = $result['title'];
$return->typ = $result['typ'];
// ID ermitteln
$stars = $this->percentToStars($result['best']);
$return->rateItID = 'rateItRating-'.$result['rkey'].'-'.$result['typ'].'-'.
$stars.'_'.intval($GLOBALS['TL_CONFIG']['rating_count']);
$return->descriptionId = 'rateItRating-'.$result['rkey'].'-description';
$return->rateit_class = 'rateItRating';
$return->url = $this->getUrl($result);
// Beschriftung ermitteln
$rating = array();
$rating['totalRatings'] = $result['most'];
$rating['rating'] = $result['best'];
$return->description = $this->getStarMessage($rating);
$return->rating = $result['best'];
$return->count = $result['most'];
$return->rel = 'not-rateable';
$objReturn[] = $return;
}
$this->Template->arrRatings = $objReturn;
}
private function getUrl($rating) {
if ($rating['typ'] === 'page') {
return \PageModel::findById($rating['rkey'])->getAbsoluteUrl();
@ -153,25 +153,25 @@ class RateItTopRatingsModule extends RateItFrontend
if ($rating['typ'] === 'news') {
$objNews = \NewsModel::findById($rating['rkey']);
$objArticle = \NewsModel::findPublishedByPid($objNews->pid);
// Internal link
if ($objArticle->source != 'external') {
return $this->generateNewsUrl($objNews);
}
// Encode e-mail addresses
if (substr($objArticle->url, 0, 7) == 'mailto:') {
$strArticleUrl = \StringUtil::encodeEmail($objArticle->url);
}
// Ampersand URIs
else {
$strArticleUrl = ampersand($objArticle->url);
}
/** @var \PageModel $objPage */
global $objPage;
// External link
return $strArticleUrl;
}
@ -180,15 +180,15 @@ class RateItTopRatingsModule extends RateItFrontend
private function generateNewsUrl($objItem) {
$strCacheKey = 'id_' . $objItem->id;
// Load the URL from cache
if (isset(self::$arrUrlCache[$strCacheKey])) {
return self::$arrUrlCache[$strCacheKey];
}
// Initialize the cache
self::$arrUrlCache[$strCacheKey] = null;
switch ($objItem->source) {
// Link to an external page
case 'external' :
@ -198,7 +198,7 @@ class RateItTopRatingsModule extends RateItFrontend
self::$arrUrlCache[$strCacheKey] = ampersand($objItem->url);
}
break;
// Link to an internal page
case 'internal' :
if (($objTarget = $objItem->getRelated('jumpTo')) !== null) {
@ -206,7 +206,7 @@ class RateItTopRatingsModule extends RateItFrontend
self::$arrUrlCache[$strCacheKey] = ampersand($objTarget->getFrontendUrl());
}
break;
// Link to an article
case 'article' :
if (($objArticle = \ArticleModel::findByPk($objItem->articleId, array(
@ -217,25 +217,25 @@ class RateItTopRatingsModule extends RateItFrontend
}
break;
}
// Link to the default page
if (self::$arrUrlCache[$strCacheKey] === null) {
$objPage = \PageModel::findWithDetails($objItem->getRelated('pid')->jumpTo);
if ($objPage === null) {
self::$arrUrlCache[$strCacheKey] = ampersand(\Environment::get('request'), true);
} else {
self::$arrUrlCache[$strCacheKey] = ampersand($objPage->getFrontendUrl(((\Config::get('useAutoItem') && ! \Config::get('disableAlias')) ? '/' : '/items/') . ((! \Config::get('disableAlias') && $objItem->alias != '') ? $objItem->alias : $objItem->id)));
}
// Add the current archive parameter (news archive)
if ($blnAddArchive && \Input::get('month') != '') {
self::$arrUrlCache[$strCacheKey] .= (\Config::get('disableAlias') ? '&amp;' : '?') . 'month=' . \Input::get('month');
}
}
return self::$arrUrlCache[$strCacheKey];
}
}
?>
?>

View File

@ -33,33 +33,32 @@ use cgoIT\rateit\RateItBackend;
/**
* Hooks
*/
$GLOBALS['TL_HOOKS']['generatePage'][] = array('rateit\\RateItPage', 'generatePage');
$GLOBALS['TL_HOOKS']['rateitAjax'][] = array('rateit\\RateIt', 'doVote');
$GLOBALS['TL_HOOKS']['parseArticles'][] = array('rateit\\RateItNews', 'parseArticle');
$GLOBALS['TL_HOOKS']['getContentElement'][] = array('rateit\\RateItFaq', 'getContentElementRateIt');
$GLOBALS['TL_HOOKS']['parseTemplate'][] = array('rateit\\RateItArticle', 'parseTemplateRateIt');
$GLOBALS['TL_HOOKS']['generatePage'][] = array('cgoIT\rateit\RateItPage', 'generatePage');
$GLOBALS['TL_HOOKS']['parseArticles'][] = array('cgoIT\rateit\RateItNews', 'parseArticle');
$GLOBALS['TL_HOOKS']['getContentElement'][] = array('cgoIT\rateit\RateItFaq', 'getContentElementRateIt');
$GLOBALS['TL_HOOKS']['parseTemplate'][] = array('cgoIT\rateit\RateItArticle', 'parseTemplateRateIt');
/**
* Back end modules
*/
array_insert($GLOBALS['BE_MOD']['content'], count($GLOBALS['BE_MOD']['content']),
array_insert($GLOBALS['BE_MOD']['content'], -1,
array('rateit' => array (
'callback' => 'rateit\\RateItBackendModule',
'icon' => rateit\RateItBackend::image('icon'),
'stylesheet' => rateit\RateItBackend::css('backend'),
'javascript' => rateit\RateItBackend::js('RateItBackend')
'callback' => 'cgoIT\rateit\RateItBackendModule',
'icon' => RateItBackend::image('icon'),
'stylesheet' => RateItBackend::css('backend'),
'javascript' => RateItBackend::js('RateItBackend')
)
));
/**
* frontend moduls
*/
$GLOBALS['FE_MOD']['application']['rateit'] = 'rateit\\RateItModule';
$GLOBALS['FE_MOD']['application']['rateit_top_ratings'] = 'rateit\\RateItTopRatingsModule';
$GLOBALS['FE_MOD']['application']['rateit'] = 'cgoIT\rateit\RateItModule';
$GLOBALS['FE_MOD']['application']['rateit_top_ratings'] = 'cgoIT\rateit\RateItTopRatingsModule';
/**
* content elements
*/
$GLOBALS['TL_CTE']['includes']['rateit'] = 'rateit\\RateItCE';
$GLOBALS['TL_CTE']['includes']['rateit'] = 'cgoIT\rateit\RateItCE';
?>

View File

@ -27,8 +27,9 @@
* @license GNU/LGPL
* @filesource
*/
use cgoIT\rateit\DcaHelper;
/**
* Extend tl_article
*/
@ -69,40 +70,13 @@ $GLOBALS['TL_DCA']['tl_article']['fields']['rateit_position'] = array
'eval' => array('mandatory'=>true, 'tl_class'=>'w50')
);
$GLOBALS['TL_DCA']['tl_article']['fields']['rateit_template'] = array
(
'label' => &$GLOBALS['TL_LANG']['tl_article']['rateit_template'],
'default' => 'rateit_default',
'exclude' => true,
'inputType' => 'select',
'options_callback' => array('tl_article_rating', 'getRateItArticleTemplates'),
'sql' => "varchar(255) NOT NULL default ''",
'eval' => array('mandatory'=>true, 'tl_class'=>'w50')
);
class tl_article_rating extends rateit\DcaHelper {
class tl_article_rating extends DcaHelper {
/**
* Constructor
*/
public function __construct() {
parent::__construct();
}
/**
* Return all navigation templates as array
* @param DataContainer
* @return array
*/
public function getRateItArticleTemplates(\DataContainer $dc) {
$intPid = $dc->activeRecord->pid;
if ($this->Input->get('act') == 'overrideAll')
{
$intPid = $this->Input->get('id');
}
return $this->getTemplateGroup('article_rateit_', $intPid);
}
public function insert(\DC_Table $dc) {
return $this->insertOrUpdateRatingKey($dc, 'article', $dc->activeRecord->title);

View File

@ -28,6 +28,8 @@
* @filesource
*/
use cgoIT\rateit\DcaHelper;
$GLOBALS['TL_DCA']['tl_content']['config']['onsubmit_callback'][] = array('tl_content_rateit','insert');
$GLOBALS['TL_DCA']['tl_content']['config']['ondelete_callback'][] = array('tl_content_rateit','delete');
@ -62,7 +64,7 @@ $GLOBALS['TL_DCA']['tl_content']['fields']['rateit_active'] = array
/**
* Class tl_content_rateit
*/
class tl_content_rateit extends rateit\DcaHelper {
class tl_content_rateit extends DcaHelper {
/**
* Constructor
@ -70,31 +72,31 @@ class tl_content_rateit extends rateit\DcaHelper {
public function __construct() {
parent::__construct();
}
public function insert(\DC_Table $dc) {
if ($dc->activeRecord->type == "gallery") {
$type = 'galpic';
// Alle vorherigen Bilder erst mal auf inaktiv setzen
$this->Database->prepare("UPDATE tl_rateit_items SET active='' WHERE rkey LIKE ? AND typ=?")->execute($dc->activeRecord->id.'|%', $type);
if (version_compare(VERSION, '3.2', '>=')) {
$objFiles = \FilesModel::findMultipleByUuids(deserialize($dc->activeRecord->multiSRC));
} else {
$objFiles = \FilesModel::findMultipleByIds(deserialize($dc->activeRecord->multiSRC));
}
if ($objFiles !== null) {
// Get all images
while ($objFiles->next()) {
// Single files
if ($objFiles->type == 'file') {
$objFile = new \File($objFiles->path, true);
if (!$objFile->isGdImage) {
continue;
}
$this->insertOrUpdateRatingItemGallery($dc, $type, $objFile->name, $objFiles->id, ($dc->activeRecord->rateit_active ? '1' : ''));
}
// Folders
@ -104,23 +106,23 @@ class tl_content_rateit extends rateit\DcaHelper {
} else {
$objSubfiles = \FilesModel::findByPid($objFiles->id);
}
if ($objSubfiles === null) {
continue;
}
while ($objSubfiles->next()) {
// Skip subfolders
if ($objSubfiles->type == 'folder') {
continue;
}
$objFile = new \File($objSubfiles->path, true);
if (!$objFile->isGdImage) {
continue;
}
$this->insertOrUpdateRatingItemGallery($dc, $type, $objSubfiles->name, $objSubfiles->id, ($dc->activeRecord->rateit_active ? '1' : ''));
}
}
@ -142,7 +144,7 @@ class tl_content_rateit extends rateit\DcaHelper {
return $this->deleteRatingKey($dc, 'ce');
}
}
private function insertOrUpdateRatingItemGallery(\DC_Table &$dc, $type, $strName, $imgId, $active) {
$rkey = $dc->activeRecord->id.'|'.$imgId;
$headline = deserialize($dc->activeRecord->headline);
@ -173,4 +175,4 @@ class tl_content_rateit extends rateit\DcaHelper {
}
}
}
?>
?>

View File

@ -27,8 +27,9 @@
* @license GNU/LGPL
* @filesource
*/
use cgoIT\rateit\DcaHelper;
/**
* Extend tl_article
*/
@ -69,14 +70,14 @@ $GLOBALS['TL_DCA']['tl_faq']['fields']['rateit_position'] = array
'eval' => array('mandatory'=>true, 'tl_class'=>'w50')
);
class tl_faq_rating extends rateit\DcaHelper {
class tl_faq_rating extends DcaHelper {
/**
* Constructor
*/
public function __construct() {
parent::__construct();
}
public function insert(\DC_Table $dc) {
return $this->insertOrUpdateRatingKey($dc, 'faq', $dc->activeRecord->question);
}

View File

@ -1,4 +1,4 @@
<?php
<?php
/**
* Contao Open Source CMS
@ -28,6 +28,8 @@
* @filesource
*/
use cgoIT\rateit\DcaHelper;
$GLOBALS['TL_DCA']['tl_module']['config']['onsubmit_callback'][] = array('tl_module_rateit','insert');
$GLOBALS['TL_DCA']['tl_module']['config']['ondelete_callback'][] = array('tl_module_rateit','delete');
@ -107,7 +109,7 @@ $GLOBALS['TL_DCA']['tl_module']['fields']['rateit_template'] = array
/**
* Class tl_module_rateit
*/
class tl_module_rateit extends rateit\DcaHelper {
class tl_module_rateit extends DcaHelper {
/**
* Constructor
@ -115,7 +117,7 @@ class tl_module_rateit extends rateit\DcaHelper {
public function __construct() {
parent::__construct();
}
public function insert(\DC_Table $dc) {
return $this->insertOrUpdateRatingKey($dc, 'module', $dc->activeRecord->rateit_title);
}
@ -137,4 +139,4 @@ class tl_module_rateit extends rateit\DcaHelper {
return $this->getTemplateGroup('mod_rateit_top', $intPid);
}
}
?>
?>

View File

@ -27,8 +27,9 @@
* @license GNU/LGPL
* @filesource
*/
use cgoIT\rateit\DcaHelper;
/**
* Extend tl_article
*/
@ -69,14 +70,14 @@ $GLOBALS['TL_DCA']['tl_news']['fields']['rateit_position'] = array
'eval' => array('mandatory'=>true, 'tl_class'=>'w50')
);
class tl_news_rating extends rateit\DcaHelper {
class tl_news_rating extends DcaHelper {
/**
* Constructor
*/
public function __construct() {
parent::__construct();
}
public function insert(\DC_Table $dc) {
return $this->insertOrUpdateRatingKey($dc, 'news', $dc->activeRecord->headline);
}

View File

@ -27,8 +27,10 @@
* @license GNU/LGPL
* @filesource
*/
use cgoIT\rateit\DcaHelper;
/**
* Extend tl_page
*/
@ -81,14 +83,14 @@ $GLOBALS['TL_DCA']['tl_page']['fields']['rateit_position'] = array
'eval' => array('mandatory'=>true, 'tl_class'=>'w50')
);
class tl_page_rateit extends rateit\DcaHelper {
class tl_page_rateit extends DcaHelper {
/**
* Constructor
*/
public function __construct() {
parent::__construct();
}
public function insert(\DC_Table $dc) {
return $this->insertOrUpdateRatingKey($dc, 'page', $dc->activeRecord->title);
}

View File

@ -28,6 +28,8 @@
* @filesource
*/
use cgoIT\rateit\DcaHelper;
/**
* palettes
*/
@ -113,21 +115,7 @@ $GLOBALS['TL_DCA']['tl_settings']['fields']['rating_description'] = array
'eval' => array('mandatory'=>true, 'allowHtml'=>true, 'tl_class'=>'w50')
);
class tl_settings_rateit extends rateit\DcaHelper
class tl_settings_rateit extends DcaHelper
{
public function getUserFullName() {
$this->import('jicw\\JICWHelper', 'JICWHelper');
return $this->JICWHelper->getUserFullName();
}
public function getUserEmail() {
$this->import('jicw\\JICWHelper', 'JICWHelper');
return $this->JICWHelper->getUserEmail();
}
public function getInstalledModules() {
$this->import('jicw\\JICWHelper', 'JICWHelper');
return $this->JICWHelper->getInstalledModules();
}
}
?>

View File

@ -2,7 +2,7 @@
// Add the colorbox style sheet and javascript
$GLOBALS['TL_CSS'][] = 'assets/jquery/colorbox/'. COLORBOX .'/css/colorbox.min.css||static';
$GLOBALS['TL_JAVASCRIPT'][] = 'system/modules/rateit/public/js/jquery/colorbox/colorbox-rateit.min.js|static';
$GLOBALS['TL_JAVASCRIPT'][] = 'bundles/cgoitrateit/js/jquery/colorbox/colorbox-rateit.min.js|static';
?>

View File

@ -0,0 +1,37 @@
<?php $this->extend('mod_article'); ?>
<?php $this->block('content'); ?>
<?php if ($this->rateit_rating_before): ?>
<!-- indexer::stop -->
<div id="<?= $this->rateItID ?>" class="<?= $this->class ?> <?= $this->rateit_class ?>">
<?php if ($this->showBefore) : ?>
<div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
<?php endif; ?>
<div class="wrapper">
<div class="rateItRating-selected" style="display: block;"></div>
<div class="rateItRating-hover"></div>
</div>
<?php if ($this->showAfter) : ?>
<div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
<?php endif; ?>
</div>
<!-- indexer::continue -->
<?php endif; ?>
<?php $this->parent(); ?>
<?php if ($this->rateit_rating_after): ?>
<!-- indexer::stop -->
<div id="<?= $this->rateItID ?>" class="<?= $this->class ?> <?= $this->rateit_class ?>">
<?php if ($this->showBefore) : ?>
<div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
<?php endif; ?>
<div class="wrapper">
<div class="rateItRating-selected" style="display: block;"></div>
<div class="rateItRating-hover"></div>
</div>
<?php if ($this->showAfter) : ?>
<div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
<?php endif; ?>
</div>
<!-- indexer::continue -->
<?php endif; ?>
<?php $this->endblock(); ?>

View File

@ -0,0 +1,55 @@
<?php $this->extend('mod_article'); ?>
<?php $this->block('content'); ?>
<?php if ($this->rateit_rating_before): ?>
<!-- indexer::stop -->
<div itemtype="http://schema.org/CreativeWork" itemscope class="rating-microdata">
<div id="<?= $this->rateItID ?>" class="<?= $this->class ?> <?= $this->rateit_class ?>">
<?php if ($this->showBefore) : ?>
<div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
<?php endif; ?>
<div class="wrapper">
<div class="rateItRating-selected" style="display: block;"></div>
<div class="rateItRating-hover"></div>
</div>
<?php if ($this->showAfter) : ?>
<div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
<?php endif; ?>
</div>
<span class="rating-microdata" itemprop="name"><?php echo $this->itemreviewed; ?></span>
<span class="rating-microdata" itemtype="http://schema.org/AggregateRating" itemscope itemprop="aggregateRating">
<span itemprop="ratingValue"><?php echo $this->actRating; ?></span>
<span itemprop="worstRating">0</span>
<span itemprop="bestRating"><?php echo $this->maxRating; ?></span>
<span itemprop="ratingCount"><?php echo $this->votes; ?></span>
</span>
</div>
<!-- indexer::continue -->
<?php endif; ?>
<?php $this->parent(); ?>
<?php if ($this->rateit_rating_after): ?>
<!-- indexer::stop -->
<div itemtype="http://schema.org/CreativeWork" itemscope class="rating-microdata">
<div id="<?= $this->rateItID ?>" class="<?= $this->class ?> <?= $this->rateit_class ?>">
<?php if ($this->showBefore) : ?>
<div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
<?php endif; ?>
<div class="wrapper">
<div class="rateItRating-selected" style="display: block;"></div>
<div class="rateItRating-hover"></div>
</div>
<?php if ($this->showAfter) : ?>
<div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
<?php endif; ?>
</div>
<span class="rating-microdata" itemprop="name"><?php echo $this->itemreviewed; ?></span>
<span class="rating-microdata" itemtype="http://schema.org/AggregateRating" itemscope itemprop="aggregateRating">
<span itemprop="ratingValue"><?php echo $this->actRating; ?></span>
<span itemprop="worstRating">0</span>
<span itemprop="bestRating"><?php echo $this->maxRating; ?></span>
<span itemprop="ratingCount"><?php echo $this->votes; ?></span>
</span>
</div>
<!-- indexer::continue -->
<?php endif; ?>
<?php $this->endblock(); ?>

View File

@ -0,0 +1,47 @@
<?php $this->extend('block_unsearchable'); ?>
<?php $this->block('content'); ?>
<ul>
<?php foreach ($this->articles as $article): ?>
<?php if ($article['rateit_rating_before']): ?>
<!-- indexer::stop -->
<?php $this->block('rating'); ?>
<div id="<?= $article['rateItID'] ?>" class="<?= $article['rateit_class'] ?>">
<?php if ($article['showBefore']) : ?>
<div id="<?= $article['descriptionId'] ?>" class="ratingText"><?= $article['description'] ?></div>
<?php endif; ?>
<div class="wrapper">
<div class="rateItRating-selected" style="display: block;"></div>
<div class="rateItRating-hover"></div>
</div>
<?php if ($article['showAfter']) : ?>
<div id="<?= $article['descriptionId'] ?>" class="ratingText"><?= $article['description'] ?></div>
<?php endif; ?>
</div>
<?php $this->endblock(); ?>
<!-- indexer::continue -->
<?php endif; ?>
<?php $this->parent(); ?>
<?php if ($article['rateit_rating_after']): ?>
<!-- indexer::stop -->
<?php $this->block('rating'); ?>
<div id="<?= $article['rateItID'] ?>" class="<?= $article['rateit_class'] ?>">
<?php if ($article['showBefore']) : ?>
<div id="<?= $article['descriptionId'] ?>" class="ratingText"><?= $article['description'] ?></div>
<?php endif; ?>
<div class="wrapper">
<div class="rateItRating-selected" style="display: block;"></div>
<div class="rateItRating-hover"></div>
</div>
<?php if ($article['showAfter']) : ?>
<div id="<?= $article['descriptionId'] ?>" class="ratingText"><?= $article['description'] ?></div>
<?php endif; ?>
</div>
<?php $this->endblock(); ?>
<!-- indexer::continue -->
<?php endif; ?>
<?php endforeach; ?>
</ul>
<?php $this->endblock(); ?>

View File

@ -0,0 +1,16 @@
<?php $this->extend('mod_articlelist_rateit'); ?>
<?php $this->block('rating'); ?>
<!-- indexer::stop -->
<div itemtype="http://schema.org/CreativeWork" itemscope class="rating-microdata">
<?php $this->parent(); ?>
<span class="rating-microdata" itemprop="name"><?= $article['itemreviewed'] ?></span>
<span class="rating-microdata" itemtype="http://schema.org/AggregateRating" itemscope itemprop="aggregateRating">
<span itemprop="ratingValue"><?= $article['actRating'] ?></span>
<span itemprop="worstRating">0</span>
<span itemprop="bestRating"><?= $article['maxRating'] ?></span>
<span itemprop="ratingCount"><?= $article['votes'] ?></span>
</span>
</div>
<!-- indexer::continue -->
<?php $this->endblock(); ?>

View File

@ -2,7 +2,7 @@
// Add the mediabox style sheet and javascript
$GLOBALS['TL_CSS'][] = 'assets/mootools/mediabox/'. MEDIABOX .'/css/mediaboxAdvBlack21.css||static';
$GLOBALS['TL_JAVASCRIPT'][] = 'system/modules/rateit/public/js/mootools/mediabox/mediabox-rateit.js|static';
$GLOBALS['TL_JAVASCRIPT'][] = 'bundles/cgoitrateit/js/mootools/mediabox/mediabox-rateit.js|static';
?>

View File

@ -0,0 +1,40 @@
<?php if ($this->rateit_rating_before): ?>
<!-- indexer::stop -->
<?php $this->block('rating'); ?>
<div id="<?= $this->ratingId ?>" class="<?= $this->class ?> <?= $this->rateit_class ?>">
<?php if ($this->showBefore) : ?>
<div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
<?php endif; ?>
<div class="wrapper">
<div class="rateItRating-selected" style="display: block;"></div>
<div class="rateItRating-hover"></div>
</div>
<?php if ($this->showAfter) : ?>
<div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
<?php endif; ?>
</div>
<?php $this->endblock(); ?>
<!-- indexer::continue -->
<?php endif; ?>
<?php $this->insert('news_full', $this->arrData); ?>
<?php if ($this->rateit_rating_after): ?>
<!-- indexer::stop -->
<?php $this->block('rating'); ?>
<div id="<?= $this->ratingId ?>" class="<?= $this->class ?> <?= $this->rateit_class ?>">
<?php if ($this->showBefore) : ?>
<div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
<?php endif; ?>
<div class="wrapper">
<div class="rateItRating-selected" style="display: block;"></div>
<div class="rateItRating-hover"></div>
</div>
<?php if ($this->showAfter) : ?>
<div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
<?php endif; ?>
</div>
<?php $this->endblock(); ?>
<!-- indexer::continue -->
<?php endif; ?>

View File

@ -0,0 +1,17 @@
<?php $this->extend('news_full_rateit'); ?>
<?php $this->block('rating'); ?>
<!-- indexer::stop -->
<div itemtype="http://schema.org/CreativeWork" itemscope class="rating-microdata">
<?php $this->parent(); ?>
<span class="rating-microdata" itemprop="name"><?php echo $this->itemreviewed; ?></span>
<span class="rating-microdata" itemtype="http://schema.org/AggregateRating" itemscope itemprop="aggregateRating">
<span itemprop="ratingValue"><?php echo $this->actRating; ?></span>
<span itemprop="worstRating">0</span>
<span itemprop="bestRating"><?php echo $this->maxRating; ?></span>
<span itemprop="ratingCount"><?php echo $this->votes; ?></span>
</span>
</div>
<!-- indexer::continue -->
<?php $this->endblock(); ?>

View File

@ -0,0 +1,40 @@
<?php if ($this->rateit_rating_before): ?>
<!-- indexer::stop -->
<?php $this->block('rating'); ?>
<div id="<?= $this->ratingId ?>" class="<?= $this->class ?> <?= $this->rateit_class ?>">
<?php if ($this->showBefore) : ?>
<div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
<?php endif; ?>
<div class="wrapper">
<div class="rateItRating-selected" style="display: block;"></div>
<div class="rateItRating-hover"></div>
</div>
<?php if ($this->showAfter) : ?>
<div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
<?php endif; ?>
</div>
<?php $this->endblock(); ?>
<!-- indexer::continue -->
<?php endif; ?>
<?php $this->insert('news_latest', $this->arrData); ?>
<?php if ($this->rateit_rating_after): ?>
<!-- indexer::stop -->
<?php $this->block('rating'); ?>
<div id="<?= $this->ratingId ?>" class="<?= $this->class ?> <?= $this->rateit_class ?>">
<?php if ($this->showBefore) : ?>
<div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
<?php endif; ?>
<div class="wrapper">
<div class="rateItRating-selected" style="display: block;"></div>
<div class="rateItRating-hover"></div>
</div>
<?php if ($this->showAfter) : ?>
<div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
<?php endif; ?>
</div>
<?php $this->endblock(); ?>
<!-- indexer::continue -->
<?php endif; ?>

View File

@ -0,0 +1,17 @@
<?php $this->extend('news_latest_rateit'); ?>
<?php $this->block('rating'); ?>
<!-- indexer::stop -->
<div itemtype="http://schema.org/CreativeWork" itemscope class="rating-microdata">
<?php $this->parent(); ?>
<span class="rating-microdata" itemprop="name"><?php echo $this->itemreviewed; ?></span>
<span class="rating-microdata" itemtype="http://schema.org/AggregateRating" itemscope itemprop="aggregateRating">
<span itemprop="ratingValue"><?php echo $this->actRating; ?></span>
<span itemprop="worstRating">0</span>
<span itemprop="bestRating"><?php echo $this->maxRating; ?></span>
<span itemprop="ratingCount"><?php echo $this->votes; ?></span>
</span>
</div>
<!-- indexer::continue -->
<?php $this->endblock(); ?>

View File

@ -0,0 +1,40 @@
<?php if ($this->rateit_rating_before): ?>
<!-- indexer::stop -->
<?php $this->block('rating'); ?>
<div id="<?= $this->ratingId ?>" class="<?= $this->class ?> <?= $this->rateit_class ?>">
<?php if ($this->showBefore) : ?>
<div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
<?php endif; ?>
<div class="wrapper">
<div class="rateItRating-selected" style="display: block;"></div>
<div class="rateItRating-hover"></div>
</div>
<?php if ($this->showAfter) : ?>
<div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
<?php endif; ?>
</div>
<?php $this->endblock(); ?>
<!-- indexer::continue -->
<?php endif; ?>
<?php $this->insert('news_short', $this->arrData); ?>
<?php if ($this->rateit_rating_after): ?>
<!-- indexer::stop -->
<?php $this->block('rating'); ?>
<div id="<?= $this->ratingId ?>" class="<?= $this->class ?> <?= $this->rateit_class ?>">
<?php if ($this->showBefore) : ?>
<div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
<?php endif; ?>
<div class="wrapper">
<div class="rateItRating-selected" style="display: block;"></div>
<div class="rateItRating-hover"></div>
</div>
<?php if ($this->showAfter) : ?>
<div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
<?php endif; ?>
</div>
<?php $this->endblock(); ?>
<!-- indexer::continue -->
<?php endif; ?>

View File

@ -0,0 +1,17 @@
<?php $this->extend('news_short_rateit'); ?>
<?php $this->block('rating'); ?>
<!-- indexer::stop -->
<div itemtype="http://schema.org/CreativeWork" itemscope class="rating-microdata">
<?php $this->parent(); ?>
<span class="rating-microdata" itemprop="name"><?php echo $this->itemreviewed; ?></span>
<span class="rating-microdata" itemtype="http://schema.org/AggregateRating" itemscope itemprop="aggregateRating">
<span itemprop="ratingValue"><?php echo $this->actRating; ?></span>
<span itemprop="worstRating">0</span>
<span itemprop="bestRating"><?php echo $this->maxRating; ?></span>
<span itemprop="ratingCount"><?php echo $this->votes; ?></span>
</span>
</div>
<!-- indexer::continue -->
<?php $this->endblock(); ?>

View File

@ -0,0 +1,40 @@
<?php if ($this->rateit_rating_before): ?>
<!-- indexer::stop -->
<?php $this->block('rating'); ?>
<div id="<?= $this->ratingId ?>" class="<?= $this->class ?> <?= $this->rateit_class ?>">
<?php if ($this->showBefore) : ?>
<div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
<?php endif; ?>
<div class="wrapper">
<div class="rateItRating-selected" style="display: block;"></div>
<div class="rateItRating-hover"></div>
</div>
<?php if ($this->showAfter) : ?>
<div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
<?php endif; ?>
</div>
<?php $this->endblock(); ?>
<!-- indexer::continue -->
<?php endif; ?>
<?php $this->insert('news_simple', $this->arrData); ?>
<?php if ($this->rateit_rating_after): ?>
<!-- indexer::stop -->
<?php $this->block('rating'); ?>
<div id="<?= $this->ratingId ?>" class="<?= $this->class ?> <?= $this->rateit_class ?>">
<?php if ($this->showBefore) : ?>
<div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
<?php endif; ?>
<div class="wrapper">
<div class="rateItRating-selected" style="display: block;"></div>
<div class="rateItRating-hover"></div>
</div>
<?php if ($this->showAfter) : ?>
<div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
<?php endif; ?>
</div>
<?php $this->endblock(); ?>
<!-- indexer::continue -->
<?php endif; ?>

View File

@ -0,0 +1,17 @@
<?php $this->extend('news_simple_rateit'); ?>
<?php $this->block('rating'); ?>
<!-- indexer::stop -->
<div itemtype="http://schema.org/CreativeWork" itemscope class="rating-microdata">
<?php $this->parent(); ?>
<span class="rating-microdata" itemprop="name"><?php echo $this->itemreviewed; ?></span>
<span class="rating-microdata" itemtype="http://schema.org/AggregateRating" itemscope itemprop="aggregateRating">
<span itemprop="ratingValue"><?php echo $this->actRating; ?></span>
<span itemprop="worstRating">0</span>
<span itemprop="bestRating"><?php echo $this->maxRating; ?></span>
<span itemprop="ratingCount"><?php echo $this->votes; ?></span>
</span>
</div>
<!-- indexer::continue -->
<?php $this->endblock(); ?>

View File

@ -0,0 +1,14 @@
<!-- indexer::stop -->
<div id="<?= $this->id ?>" class="<?= $this->class ?> <?= $this->rateit_class ?> block"<?= $this->cssID ?><?php if ($this->style): ?> style="<?= $this->style ?>"<?php endif; ?>>
<?php if ($this->showBefore) : ?>
<div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
<?php endif; ?>
<div class="wrapper">
<div class="rateItRating-selected" style="display: block;"></div>
<div class="rateItRating-hover"></div>
</div>
<?php if ($this->showAfter) : ?>
<div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
<?php endif; ?>
</div>
<!-- indexer::continue -->

View File

@ -0,0 +1,23 @@
<!-- indexer::stop -->
<div itemtype="http://schema.org/CreativeWork" itemscope class="rating-microdata">
<div id="<?= $this->id ?>" class="<?= $this->class ?> <?= $this->rateit_class ?> block"<?= $this->cssID ?><?php if ($this->style): ?> style="<?= $this->style ?>"<?php endif; ?>>
<?php if ($this->showBefore) : ?>
<div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
<?php endif; ?>
<div class="wrapper">
<div class="rateItRating-selected" style="display: block;"></div>
<div class="rateItRating-hover"></div>
</div>
<?php if ($this->showAfter) : ?>
<div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
<?php endif; ?>
</div>
<span class="rating-microdata" itemprop="name"><?php echo $this->itemreviewed; ?></span>
<span class="rating-microdata" itemtype="http://schema.org/AggregateRating" itemscope itemprop="aggregateRating">
<span itemprop="ratingValue"><?php echo $this->actRating; ?></span>
<span itemprop="worstRating">0</span>
<span itemprop="bestRating"><?php echo $this->maxRating; ?></span>
<span itemprop="ratingCount"><?php echo $this->votes; ?></span>
</span>
</div>
<!-- indexer::continue -->

View File

@ -71,7 +71,7 @@ $order_options = &$GLOBALS['TL_LANG']['tl_rateit_order_options'];
<div class="tl_panel">
<div class="tl_submit_panel tl_subpanel">
<input type="image" name="filter" id="filter" src="<?php echo TL_FILES_URL; ?>system/themes/<?php echo $this->getTheme(); ?>/images/reload.gif" class="tl_img_submit" title="<?php echo $text['apply']; ?>" alt="<?php echo $text['apply']; ?>">
<input type="image" name="filter" id="filter" src="<?php echo TL_FILES_URL; ?>system/themes/<?php echo $this->getTheme(); ?>/icons/filter-apply.svg" class="tl_img_submit" title="<?php echo $text['apply']; ?>" alt="<?php echo $text['apply']; ?>">
</div>
<div class="tl_limit tl_subpanel">

View File

@ -99,7 +99,7 @@ $labels = $GLOBALS['TL_CONFIG']['rating_type'] == 'hearts' ? $GLOBALS['TL_LANG']
<div class="tl_panel" style="border-bottom: none !important;">
<div class="tl_submit_panel tl_subpanel">
<input type="image" name="filter" id="filter" src="<?php echo TL_FILES_URL; ?>system/themes/<?php echo $this->getTheme(); ?>/images/reload.gif" class="tl_img_submit" title="<?php echo $text['apply']; ?>" alt="<?php echo $text['apply']; ?>">
<input type="image" name="filter" id="filter" src="<?php echo TL_FILES_URL; ?>system/themes/<?php echo $this->getTheme(); ?>/icons/filter-apply.svg" class="tl_img_submit" title="<?php echo $text['apply']; ?>" alt="<?php echo $text['apply']; ?>">
</div>
<div class="tl_limit tl_subpanel">

View File

@ -48,10 +48,10 @@
text-align:left;
line-height:1;
}
.mod_rateit table th.selectall {
.mod_rateit table th.selectall {
background-color:#fff;
}
.mod_rateit table.rating-selectall {
.mod_rateit table.rating-selectall {
border:0px;
}
.mod_rateit table th { background-color:#fbf7f1; }
@ -116,11 +116,12 @@
}
.mod_rateit div.ratebartext { margin-left:65px; }
.mod_rateit a.header_export_excel{
.mod_rateit a.header_export_excel{
padding:2px 0 3px 20px;
background-image:url("../images/exportEXCEL.gif");
background-image:url("../images/exportEXCEL.svg");
background-size: 16px 16px;
background-position:left center;
background-repeat:no-repeat;
background-repeat:no-repeat;
}
.mod_rateit div.chart {

View File

Before

Width:  |  Height:  |  Size: 847 B

After

Width:  |  Height:  |  Size: 847 B

View File

Before

Width:  |  Height:  |  Size: 392 B

After

Width:  |  Height:  |  Size: 392 B

View File

@ -0,0 +1,95 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="110.03758"
height="107.5"
viewBox="0 0 88.030066 86"
version="1.1"
id="svg2"
inkscape:version="0.48.3.1 r9886"
sodipodi:docname="word.svg">
<metadata
id="metadata126">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs124" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1280"
inkscape:window-height="960"
id="namedview122"
showgrid="false"
inkscape:zoom="1.0905983"
inkscape:cx="344.89442"
inkscape:cy="53.75"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg2"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0" />
<path
d="m 46.04,0 5.94,0 c 0,2.67 0,5.33 0,8 10.01,0 20.02,0.02 30.03,-0.03 1.69,0.07 3.55,-0.05 5.02,0.96 1.03,1.48 0.91,3.36 0.98,5.06 -0.05,17.36 -0.03,34.71 -0.02,52.06 -0.05,2.91 0.27,5.88 -0.34,8.75 -0.4,2.08 -2.9,2.13 -4.57,2.2 -10.36,0.03 -20.73,-0.02 -31.1,0 0,3 0,6 0,9 l -6.21,0 C 30.53,83.23 15.26,80.67 0,78 0,54.67 0,31.34 0,8.01 15.35,5.34 30.7,2.71 46.04,0 z"
id="path10"
inkscape:connector-curvature="0"
style="fill:#207245" />
<path
d="m 51.98,11 c 11,0 22,0 33,0 0,21 0,42 0,63 -11,0 -22,0 -33,0 0,-2 0,-4 0,-6 2.67,0 5.33,0 8,0 0,-2.33 0,-4.67 0,-7 -2.67,0 -5.33,0 -8,0 0,-1.33 0,-2.67 0,-4 2.67,0 5.33,0 8,0 0,-2.33 0,-4.67 0,-7 -2.67,0 -5.33,0 -8,0 0,-1.33 0,-2.67 0,-4 2.67,0 5.33,0 8,0 0,-2.33 0,-4.67 0,-7 -2.67,0 -5.33,0 -8,0 0,-1.33 0,-2.67 0,-4 2.67,0 5.33,0 8,0 0,-2.33 0,-4.67 0,-7 -2.67,0 -5.33,0 -8,0 0,-1.33 0,-2.67 0,-4 2.67,0 5.33,0 8,0 0,-2.33 0,-4.67 0,-7 -2.67,0 -5.33,0 -8,0 0,-2 0,-4 0,-6 z"
id="path48"
inkscape:connector-curvature="0"
style="fill:#ffffff" />
<path
d="m 63.98,17 c 4.67,0 9.33,0 14,0 0,2.33 0,4.67 0,7 -4.67,0 -9.33,0 -14,0 0,-2.33 0,-4.67 0,-7 z"
id="path58"
inkscape:connector-curvature="0"
style="fill:#207245" />
<path
d="m 29.62,26.37 c 2.26,-0.16 4.53,-0.3 6.8,-0.41 -2.67,5.47 -5.35,10.94 -8.07,16.39 2.75,5.6 5.56,11.16 8.32,16.76 -2.41,-0.14 -4.81,-0.29 -7.22,-0.46 -1.7,-4.17 -3.77,-8.2 -4.99,-12.56 -1.36,4.06 -3.3,7.89 -4.86,11.87 -2.19,-0.03 -4.38,-0.12 -6.57,-0.21 2.57,-5.03 5.05,-10.1 7.7,-15.1 -2.25,-5.15 -4.72,-10.2 -7.04,-15.32 2.2,-0.13 4.4,-0.26 6.6,-0.38 1.49,3.91 3.12,7.77 4.35,11.78 1.32,-4.25 3.29,-8.25 4.98,-12.36 z"
id="path72"
inkscape:connector-curvature="0"
style="fill:#ffffff" />
<path
d="m 63.98,28 c 4.67,0 9.33,0 14,0 0,2.33 0,4.67 0,7 -4.67,0 -9.33,0 -14,0 0,-2.33 0,-4.67 0,-7 z"
id="path90"
inkscape:connector-curvature="0"
style="fill:#207245" />
<path
d="m 63.98,39 c 4.67,0 9.33,0 14,0 0,2.33 0,4.67 0,7 -4.67,0 -9.33,0 -14,0 0,-2.33 0,-4.67 0,-7 z"
id="path108"
inkscape:connector-curvature="0"
style="fill:#207245" />
<path
d="m 63.98,50 c 4.67,0 9.33,0 14,0 0,2.33 0,4.67 0,7 -4.67,0 -9.33,0 -14,0 0,-2.33 0,-4.67 0,-7 z"
id="path114"
inkscape:connector-curvature="0"
style="fill:#207245" />
<path
d="m 63.98,61 c 4.67,0 9.33,0 14,0 0,2.33 0,4.67 0,7 -4.67,0 -9.33,0 -14,0 0,-2.33 0,-4.67 0,-7 z"
id="path120"
inkscape:connector-curvature="0"
style="fill:#207245" />
</svg>

After

Width:  |  Height:  |  Size: 4.0 KiB

View File

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

Before

Width:  |  Height:  |  Size: 722 B

After

Width:  |  Height:  |  Size: 722 B

View File

Before

Width:  |  Height:  |  Size: 354 B

After

Width:  |  Height:  |  Size: 354 B

View File

Before

Width:  |  Height:  |  Size: 625 B

After

Width:  |  Height:  |  Size: 625 B

View File

Before

Width:  |  Height:  |  Size: 815 B

After

Width:  |  Height:  |  Size: 815 B

Some files were not shown because too many files have changed in this diff Show More