diff --git a/.gitattributes b/.gitattributes index daab3b0..8a11965 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,10 +1,16 @@ * text=auto !eol +changed_full/XE420-XE448/out/basic/tpl/_left.tpl -text +changed_full/XE420-XE448/out/basic/tpl/inc/d3usersonline.tpl -text +changed_full/XE450/out/azure/tpl/inc/d3usersonline.tpl -text +changed_full/XE450/out/azure/tpl/layout/sidebar.tpl -text +changed_full/XE450/out/basic/tpl/_left.tpl -text +changed_full/XE450/out/basic/tpl/inc/d3usersonline.tpl -text changed_full/XE451-XE453/out/azure/tpl/inc/d3usersonline.tpl -text changed_full/XE451-XE453/out/azure/tpl/layout/sidebar.tpl -text changed_full/XE451-XE453/out/basic/tpl/_left.tpl -text changed_full/XE451-XE453/out/basic/tpl/inc/d3usersonline.tpl -text copy_this/core/d3usersonline.php -text copy_this/modules/d3usersonline/views/d3_oxcmp_utils_usersonline.php -text -setup+doku/readme_de.txt -text -setup+doku/readme_en.txt -text +setup+doku/Installation.pdf -text +setup+doku/install.sql -text source/UsersOnline-Installation.docx -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8f5715e --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +setup+doku/update.txt diff --git a/changed_full/XE420-XE448/out/basic/tpl/_left.tpl b/changed_full/XE420-XE448/out/basic/tpl/_left.tpl new file mode 100644 index 0000000..bd6d191 --- /dev/null +++ b/changed_full/XE420-XE448/out/basic/tpl/_left.tpl @@ -0,0 +1,79 @@ +[{if $oView->showSearch() }] + [{ oxmultilang ident="INC_LEFTITEM_PRODUCTSEARCH" }] + +[{/if}] +[{if $oxcmp_categories }] + [{if $oView->showTopCatNavigation()}] + [{include file="inc/category_tree.tpl" tree=$oxcmp_categories->getClickRoot() act=$oxcmp_categories->getClickCat() class="tree"}] + [{else}] + [{include file="inc/category_tree.tpl" tree=$oxcmp_categories act=$oxcmp_categories->getClickCat() class="tree"}] + [{/if}] +[{/if}] + +[{if $oView->loadVendorTree() && $oView->getVendorlist()}] + [{include file="inc/vendor_tree.tpl" tree=$oView->getVendorlist() class="tree"}] +[{/if}] + +[{if $oView->loadManufacturerTree() && $oView->getManufacturerlist()}] + [{include file="inc/manufacturer_tree.tpl" tree=$oView->getManufacturerlist() class="tree"}] +[{/if}] + +[{*** D3 Modul "UsersOnline" START ***}] + [{include file="inc/d3usersonline.tpl"}] +[{*** D3 Modul "UsersOnline" END ***}] + +[{if $oView->showLeftBasket()}] + [{oxid_include_dynamic file="dyn/mini_basket.tpl" type="basket" testid="LeftBasket"}] +[{/if}] + +[{include file="inc/infobox.tpl"}] + +[{if $oxcmp_news && count($oxcmp_news) > 0}] + [{include file="inc/cmp_news.tpl"}] +[{/if}] + +[{ oxmultilang ident="INC_LEFTITEM_PARTNERANDSEAL" }] +
+ + +
+ + diff --git a/changed_full/XE420-XE448/out/basic/tpl/inc/d3usersonline.tpl b/changed_full/XE420-XE448/out/basic/tpl/inc/d3usersonline.tpl new file mode 100644 index 0000000..6d148a8 --- /dev/null +++ b/changed_full/XE420-XE448/out/basic/tpl/inc/d3usersonline.tpl @@ -0,0 +1,8 @@ +[{if $oxcmp_user && $oxcmp_user->oxuser__oxrights->value == 'malladmin'}] + Online + [{strip}] +
+ [{$usersonline }] User(s) +
+ [{/strip}] +[{/if}] \ No newline at end of file diff --git a/changed_full/XE450/out/azure/tpl/inc/d3usersonline.tpl b/changed_full/XE450/out/azure/tpl/inc/d3usersonline.tpl new file mode 100644 index 0000000..fa91d3b --- /dev/null +++ b/changed_full/XE450/out/azure/tpl/inc/d3usersonline.tpl @@ -0,0 +1,8 @@ +[{if $oxcmp_user && $oxcmp_user->oxuser__oxrights->value == 'malladmin'}] +
+

Online

+
+ [{$usersonline }] User(s) +
+
+[{/if}] \ No newline at end of file diff --git a/changed_full/XE450/out/azure/tpl/layout/sidebar.tpl b/changed_full/XE450/out/azure/tpl/layout/sidebar.tpl new file mode 100644 index 0000000..f820a02 --- /dev/null +++ b/changed_full/XE450/out/azure/tpl/layout/sidebar.tpl @@ -0,0 +1,70 @@ +[{if $oView->isDemoShop()}] + [{ include file="widget/sidebar/adminbanner.tpl" }] +[{/if}] + +[{if $oxcmp_categories }] +[{capture append="oxidBlock_sidebar" }] + [{include file="widget/sidebar/categoriestree.tpl" categories=$oxcmp_categories->getClickRoot() act=$oxcmp_categories->getClickCat() deepLevel=0}] +[{/capture}] +[{/if}] + +[{*** D3 Modul "UsersOnline" START ***}] + [{include file="inc/d3usersonline.tpl"}] +[{*** D3 Modul "UsersOnline" END ***}] + +[{if $oView->getClassName() eq "start" && $oView->getTop5ArticleList()}] +[{capture append="oxidBlock_sidebar" }] + [{include file="widget/product/boxproducts.tpl" _boxId="topBox" _oBoxProducts=$oView->getTop5ArticleList() _sHeaderIdent="BOX_TOPOFTHESHOP_HEADER"}] +[{/capture}] +[{/if}] + +[{if $oViewConf->getShowListmania() }] +[{capture append="oxidBlock_sidebar"}] + [{include file="widget/sidebar/recommendation.tpl"}] +[{/capture}] +[{/if}] + +[{if $oView->getClassName() ne "details" && $oView->getClassName() ne "tags"}] + [{if $oView->getTagCloudManager() }] + [{capture append="oxidBlock_sidebar"}] + [{include file="widget/sidebar/tags.tpl" oTagsManager=$oView->getTagCloudManager()}] + [{/capture}] + [{/if}] +[{/if}] + +[{if $oxcmp_news|count }] +[{capture append="oxidBlock_sidebar"}] + [{include file="widget/sidebar/news.tpl" oNews=$oxcmp_news}] +[{/capture}] +[{/if}] + +[{if $oView->isActive('FbFacepile') && $oView->isConnectedWithFb()}] +[{capture append="oxidBlock_sidebar"}] + [{include file="widget/facebook/facepile.tpl"}] +[{/capture}] +[{/if}] + +[{if $oView->getClassName() eq "start"}] + [{capture append="oxidBlock_sidebar"}] + [{include file="widget/sidebar/partners.tpl" }] + [{/capture}] +[{/if}] + +[{if $oView->getClassName() eq "start"}] + [{if $oViewConf->showTs("WIDGET")}] + [{capture append="oxidBlock_sidebar"}] + [{include file="widget/trustedshops/ratings.tpl" }] + [{/capture}] + [{/if}] +[{/if}] + +[{if $oView->getClassName() eq "start"}] + [{capture append="oxidBlock_sidebar"}] + [{include file="widget/shoplupe/ratings.tpl" }] + [{/capture}] +[{/if}] + +[{foreach from=$oxidBlock_sidebar item="_block"}] + [{$_block}] +[{/foreach}] + diff --git a/changed_full/XE450/out/basic/tpl/_left.tpl b/changed_full/XE450/out/basic/tpl/_left.tpl new file mode 100644 index 0000000..9b17045 --- /dev/null +++ b/changed_full/XE450/out/basic/tpl/_left.tpl @@ -0,0 +1,79 @@ +[{if $oView->showSearch() }] + [{ oxmultilang ident="INC_LEFTITEM_PRODUCTSEARCH" }] + +[{/if}] +[{if $oxcmp_categories }] + [{if $oView->showTopCatNavigation()}] + [{include file="inc/category_tree.tpl" tree=$oxcmp_categories->getClickRoot() act=$oxcmp_categories->getClickCat() class="tree"}] + [{else}] + [{include file="inc/category_tree.tpl" tree=$oxcmp_categories act=$oxcmp_categories->getClickCat() class="tree"}] + [{/if}] +[{/if}] + +[{if $oView->loadVendorTree() && $oView->getVendorlist()}] + [{include file="inc/vendor_tree.tpl" tree=$oView->getVendorlist() class="tree"}] +[{/if}] + +[{if $oView->loadManufacturerTree() && $oView->getManufacturerlist()}] + [{include file="inc/manufacturer_tree.tpl" tree=$oView->getManufacturerlist() class="tree"}] +[{/if}] + +[{*** D3 Modul "UsersOnline" START ***}] + [{include file="inc/d3usersonline.tpl"}] +[{*** D3 Modul "UsersOnline" END ***}] + +[{if $oView->showLeftBasket()}] + [{oxid_include_dynamic file="dyn/mini_basket.tpl" type="basket" testid="LeftBasket"}] +[{/if}] + +[{include file="inc/infobox.tpl"}] + +[{if $oxcmp_news && count($oxcmp_news) > 0}] + [{include file="inc/cmp_news.tpl"}] +[{/if}] + +[{ oxmultilang ident="INC_LEFTITEM_PARTNERANDSEAL" }] +
+ + +
+ + diff --git a/changed_full/XE450/out/basic/tpl/inc/d3usersonline.tpl b/changed_full/XE450/out/basic/tpl/inc/d3usersonline.tpl new file mode 100644 index 0000000..6d148a8 --- /dev/null +++ b/changed_full/XE450/out/basic/tpl/inc/d3usersonline.tpl @@ -0,0 +1,8 @@ +[{if $oxcmp_user && $oxcmp_user->oxuser__oxrights->value == 'malladmin'}] + Online + [{strip}] +
+ [{$usersonline }] User(s) +
+ [{/strip}] +[{/if}] \ No newline at end of file diff --git a/changed_full/XE451-XE453/out/azure/tpl/inc/d3usersonline.tpl b/changed_full/XE451-XE453/out/azure/tpl/inc/d3usersonline.tpl index f464b62..fa91d3b 100644 --- a/changed_full/XE451-XE453/out/azure/tpl/inc/d3usersonline.tpl +++ b/changed_full/XE451-XE453/out/azure/tpl/inc/d3usersonline.tpl @@ -1,6 +1,8 @@ -
-

Online

-
- [{$usersonline }] User(s) +[{if $oxcmp_user && $oxcmp_user->oxuser__oxrights->value == 'malladmin'}] +
+

Online

+
+ [{$usersonline }] User(s) +
-
\ No newline at end of file +[{/if}] \ No newline at end of file diff --git a/changed_full/XE451-XE453/out/azure/tpl/layout/sidebar.tpl b/changed_full/XE451-XE453/out/azure/tpl/layout/sidebar.tpl index 10fbce7..d0e2df3 100644 --- a/changed_full/XE451-XE453/out/azure/tpl/layout/sidebar.tpl +++ b/changed_full/XE451-XE453/out/azure/tpl/layout/sidebar.tpl @@ -16,9 +16,7 @@ [{/block}] [{*** D3 Modul "UsersOnline" START ***}] - [{if $oxcmp_user && $oxcmp_user->oxuser__oxrights->value == 'malladmin'}] - [{include file="inc/d3usersonline.tpl"}] - [{/if}] + [{include file="inc/d3usersonline.tpl"}] [{*** D3 Modul "UsersOnline" END ***}] [{block name="sidebar_trustedshopsratings"}] diff --git a/changed_full/XE451-XE453/out/basic/tpl/_left.tpl b/changed_full/XE451-XE453/out/basic/tpl/_left.tpl index 988e71b..9b17045 100644 --- a/changed_full/XE451-XE453/out/basic/tpl/_left.tpl +++ b/changed_full/XE451-XE453/out/basic/tpl/_left.tpl @@ -1,81 +1,79 @@ -[{if $oView->showSearch() }] - [{ oxmultilang ident="INC_LEFTITEM_PRODUCTSEARCH" }] - -[{/if}] -[{if $oxcmp_categories }] - [{if $oView->showTopCatNavigation()}] - [{include file="inc/category_tree.tpl" tree=$oxcmp_categories->getClickRoot() act=$oxcmp_categories->getClickCat() class="tree"}] - [{else}] - [{include file="inc/category_tree.tpl" tree=$oxcmp_categories act=$oxcmp_categories->getClickCat() class="tree"}] - [{/if}] -[{/if}] - -[{if $oView->loadVendorTree() && $oView->getVendorlist()}] - [{include file="inc/vendor_tree.tpl" tree=$oView->getVendorlist() class="tree"}] -[{/if}] - -[{if $oView->loadManufacturerTree() && $oView->getManufacturerlist()}] - [{include file="inc/manufacturer_tree.tpl" tree=$oView->getManufacturerlist() class="tree"}] -[{/if}] - -[{*** D3 Modul "UsersOnline" START ***}] - [{if $oxcmp_user && $oxcmp_user->oxuser__oxrights->value == 'malladmin'}] - [{include file="inc/d3usersonline.tpl"}] - [{/if}] -[{*** D3 Modul "UsersOnline" END ***}] - -[{if $oView->showLeftBasket()}] - [{oxid_include_dynamic file="dyn/mini_basket.tpl" type="basket" testid="LeftBasket"}] -[{/if}] - -[{include file="inc/infobox.tpl"}] - -[{if $oxcmp_news && count($oxcmp_news) > 0}] - [{include file="inc/cmp_news.tpl"}] -[{/if}] - -[{ oxmultilang ident="INC_LEFTITEM_PARTNERANDSEAL" }] -
- - -
- - +[{if $oView->showSearch() }] + [{ oxmultilang ident="INC_LEFTITEM_PRODUCTSEARCH" }] + +[{/if}] +[{if $oxcmp_categories }] + [{if $oView->showTopCatNavigation()}] + [{include file="inc/category_tree.tpl" tree=$oxcmp_categories->getClickRoot() act=$oxcmp_categories->getClickCat() class="tree"}] + [{else}] + [{include file="inc/category_tree.tpl" tree=$oxcmp_categories act=$oxcmp_categories->getClickCat() class="tree"}] + [{/if}] +[{/if}] + +[{if $oView->loadVendorTree() && $oView->getVendorlist()}] + [{include file="inc/vendor_tree.tpl" tree=$oView->getVendorlist() class="tree"}] +[{/if}] + +[{if $oView->loadManufacturerTree() && $oView->getManufacturerlist()}] + [{include file="inc/manufacturer_tree.tpl" tree=$oView->getManufacturerlist() class="tree"}] +[{/if}] + +[{*** D3 Modul "UsersOnline" START ***}] + [{include file="inc/d3usersonline.tpl"}] +[{*** D3 Modul "UsersOnline" END ***}] + +[{if $oView->showLeftBasket()}] + [{oxid_include_dynamic file="dyn/mini_basket.tpl" type="basket" testid="LeftBasket"}] +[{/if}] + +[{include file="inc/infobox.tpl"}] + +[{if $oxcmp_news && count($oxcmp_news) > 0}] + [{include file="inc/cmp_news.tpl"}] +[{/if}] + +[{ oxmultilang ident="INC_LEFTITEM_PARTNERANDSEAL" }] +
+ + +
+ + diff --git a/changed_full/XE451-XE453/out/basic/tpl/inc/d3usersonline.tpl b/changed_full/XE451-XE453/out/basic/tpl/inc/d3usersonline.tpl index e1fe52d..6d148a8 100644 --- a/changed_full/XE451-XE453/out/basic/tpl/inc/d3usersonline.tpl +++ b/changed_full/XE451-XE453/out/basic/tpl/inc/d3usersonline.tpl @@ -1,6 +1,8 @@ -Online -[{strip}] -
- [{$usersonline }] User(s) -
-[{/strip}] \ No newline at end of file +[{if $oxcmp_user && $oxcmp_user->oxuser__oxrights->value == 'malladmin'}] + Online + [{strip}] +
+ [{$usersonline }] User(s) +
+ [{/strip}] +[{/if}] \ No newline at end of file diff --git a/setup+doku/Installation.pdf b/setup+doku/Installation.pdf new file mode 100644 index 0000000..2e590de Binary files /dev/null and b/setup+doku/Installation.pdf differ diff --git a/setup+doku/install.sql b/setup+doku/install.sql new file mode 100644 index 0000000..4be580d --- /dev/null +++ b/setup+doku/install.sql @@ -0,0 +1,7 @@ +CREATE TABLE d3usersonline ( + `id` int(11) NOT NULL auto_increment, + `visitor` varchar(100) default NULL, + `timevisit` int(11) NOT NULL default '0', + `oxclass` varchar(32) collate latin1_general_ci NOT NULL, + PRIMARY KEY (id) +) TYPE=MyISAM; \ No newline at end of file diff --git a/setup+doku/readme_de.txt b/setup+doku/readme_de.txt deleted file mode 100644 index 18d69c2..0000000 --- a/setup+doku/readme_de.txt +++ /dev/null @@ -1,45 +0,0 @@ -Authors: Aggrosoft it intelligence, D3 Data Development - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . - ------------------------------------------------------------------------ - -Installation: - -Kopieren Sie die Inhalte des "copy_this"-Ordner in Ihr Shop-Verzeichnis, - -Führen Sie folgendes Script in Ihrer Datenbank aus: - -CREATE TABLE d3usersonline ( - `id` int(11) NOT NULL auto_increment, - `visitor` varchar(100) default NULL, - `timevisit` int(11) NOT NULL default '0', - `oxclass` varchar(32) collate latin1_general_ci NOT NULL, - PRIMARY KEY (id) -) TYPE=MyISAM; - -Fügen Sie nun das Modul zu Ihrem Shop hinzu: - -oxcmp_utils => d3usersonline/views/d3_oxcmp_utils_usersonline - -Sie können den counter nun in eines Ihrer Templates einbauen (evtl. _left.tpl) -Hierfür benötigen Sie lediglich folgende Zeile: - -[{include file="inc/d3ce_usersonline.tpl"}] - -HINWEIS: - -Da nach deutschem Recht nicht einfach irgendwelche IP's in der DB abgespeichert werden -dürfen und Sie auch sicherlich kein Interesse an den IP's haben wird aus der User IP -ein Hash errechnet und dieser zum Vergleich herangezogen und gespeichert. diff --git a/setup+doku/readme_en.txt b/setup+doku/readme_en.txt deleted file mode 100644 index 4c97f28..0000000 --- a/setup+doku/readme_en.txt +++ /dev/null @@ -1,42 +0,0 @@ -Authors: Aggrosoft it intelligence, D3 Data Development - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . - ------------------------------------------------------------------------ - -Installation: - -Copy the contents in the "copy_this"-folder into your oxid folder. - -Execute the following SQL Script in your oxid database (tools menu in admin backend): - -CREATE TABLE d3ce_online_users ( - id int(11) NOT NULL auto_increment, - visitor varchar(100) default NULL, - timevisit int(11) NOT NULL default '0', - PRIMARY KEY (id) -) TYPE=MyISAM; - -Add the Module to your Oxid Modules in the admin backend: - -oxcmp_utils => d3ce_usersonline/views/d3ce_oxcmp_utils_usersonline - -Now you can include the counter anywhere in your templates (e.g. _left.tpl) -You just need the following line: - -[{include file="inc/d3ce_usersonline.tpl"}] - -LEGAL NOTICE: - -The users ip is never saved in your database, the ip will be hashed before it is stored. \ No newline at end of file diff --git a/source/UsersOnline-Installation.docx b/source/UsersOnline-Installation.docx index 9a7d320..bdfa760 100644 Binary files a/source/UsersOnline-Installation.docx and b/source/UsersOnline-Installation.docx differ