Menu
▾
▴
xoops-svn — All SVN commits will be posted to this ML
You can subscribe to this list here.
| 2012 |
Jan
|
Feb
(214) |
Mar
(139) |
Apr
(198) |
May
(187) |
Jun
(151) |
Jul
(210) |
Aug
(169) |
Sep
(58) |
Oct
(53) |
Nov
(54) |
Dec
(301) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2013 |
Jan
(348) |
Feb
(178) |
Mar
(219) |
Apr
(154) |
May
(117) |
Jun
(194) |
Jul
(61) |
Aug
(132) |
Sep
(121) |
Oct
(110) |
Nov
(11) |
Dec
(18) |
| 2014 |
Jan
(34) |
Feb
(50) |
Mar
(82) |
Apr
(98) |
May
(39) |
Jun
(111) |
Jul
(67) |
Aug
(36) |
Sep
(33) |
Oct
(26) |
Nov
(53) |
Dec
(44) |
| 2015 |
Jan
(29) |
Feb
(47) |
Mar
(25) |
Apr
(19) |
May
(23) |
Jun
(20) |
Jul
(49) |
Aug
(7) |
Sep
(10) |
Oct
(10) |
Nov
(4) |
Dec
(25) |
| 2016 |
Jan
(8) |
Feb
(7) |
Mar
(1) |
Apr
|
May
(3) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(7) |
Dec
(5) |
| 2017 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(15) |
Jun
|
Jul
(18) |
Aug
(24) |
Sep
|
Oct
(14) |
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
(22) |
Mar
|
Apr
(11) |
May
(1) |
Jun
(17) |
Jul
(2) |
Aug
(2) |
Sep
|
Oct
(6) |
Nov
(5) |
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
| 2025 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ma...@us...> - 2012-11-25 20:56:36
|
Revision: 10273
http://sourceforge.net/p/xoops/svn/10273
Author: mageg
Date: 2012-11-25 20:56:32 +0000 (Sun, 25 Nov 2012)
Log Message:
-----------
first version of the module content (page)
Added Paths:
-----------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/about.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/content.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/header.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/index.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/menu.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/permissions.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/related.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/blocks/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/blocks/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/blocks/page_blocks.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/class/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/class/form/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/class/form/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/class/form/page_content.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/class/form/page_related.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/class/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/class/page.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/class/page_content.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/class/page_rating.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/class/page_related.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/css/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/css/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/css/rating.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/css/styles.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/docs/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/docs/changelog.txt
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/docs/credits.txt
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/docs/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/docs/install.txt
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/docs/lang_diff.txt
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/docs/licence.txt
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/docs/readme.txt
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/header.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/icons/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/icons/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/icons/logo_large.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/icons/logo_small.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/images/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/images/blank.gif
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/images/comments.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/images/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/images/logo.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/images/next.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/images/previous.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/images/rating/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/images/rating/delete.gif
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/images/rating/star.gif
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/include/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/include/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/include/install.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/index.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/js/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/js/MetaData.js
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/js/jquery.rating.js
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/js/rating.js
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/js/rating.pack.js
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/language/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/language/english/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/language/english/admin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/language/english/blocks.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/language/english/help/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/language/english/help/help.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/language/english/help/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/language/english/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/language/english/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/language/english/modinfo.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/language/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/preloads/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/preloads/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/rating.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/sql/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/sql/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/sql/mysql.sql
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/templates/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/templates/admin/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/templates/admin/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/templates/admin/page_admin_content.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/templates/admin/page_admin_permissions.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/templates/admin/page_admin_related.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/templates/blocks/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/templates/blocks/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/templates/blocks/page_blocks_hits.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/templates/blocks/page_blocks_id.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/templates/blocks/page_blocks_random.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/templates/blocks/page_blocks_rating.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/templates/blocks/page_blocks_recent.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/templates/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/templates/page_index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/templates/page_navigation.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/templates/page_viewpage.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/viewpage.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/xoops_version.php
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page
___________________________________________________________________
Added: tsvn:autoprops
+ *.php = svn:executable=*;svn:keywords=Author Date Id Rev URL;
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin
___________________________________________________________________
Added: tsvn:autoprops
+ *.php = svn:executable=*;svn:keywords=Author Date Id Rev URL;
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/about.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/about.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/about.php 2012-11-25 20:56:32 UTC (rev 10273)
@@ -0,0 +1,27 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ 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.
+*/
+
+/**
+ * page module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package page
+ * @since 2.6.0
+ * @author Mage Gr\xE9gory (AKA Mage)
+ * @version $Id$
+ */
+include dirname(__FILE__) . '/header.php';
+$xoops->header();
+$aboutAdmin = new XoopsModuleAdmin();
+$aboutAdmin->renderNavigation('about.php');
+$aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', true);
+$xoops->footer();
\ No newline at end of file
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/about.php
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:keywords
+ Author Date Id Rev URL
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/content.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/content.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/content.php 2012-11-25 20:56:32 UTC (rev 10273)
@@ -0,0 +1,355 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ 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.
+*/
+
+/**
+ * page module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package page
+ * @since 2.6.0
+ * @author Mage Gr\xE9gory (AKA Mage)
+ * @version $Id$
+ */
+include dirname(__FILE__) . '/header.php';
+// Get main instance
+$system = System::getInstance();
+// Check users rights
+if (!$xoops->isUser() || !$xoops->isModule() || !$xoops->user->isAdmin($xoops->module->mid())) {
+ exit(_NOPERM);
+}
+// Parameters
+$nb_content = $xoops->getModuleConfig('page_adminpager');
+// Get Action type
+$op = $system->cleanVars($_REQUEST, 'op', 'default', 'string');
+// Get handler
+$content_Handler = $xoops->getModuleHandler('page_content');
+$related_Handler = $xoops->getModuleHandler('page_related');
+$gperm_handler = $xoops->getHandler('groupperm');
+// Call header
+$xoops->header('page_admin_content.html');
+// Get start pager
+$start = $system->cleanVars($_REQUEST, 'start', 0, 'int');
+
+$admin_page = new XoopsModuleAdmin();
+$admin_page->renderNavigation('content.php');
+
+switch ($op) {
+
+ case 'list':
+ default:
+ // Add Scripts
+ $xoops->theme->addScript('media/xoops/xoops.js');
+ $admin_page->addTips(_AM_PAGE_CONTENT_TIPS);
+ $admin_page->addItemButton(_AM_PAGE_CONTENT_ADD, 'content.php?op=new', 'add');
+ $admin_page->renderTips();
+ $admin_page->renderButton();
+
+ // Criteria
+ $criteria = new CriteriaCompo();
+ $criteria->setSort('content_weight ASC, content_title');
+ $criteria->setOrder('ASC');
+ $criteria->setStart($start);
+ $criteria->setLimit($nb_content);
+ $content_count = $content_Handler->getCount($criteria);
+ $content_arr = $content_Handler->getAll($criteria);
+ // Assign Template variables
+ $xoops->tpl->assign('content_count', $content_count);
+ if ($content_count > 0) {
+ foreach (array_keys($content_arr) as $i) {
+ $content_id = $content_arr[$i]->getVar('content_id');
+ $content['id'] = $content_id;
+ $content['title'] = $content_arr[$i]->getVar('content_title');
+ $content['maindisplay'] = $content_arr[$i]->getVar('content_maindisplay');
+ $content['weight'] = $content_arr[$i]->getVar('content_weight');
+ $content['status'] = $content_arr[$i]->getVar('content_status');
+ $content['hits'] = $content_arr[$i]->getVar('content_hits');
+ $content['rating'] = number_format($content_arr[$i]->getVar('content_rating'), 1);
+ $xoops->tpl->append_by_ref('content', $content);
+ unset($content);
+ }
+ // Display Page Navigation
+ if ($content_count > $nb_content) {
+ $nav = new XoopsPageNav($content_count, $nb_content, $start, 'start');
+ $xoops->tpl->assign('nav_menu', $nav->renderNav(4));
+ }
+ } else {
+ $xoops->tpl->assign('error_message', _AM_PAGE_CONTENT_ERROR_NOCONTENT);
+ }
+ break;
+
+ case 'new':
+ $admin_page->addItemButton(_AM_PAGE_CONTENT_LIST, 'content.php', 'application-view-detail');
+ $admin_page->renderButton();
+ $obj = $content_Handler->create();
+ $form = $xoops->getModuleForm($obj, 'page_content');
+ $form->render();
+ $xoops->tpl->assign('form', true);
+ break;
+
+ case 'edit':
+ $admin_page->addItemButton(_AM_PAGE_CONTENT_LIST, 'content.php', 'application-view-detail');
+ $admin_page->addItemButton(_AM_PAGE_CONTENT_ADD, 'content.php?op=new', 'add');
+ $admin_page->renderButton();
+ // Create form
+ $obj = $content_Handler->get($system->cleanVars($_REQUEST, 'id', 0, 'int'));
+ $form = $xoops->getModuleForm($obj, 'page_content');
+ $form->render();
+ $xoops->tpl->assign('form', true);
+ break;
+
+ case 'save':
+ if (!$xoops->security->check()) {
+ $xoops->redirect("content.php", 3, implode(",", $xoops->security->getErrors()));
+ }
+ $content_id = $system->cleanVars($_REQUEST, 'content_id', 0, 'int');
+ if ($content_id > 0) {
+ $obj = $content_Handler->get($content_id);
+ if ($_POST["date_update"] == 'Y'){
+ $obj->setVar("content_create", strtotime($_POST["content_create"]));
+ }
+ } else {
+ $obj = $content_Handler->create();
+ $obj->setVar("content_create", time());
+ }
+ $error_message = '';
+ $error = false;
+
+ $obj->setVar("content_title", $_POST["content_title"]);
+ $obj->setVar("content_shorttext", $_POST["content_shorttext"]);
+ $obj->setVar("content_text", $_POST["content_text"]);
+ $obj->setVar("content_mkeyword", $_POST["content_mkeyword"]);
+ $obj->setVar("content_mdescription", $_POST["content_mdescription"]);
+ $obj->setVar("content_author", $_POST["content_author"]);
+ $obj->setVar("content_status", $_POST["content_status"]);
+ $obj->setVar("content_maindisplay", $_POST["content_maindisplay"]);
+ $obj->setVar("content_dopdf", 0);
+ $obj->setVar("content_doprint", 0);
+ $obj->setVar("content_domail", 0);
+ $obj->setVar("content_doauthor", 0);
+ $obj->setVar("content_dodate", 0);
+ $obj->setVar("content_dohits", 0);
+ $obj->setVar("content_dorating", 0);
+ $obj->setVar("content_doncoms", 0);
+ $obj->setVar("content_docoms", 0);
+ $obj->setVar("content_dosocial", 0);
+ $obj->setVar("content_dotitle", 0);
+ $obj->setVar("content_donotifications", 0);
+ if (isset($_POST["content_option"])) {
+ $content_option = $_POST["content_option"];
+ foreach (array_keys($content_option) as $i) {
+ switch ($content_option[$i]) {
+ case 'pdf':
+ $obj->setVar("content_dopdf", 1);
+ break;
+ case 'print':
+ $obj->setVar("content_doprint", 1);
+ break;
+ case 'mail':
+ $obj->setVar("content_domail", 1);
+ break;
+ case 'author':
+ $obj->setVar("content_doauthor", 1);
+ break;
+ case 'date':
+ $obj->setVar("content_dodate", 1);
+ break;
+ case 'hits':
+ $obj->setVar("content_dohits", 1);
+ break;
+ case 'rating':
+ $obj->setVar("content_dorating", 1);
+ break;
+ case 'coms':
+ $obj->setVar("content_docoms", 1);
+ break;
+ case 'ncoms':
+ $obj->setVar("content_doncoms", 1);
+ break;
+ case 'social':
+ $obj->setVar("content_dosocial", 1);
+ break;
+ case 'title':
+ $obj->setVar("content_dotitle", 1);
+ break;
+ case 'notifications':
+ $obj->setVar("content_donotifications", 1);
+ break;
+ }
+ }
+ }
+ if (preg_match('/^\d+$/', $_POST["content_weight"]) == false){
+ $error = true;
+ $error_message .= _AM_PAGE_CATEGORY_ERROR_WEIGHT . '<br />';
+ $obj->setVar("content_weight", '');
+ } else {
+ $obj->setVar("content_weight", $_POST["content_weight"]);
+ }
+ if ($error == true){
+ $xoops->tpl->assign('error_message', $error_message);
+ } else {
+ if ($content_Handler->insert($obj)) {
+ $newcontent_id = $obj->get_new_id();
+ $perm_id = isset($_REQUEST['content_id']) ? $content_id : $newcontent_id;
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('gperm_itemid', $perm_id, '='));
+ $criteria->add(new Criteria('gperm_modid', $xoopsModule->getVar('mid'),'='));
+ $criteria->add(new Criteria('gperm_name', 'page_view_item', '='));
+ $gperm_handler->deleteAll($criteria);
+ //permissions view
+ if(isset($_POST['groups_view_item'])) {
+ foreach($_POST['groups_view_item'] as $onegroup_id) {
+ $gperm_handler->addRight('page_view_item', $perm_id, $onegroup_id, $xoopsModule->getVar('mid'));
+ }
+ }
+ $xoops->redirect("content.php", 2, _AM_PAGE_DBUPDATED);
+ }
+ $xoops->error($obj->getHtmlErrors());
+ }
+ $form = $xoops->getModuleForm($obj, 'page_content');
+ $form->render();
+ $xoops->tpl->assign('form', true);
+ break;
+
+ case 'delete':
+ $admin_page->addItemButton(_AM_PAGE_CONTENT_LIST, 'content.php', 'application-view-detail');
+ $admin_page->addItemButton(_AM_PAGE_CONTENT_ADD, 'content.php?op=new', 'add');
+ $admin_page->renderButton();
+ // Define Stylesheet
+ $xoops->theme->addStylesheet('modules/system/css/admin.css');
+ $content_id = $system->cleanVars($_REQUEST, 'id', 0, 'int');
+ $obj = $content_Handler->get($content_id);
+ if (isset($_POST["ok"]) && $_POST["ok"] == 1) {
+ if (!$xoops->security->check()) {
+ $xoops->redirect("content.php", 3, implode(",", $xoops->security->getErrors()));
+ }
+ // Deleting the content
+ if ($content_Handler->delete($obj)) {
+ // deleting permissions
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('gperm_itemid', $content_id, '='));
+ $criteria->add(new Criteria('gperm_modid', $xoopsModule->getVar('mid'),'='));
+ $criteria->add(new Criteria('gperm_name', 'page_view_item', '='));
+ $gperm_handler->deleteAll($criteria);
+ // deleting secondary
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('related_group', 0, '!='));
+ $criteria->add(new Criteria('related_contentid', $content_id));
+ $related_Handler->deleteAll($criteria);
+ // deleting main and secondary
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('related_group', 0));
+ $criteria->add(new Criteria('related_contentid', $content_id));
+ $related_arr = $related_Handler->getAll($criteria);
+ if (count($related_arr) > 0) {
+ foreach (array_keys($related_arr) as $i) {
+ $obj_related = $related_Handler->get($related_arr[$i]->getVar("related_id"));
+ $related_Handler->delete($obj_related);
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('related_group', $related_arr[$i]->getVar("related_id")));
+ $related_Handler->deleteAll($criteria);
+ }
+ }
+ $xoops->redirect("content.php", 2, _AM_PAGE_DBUPDATED);
+ } else {
+ $xoops->error($obj->getHtmlErrors());
+ }
+ } else {
+ // deleting main and secondary
+ $related_name = '';
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('related_group', 0));
+ $criteria->add(new Criteria('related_contentid', $content_id));
+ $related_arr = $related_Handler->getAll($criteria);
+ if (count($related_arr) > 0) {
+ $related_name .= '<br />' . _AM_PAGE_RELATED_DELMAIN . '<br />';
+ foreach (array_keys($related_arr) as $i) {
+ $related_name .= '<span style="color : Red">';
+ $related_name .= $related_arr[$i]->getVar("related_name");
+ $related_name .= '</span>';
+ $related_name .= '<br />';
+ }
+ }
+ $xoops->confirm(array("ok" => 1, "id" => $content_id, "op" => "delete"), 'content.php', sprintf(_AM_PAGE_SUREDEL, $obj->getvar('content_title')) . '<br />' . $related_name);
+ }
+ break;
+
+ case 'update_status':
+ $content_id = $system->cleanVars($_POST, 'content_id', 0, 'int');
+ if ($content_id > 0) {
+ $obj = $content_Handler->get($content_id);
+ $old = $obj->getVar('content_status');
+ $obj->setVar('content_status', !$old);
+ if ($content_Handler->insert($obj)) {
+ exit;
+ }
+ echo $obj->getHtmlErrors();
+ }
+ break;
+
+ case 'update_display':
+ $content_id = $system->cleanVars($_POST, 'content_id', 0, 'int');
+ if ($content_id > 0) {
+ $obj = $content_Handler->get($content_id);
+ $old = $obj->getVar('content_maindisplay');
+ $obj->setVar('content_maindisplay', !$old);
+ if ($content_Handler->insert($obj)) {
+ exit;
+ }
+ echo $obj->getHtmlErrors();
+ }
+ break;
+
+ case 'clone':
+ $content_id = $system->cleanVars($_REQUEST, 'id', 0, 'int');
+ $content = $content_Handler->get($content_id);
+ $obj = $content_Handler->create();
+ $obj->setVar("content_title", _AM_PAGE_CONTENT_COPY . $content->getVar("content_title"));
+ $obj->setVar("content_weight", 0);
+ $obj->setVar("content_create", time());
+ $obj->setVar("content_shorttext", $content->getVar("content_shorttext"));
+ $obj->setVar("content_text", $content->getVar("content_text"));
+ $obj->setVar("content_mkeyword", $content->getVar("content_mkeyword"));
+ $obj->setVar("content_mdescription", $content->getVar("content_mdescription"));
+ $obj->setVar("content_author", $content->getVar("content_author"));
+ $obj->setVar("content_status", $content->getVar("content_status"));
+ $obj->setVar("content_maindisplay", $content->getVar("content_maindisplay"));
+ $obj->setVar("content_dopdf", $content->getVar("content_dopdf"));
+ $obj->setVar("content_doprint", $content->getVar("content_doprint"));
+ $obj->setVar("content_domail", $content->getVar("content_domail"));
+ $obj->setVar("content_doauthor", $content->getVar("content_doauthor"));
+ $obj->setVar("content_dodate", $content->getVar("content_dodate"));
+ $obj->setVar("content_dohits", $content->getVar("content_dohits"));
+ $obj->setVar("content_dorating", $content->getVar("content_dorating"));
+ $obj->setVar("content_docoms", $content->getVar("content_docoms"));
+ $obj->setVar("content_doncoms", $content->getVar("content_doncoms"));
+ $obj->setVar("content_dosocial", $content->getVar("content_dosocial"));
+ $obj->setVar("content_dotitle", $content->getVar("content_dotitle"));
+ $obj->setVar("content_donotifications", $content->getVar("content_donotifications"));
+ if ($content_Handler->insert($obj)) {
+ $newcontent_id = $obj->get_new_id();
+ $gperm_handler = $xoops->getHandler('groupperm');
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('gperm_itemid', $content_id, '='));
+ $criteria->add(new Criteria('gperm_modid', $xoopsModule->getVar('mid'),'='));
+ $criteria->add(new Criteria('gperm_name', 'page_view_item', '='));
+ $gperm_arr = $gperm_handler->getall($criteria);
+ //permissions view
+ foreach (array_keys($gperm_arr) as $i) {
+ $gperm_handler->addRight('page_view_item', $newcontent_id, $gperm_arr[$i]->getVar("gperm_groupid"), $xoopsModule->getVar('mid'));
+ }
+ $xoops->redirect("content.php", 2, _AM_PAGE_DBUPDATED);
+ }
+ $xoops->error($obj->getHtmlErrors());
+
+ break;
+}
+$xoops->footer();
\ No newline at end of file
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/content.php
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:keywords
+ Author Date Id Rev URL
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/header.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/header.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/header.php 2012-11-25 20:56:32 UTC (rev 10273)
@@ -0,0 +1,25 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ 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.
+*/
+
+/**
+ * page module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package page
+ * @since 2.6.0
+ * @author Mage Gr\xE9gory (AKA Mage)
+ * @version $Id$
+ */
+require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php';
+
+$xoops = Xoops::getInstance();
+XoopsLoad::load('system', 'system');
\ No newline at end of file
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/header.php
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:keywords
+ Author Date Id Rev URL
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/index.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/index.html (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/index.html 2012-11-25 20:56:32 UTC (rev 10273)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/index.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/index.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/index.php 2012-11-25 20:56:32 UTC (rev 10273)
@@ -0,0 +1,58 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ 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.
+*/
+
+/**
+ * page module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package page
+ * @since 2.6.0
+ * @author Mage Gr\xE9gory (AKA Mage)
+ * @version $Id$
+ */
+include dirname(__FILE__) . '/header.php';
+// heaser
+$xoops->header();
+// Get page handler
+$content_Handler = $xoops->getModuleHandler('page_content');
+
+// content not display
+$criteria = new CriteriaCompo();
+$criteria->add(new Criteria('content_status', 0));
+$content_notdisplay = $content_Handler->getCount($criteria);
+// content display
+$criteria = new CriteriaCompo();
+$criteria->add(new Criteria('content_status', 0, '!='));
+$content_display = $content_Handler->getCount($criteria);
+
+// folder path
+//$folder_path = XOOPS_ROOT_PATH . '/uploads/page';
+
+$admin_page = new XoopsModuleAdmin();
+$admin_page->renderNavigation('index.php');
+
+// content
+$admin_page->addInfoBox(_MI_PAGE_CONTENT, 'content');
+$admin_page->addInfoBoxLine(sprintf(_AM_PAGE_INDEX_TOTALCONTENT, $content_notdisplay + $content_display), 'content');
+$admin_page->addInfoBoxLine(sprintf(_AM_PAGE_INDEX_TOTALDISPLAY, '<span class="green">' . $content_display . '</span>'), 'content');
+$admin_page->addInfoBoxLine(sprintf(_AM_PAGE_INDEX_TOTALNOTDISPLAY, '<span class="red">' . $content_notdisplay . '</span>'), 'content');
+
+// configs
+/*$admin_page->addConfigBoxLine($folder_path, 'folder');
+$admin_page->addConfigBoxLine(array($folder_path, '777'), 'chmod');
+$admin_page->addConfigBoxLine($folder_path . '/images', 'folder');
+$admin_page->addConfigBoxLine(array($folder_path . '/images', '777'), 'chmod');
+$admin_page->addConfigBoxLine($folder_path . '/images/category', 'folder');
+$admin_page->addConfigBoxLine(array($folder_path . '/images/category', '777'), 'chmod');*/
+
+$admin_page->renderIndex();
+$xoops->footer();
\ No newline at end of file
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/index.php
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:keywords
+ Author Date Id Rev URL
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/menu.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/menu.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/menu.php 2012-11-25 20:56:32 UTC (rev 10273)
@@ -0,0 +1,43 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ 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.
+*/
+
+/**
+ * page module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package page
+ * @since 2.6.0
+ * @author Mage Gr\xE9gory (AKA Mage)
+ * @version $Id$
+ */
+
+$adminmenu = array();
+$i = 1;
+$adminmenu[$i]['title'] = _MI_PAGE_INDEX;
+$adminmenu[$i]['link'] = 'admin/index.php';
+$adminmenu[$i]['icon'] = 'home.png';
+$i++;
+$adminmenu[$i]['title'] = _MI_PAGE_CONTENT;
+$adminmenu[$i]['link'] = 'admin/content.php';
+$adminmenu[$i]['icon'] = 'content.png';
+$i++;
+$adminmenu[$i]['title'] = _MI_PAGE_RELATED;
+$adminmenu[$i]['link'] = 'admin/related.php';
+$adminmenu[$i]['icon'] = 'groupmod.png';
+$i++;
+$adminmenu[$i]['title'] = _MI_PAGE_PERMISSIONS;
+$adminmenu[$i]['link'] = 'admin/permissions.php';
+$adminmenu[$i]['icon'] = 'permissions.png';
+$i++;
+$adminmenu[$i]['title'] = _MI_PAGE_ABOUT;
+$adminmenu[$i]['link'] = 'admin/about.php';
+$adminmenu[$i]['icon'] = 'about.png';
\ No newline at end of file
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/menu.php
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:keywords
+ Author Date Id Rev URL
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/permissions.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/permissions.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/permissions.php 2012-11-25 20:56:32 UTC (rev 10273)
@@ -0,0 +1,141 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ 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.
+*/
+
+/**
+ * page module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package page
+ * @since 2.6.0
+ * @author Mage Gr\xE9gory (AKA Mage)
+ * @version $Id$
+ */
+include dirname(__FILE__) . '/header.php';
+// Get main instance
+$system = System::getInstance();
+// Check users rights
+if (!$xoops->isUser() || !$xoops->isModule() || !$xoops->user->isAdmin($xoops->module->mid())) {
+ exit(_NOPERM);
+}
+// Parameters
+$nb_content = $xoops->getModuleConfig('page_adminpager');
+// Get Action type
+$op = $system->cleanVars($_REQUEST, 'op', 'global', 'string');
+// Get handler
+$content_Handler = $xoops->getModuleHandler('page_content');
+$gperm_handler = $xoops->getHandler('groupperm');
+// Call header
+$xoops->header('page_admin_permissions.html');
+
+// Get start pager
+$start = $system->cleanVars($_REQUEST, 'start', 0, 'int');
+
+$admin_page = new XoopsModuleAdmin();
+$admin_page->renderNavigation('permissions.php');
+
+$opform = new XoopsSimpleForm('', 'opform', 'permissions.php', 'get');
+$op_select = new XoopsFormSelect("", 'op', $op);
+$op_select->setExtra('onchange="document.forms.opform.submit()"');
+$op_select->addOption('global', _AM_PAGE_PERMISSIONS_GLOBAL);
+$op_select->addOption('view', _AM_PAGE_PERMISSIONS_VIEW);
+$opform->addElement($op_select);
+$xoops->tpl->assign('form', $opform->render());
+
+$module_id = $xoops->module->getVar('mid');
+
+switch ($op) {
+
+ case 'global':
+ default:
+ $global_perm_array = array('4' => _AM_PAGE_PERMISSIONS_GLOBAL_RATE);
+ $form = new XoopsGroupPermForm(_AM_PAGE_PERMISSIONS_GLOBAL, $module_id, "page_global", _AM_PAGE_PERMISSIONS_GLOBAL_DSC, 'admin/permissions.php', true);
+ foreach( $global_perm_array as $perm_id => $perm_name ) {
+ $form->addItem($perm_id , $perm_name) ;
+ }
+ echo $form->render();
+ break;
+
+ case 'view':
+ // View permission
+
+ // Add Scripts
+ $xoops->theme->addScript('media/xoops/xoops.js');
+ // Criteria
+ $criteria = new CriteriaCompo();
+ $criteria->setSort('content_weight ASC, content_title');
+ $criteria->setOrder('ASC');
+ $criteria->setStart($start);
+ $criteria->setLimit($nb_content);
+ $content_count = $content_Handler->getCount($criteria);
+ $content_arr = $content_Handler->getAll($criteria);
+ // Assign Template variables
+ $xoops->tpl->assign('content_count', $content_count);
+ if ($content_count > 0) {
+ $member_handler = $xoops->getHandler('member');
+ $group_list = $member_handler->getGroupList();
+
+ $module_id = $xoops->isModule() ? $xoops->module->getVar('mid', 'n') : 1;
+
+ $xoops->tpl->assign('groups', $group_list);
+ foreach (array_keys($content_arr) as $i) {
+ $content_id = $content_arr[$i]->getVar("content_id");
+ $perms = '';
+ $groups_ids_view = $gperm_handler->getGroupIds('page_view_item', $content_id, $module_id);
+ $groups_ids_view = array_values($groups_ids_view);
+ foreach (array_keys($group_list) as $j) {
+ $perms .= '<img id="loading_display' . $content_id . '_' . $j .'" src="' . $xoops->url('media/xoops/images/spinner.gif') . '" style="display:none;" alt="' . _AM_SYSTEM_LOADING . '" />';
+ if (in_array($j, $groups_ids_view)) {
+ $perms .= "<img class=\"cursorpointer\" id=\"display" . $content_id . "_" . $j . "\" onclick=\"Xoops.changeStatus( 'permissions.php', { op: 'update_view', content_id: " . $content_id . ", group: " . $j . ", status: 'no' }, 'display" . $content_id . "_" . $j ."', 'permissions.php' )\" src=\"" . $xoops->url('modules/system/images/icons/default/success.png') . "\" alt=\"" . _AM_PAGE_OFF . "\" title=\"" . _AM_PAGE_OFF . "\" />";
+ } else {
+ $perms .= "<img class=\"cursorpointer\" id=\"display" . $content_id . "_" . $j . "\" onclick=\"Xoops.changeStatus( 'permissions.php', { op: 'update_view', content_id: " . $content_id . ", group: " . $j . ", status: 'yes' }, 'display" . $content_id . "_" . $j ."', 'permissions.php' )\" src=\"" . $xoops->url('modules/system/images/icons/default/cancel.png') . "\" alt=\"" . _AM_PAGE_ON . "\" title=\"" . _AM_PAGE_ON . "\" />";
+
+ }
+ $perms .= $group_list[$j] . '<br />';
+ }
+ $content['id'] = $content_id;
+ $content['title'] = $content_arr[$i]->getVar("content_title");
+ $content['permissions'] = $perms;
+ $xoops->tpl->append_by_ref('content', $content);
+ unset($content);
+ }
+ // Display Page Navigation
+ if ($content_count > $nb_content) {
+ $nav = new XoopsPageNav($content_count, $nb_content, $start, 'start', 'op=view');
+ $xoops->tpl->assign('nav_menu', $nav->renderNav(4));
+ }
+ } else {
+ $xoops->tpl->assign('error_message', _AM_PAGE_CONTENT_ERROR_NOCONTENT);
+ }
+ break;
+
+ case 'update_view':
+ $content_id = $system->cleanVars($_REQUEST, 'content_id', 0, 'int');
+ $group = $system->cleanVars($_REQUEST, 'group', 0, 'int');
+ $status = $system->cleanVars($_REQUEST, 'status', '', 'string');
+ if ($content_id > 0 && $group > 0 && $status != '') {
+ if ($status == 'no') {
+ // deleting permissions
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('gperm_groupid', $group, '='));
+ $criteria->add(new Criteria('gperm_itemid', $content_id, '='));
+ $criteria->add(new Criteria('gperm_modid', $xoopsModule->getVar('mid'),'='));
+ $criteria->add(new Criteria('gperm_name', 'page_view_item', '='));
+ $gperm_handler->deleteAll($criteria);
+ } else {
+ // add permissions
+ $gperm_handler->addRight('page_view_item', $content_id, $group, $xoopsModule->getVar('mid'));
+ }
+ }
+ break;
+}
+
+$xoops->footer();
\ No newline at end of file
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/permissions.php
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:keywords
+ Author Date Id Rev URL
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/related.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/related.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/related.php 2012-11-25 20:56:32 UTC (rev 10273)
@@ -0,0 +1,255 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ 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.
+*/
+
+/**
+ * page module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package page
+ * @since 2.6.0
+ * @author Mage Gr\xE9gory (AKA Mage)
+ * @version $Id$
+ */
+include dirname(__FILE__) . '/header.php';
+// Get main instance
+$system = System::getInstance();
+// Check users rights
+if (!$xoops->isUser() || !$xoops->isModule() || !$xoops->user->isAdmin($xoops->module->mid())) {
+ exit(_NOPERM);
+}
+// Parameters
+$nb_related = $xoops->getModuleConfig('page_adminpager');
+// Get Action type
+$op = $system->cleanVars($_REQUEST, 'op', 'default', 'string');
+// Get handler
+$related_Handler = $xoops->getModuleHandler('page_related');
+$content_Handler = $xoops->getModuleHandler('page_content');
+// Call header
+$xoops->header('page_admin_related.html');
+// Get start pager
+$start = $system->cleanVars($_REQUEST, 'start', 0, 'int');
+
+$admin_page = new XoopsModuleAdmin();
+$admin_page->renderNavigation('related.php');
+
+switch ($op) {
+
+ case 'list':
+ default:
+ // Define Stylesheet
+ $xoops->theme->addStylesheet('media/jquery/ui/' . $xoops->getModuleConfig('jquery_theme', 'system') . '/ui.all.css');
+ // Define scripts
+ $xoops->theme->addScript('media/xoops/xoops.js');
+ $xoops->theme->addScript($xoops->url('/media/jquery/ui/jquery.ui.js'));
+ $xoops->theme->addScript('modules/system/js/admin.js');
+
+ $admin_page->addTips(_AM_PAGE_RELATED_TIPS);
+ $admin_page->addItemButton(_AM_PAGE_RELATED_ADD, 'related.php?op=new', 'add');
+ $admin_page->renderTips();
+ $admin_page->renderButton();
+
+ //joint
+ $criteria = new CriteriaCompo();
+ $criteria->setSort('related_name');
+ $criteria->setOrder('ASC');
+ $criteria->setStart($start);
+ $criteria->setLimit($nb_related);
+ $criteria->add(new Criteria('related_name', '/', '!='));
+ $related_Handler->table_link = $related_Handler->db->prefix('page_content');
+ $related_Handler->field_link = 'content_id'; // champ de la table en jointure
+ $related_Handler->field_object = 'related_contentid'; // champ de la table courante
+ $related_arr = $related_Handler->getByLink($criteria);
+ $related_count = $related_Handler->getCount($criteria);
+ // Assign Template variables
+ $xoops->tpl->assign('related_count', $related_count);
+ if ($related_count > 0) {
+ foreach (array_keys($related_arr) as $i) {
+ $related_id = $related_arr[$i]->getVar("related_id");
+ $related['id'] = $related_id;
+ $related['name'] = $related_arr[$i]->getVar("related_name");
+ $related['main_name'] = $related_arr[$i]->getVar("content_title");
+ $related['main_contentid'] = $related_arr[$i]->getVar("related_contentid");
+ $related['domenu'] = $related_arr[$i]->getVar("related_domenu");
+ switch ($related_arr[$i]->getVar("related_navigation")) {
+ case 1:
+ default:
+ $related['navigation'] = _AM_PAGE_RELATED_NAVIGATION_OPTION1;
+ break;
+ case 2:
+ $related['navigation'] = _AM_PAGE_RELATED_NAVIGATION_OPTION2;
+ break;
+ case 3:
+ $related['navigation'] = _AM_PAGE_RELATED_NAVIGATION_OPTION3;
+ break;
+ case 4:
+ $related['navigation'] = _AM_PAGE_RELATED_NAVIGATION_OPTION4;
+ break;
+ case 5:
+ $related['navigation'] = _AM_PAGE_RELATED_NAVIGATION_OPTION5;
+ break;
+ }
+ //joint
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('related_group', $related_arr[$i]->getVar("related_contentid")));
+ $criteria->setSort('related_weight');
+ $criteria->setOrder('ASC');
+ $related_Handler->table_link = $related_Handler->db->prefix('page_content');
+ $related_Handler->field_link = 'content_id'; // champ de la table en jointure
+ $related_Handler->field_object = 'related_contentid'; // champ de la table courante
+ $secondary_arr = $related_Handler->getByLink($criteria);
+ $related['secondary'] = '';
+ if (count($secondary_arr) != 0) {
+
+ $related['secondary'] .= '<ul>';
+ foreach (array_keys($secondary_arr) as $j) {
+ if ($secondary_arr[$j]->getVar("related_name") == '/') {
+ $related['secondary'] .= '<li><a href="content.php?op=edit&id=' . $secondary_arr[$j]->getVar("related_contentid") . '" title="' . _AM_PAGE_EDIT . '">' . $secondary_arr[$j]->getVar("content_title") . '</a></li>';
+ }
+ }
+ $related['secondary'] .= '</ul>';
+ }
+ $xoops->tpl->append_by_ref('related', $related);
+ $xoops->tpl->append_by_ref('popup_related', $related);
+ unset($related);
+ }
+ // Display Page Navigation
+ if ($related_count > $nb_related) {
+ $nav = new XoopsPageNav($related_count, $nb_related, $start, 'start');
+ $xoops->tpl->assign('nav_menu', $nav->renderNav(4));
+ }
+ } else {
+ $xoops->tpl->assign('error_message', _AM_PAGE_RELATED_ERROR_NORELATED);
+ }
+ break;
+
+ case 'new':
+ if ($related_Handler->getCount() == $content_Handler->getCount()) {
+ $xoops->tpl->assign('error_message', _AM_PAGE_RELATED_ERROR_NOFREECONTENT);
+ } else {
+ $admin_page->addItemButton(_AM_PAGE_CONTENT_LIST, 'related.php', 'application-view-detail');
+ $admin_page->renderButton();
+ $obj = $related_Handler->create();
+ $form = $xoops->getModuleForm($obj, 'page_related');
+ $form->render();
+ $xoops->tpl->assign('form', true);
+ }
+ break;
+
+ case 'edit':
+ $admin_page->addItemButton(_AM_PAGE_CONTENT_LIST, 'related.php', 'application-view-detail');
+ $admin_page->addItemButton(_AM_PAGE_CONTENT_ADD, 'related.php?op=new', 'add');
+ $admin_page->renderButton();
+ // Create form
+ $obj = $related_Handler->get($system->cleanVars($_REQUEST, 'id', 0, 'int'));
+ $form = $xoops->getModuleForm($obj, 'page_related');
+ $form->render();
+ $xoops->tpl->assign('form', true);
+ break;
+
+ case 'save':
+ if (!$xoops->security->check()) {
+ $xoops->redirect("related.php", 3, implode(",", $xoops->security->getErrors()));
+ }
+ $related_id = $system->cleanVars($_REQUEST, 'related_id', 0, 'int');
+ if ($related_id > 0) {
+ $obj = $related_Handler->get($related_id);
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('related_group', $obj->getVar('related_group')));
+ $criteria->add(new Criteria('related_name', '/'));
+ $related_Handler->deleteAll($criteria);
+ } else {
+ $obj = $related_Handler->create();
+ }
+ //main
+ $obj->setVar("related_name", $_POST["related_name"]);
+ $obj->setVar("related_group", $_POST["related_main"]);
+ $obj->setVar("related_contentid", $_POST["related_main"]);
+ $obj->setVar("related_domenu", $_POST["related_domenu"]);
+ $obj->setVar("related_navigation", $_POST["related_navigation"]);
+ if ($related_Handler->insert($obj)) {
+ //secondary
+ $secondary_max = 10;
+ for ($i = 1; $i <= $secondary_max; $i++) {
+ if ($_POST["related_secondary" . $i] != 0 && $_POST["related_secondary" . $i] != $_POST["related_main"]) {
+ $obj = $related_Handler->create();
+ $obj->setVar("related_name", "/");
+ $obj->setVar("related_group", $_POST["related_main"]);
+ $obj->setVar("related_contentid", $_POST["related_secondary" . $i]);
+ $obj->setVar("related_domenu", $_POST["related_domenu"]);
+ $obj->setVar("related_navigation", $_POST["related_navigation"]);
+ $obj->setVar("related_weight", $i);
+ $related_Handler->insert($obj);
+ unset($obj);
+ }
+ }
+ $xoops->redirect("related.php", 2, _AM_PAGE_DBUPDATED);
+ } else {
+ $xoops->error($obj->getHtmlErrors());
+ }
+ $form = $xoops->getModuleForm($obj, 'page_related');
+ $form->render();
+ $xoops->tpl->assign('form', true);
+ break;
+
+ case 'delete':
+ $admin_page->addItemButton(_AM_PAGE_CONTENT_LIST, 'related.php', 'application-view-detail');
+ $admin_page->addItemButton(_AM_PAGE_CONTENT_ADD, 'related.php?op=new', 'add');
+ $admin_page->renderButton();
+ // Define Stylesheet
+ $xoops->theme->addStylesheet('modules/system/css/admin.css');
+ $related_id = $system->cleanVars($_REQUEST, 'id', 0, 'int');
+ $obj = $related_Handler->get($related_id);
+ if (isset($_POST["ok"]) && $_POST["ok"] == 1) {
+ if (!$xoops->security->check()) {
+ $xoops->redirect("related.php", 3, implode(",", $xoops->security->getErrors()));
+ }
+ // Deleting the related
+ if ($related_Handler->delete($obj)) {
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('related_group', $related_id));
+ $related_Handler->deleteAll($criteria);
+ $xoops->redirect("related.php", 2, _AM_PAGE_DBUPDATED);
+ } else {
+ $xoops->error($obj->getHtmlErrors());
+ }
+ } else {
+ $xoops->confirm(array("ok" => 1, "id" => $related_id, "op" => "delete"), 'related.php', sprintf(_AM_PAGE_SUREDEL, $obj->getvar('related_name') . '<br />'));
+ }
+ break;
+
+ case 'update_status':
+ $related_id = $system->cleanVars($_POST, 'related_id', 0, 'int');
+ if ($related_id > 0) {
+ $obj = $related_Handler->get($related_id);
+ $old = $obj->getVar('related_domenu');
+ $obj->setVar('related_domenu', !$old);
+ if ($related_Handler->insert($obj)) {
+ exit;
+ }
+ echo $obj->getHtmlErrors();
+ }
+ break;
+
+ case 'view':
+ $related_id = $system->cleanVars($_POST, 'related_id', 0, 'int');
+ if ($related_id > 0) {
+ $obj = $related_Handler->get($related_id);
+ $old = $obj->getVar('related_domenu');
+ $obj->setVar('related_domenu', !$old);
+ if ($related_Handler->insert($obj)) {
+ exit;
+ }
+ echo $obj->getHtmlErrors();
+ }
+ break;
+}
+$xoops->footer();
\ No newline at end of file
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/related.php
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:keywords
+ Author Date Id Rev URL
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/blocks
___________________________________________________________________
Added: tsvn:autoprops
+ *.php = svn:executable=*;svn:keywords=Author Date Id Rev URL;
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/blocks/index.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/blocks/index.html (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/blocks/index.html 2012-11-25 20:56:32 UTC (rev 10273)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/blocks/page_blocks.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/blocks/page_blocks.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/blocks/page_blocks.php 2012-11-25 20:56:32 UTC (rev 10273)
@@ -0,0 +1,92 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ 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.
+*/
+
+/**
+ * page module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package page
+ * @since 2.6.0
+ * @author Mage Gr\xE9gory (AKA Mage)
+ * @version $Id$
+ */
+function page_blocks_show($options) {
+ $xoops = Xoops::getInstance();
+ // Get handler
+ $content_Handler = $xoops->getModuleHandler('page_content', 'page');
+ $xoops->loadLanguage('main', 'page');
+ $content = array();
+ $xoops->theme->addStylesheet( $xoops->url('/modules/page/css/styles.css'), null );
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('content_status', 0, '!='));
+
+ switch ($options[0]) {
+ case 'random':
+ $criteria->setSort('RAND()');
+ break;
+ case 'id':
+ $criteria->setSort('RAND()');
+ break;
+ case 'rating':
+ $criteria->setSort('content_rating');
+ $criteria->setOrder('DESC');
+ break;
+ case 'hits':
+ $criteria->setSort('content_hits');
+ $criteria->setOrder('DESC');
+ break;
+ case 'recent':
+ $criteria->setSort('content_create');
+ $criteria->setOrder('DESC');
+ break;
+ }
+
+ if ($options[0] != 'id') {
+ $criteria->setLimit($options[1]);
+ $content_arr = $content_Handler->getAll($criteria);
+ foreach (array_keys($content_arr) as $i) {
+ $content_id = $content_arr[$i]->getVar('content_id');
+ $content[$i]['id'] = $content_id;
+ $content[$i]['title'] = strlen($content_arr[$i]->getVar('content_title')) > $options[2] ? substr($content_arr[$i]->getVar('content_title'), 0, ($options[2])) . '...' : $content_arr[$i]->getVar('content_title');
+ $content[$i]['shorttext'] = $content_arr[$i]->getVar('content_shorttext');
+ if ($options[3] == true){
+ $content[$i]['text'] = $content_arr[$i]->getVar('content_text');
+ }
+ $content[$i]['authorid'] = $content_arr[$i]->getVar('content_author');
+ $content[$i]['author'] = XoopsUser::getUnameFromId($content_arr[$i]->getVar('content_author'));
+ $content[$i]['date'] = XoopsLocal::formatTimestamp($content_arr[$i]->getVar('content_create'), $xoops->getModuleConfig('page_dateformat', 'page'));
+ $content[$i]['time'] = XoopsLocal::formatTimestamp($content_arr[$i]->getVar('content_create'), $xoops->getModuleConfig('page_timeformat', 'page'));
+ $content[$i]['hits'] = sprintf(_MD_PAGE_VIEWPAGE_HITS, $content_arr[$i]->getVar('content_hits'));
+ $content[$i]['rating'] = number_format($content_arr[$i]->getVar('content_rating'), 1);
+ $content[$i]['votes'] = $content_arr[$i]->getVar('content_votes');
+ }
+ }
+ return $content;
+}
+
+function page_blocks_edit($options) {
+ $form = '';
+ $form .= _MB_PAGE_DISPLAY . " \n";
+ $form .= "<input type=\"hidden\" name=\"options[0]\" value=\"" . $options[0] . "\" />\n";
+ $form .= "<input class=\"span1\" name=\"options[1]\" size=\"5\" maxlength=\"255\" value=\"" . $options[1] . "\" type=\"text\" pattern=\"^\d+$\" /> " . _MB_PAGE_CONTENTS . "<br />\n";
+ $form .= _MB_PAGE_TLENGTH . " <input class=\"span1\" name=\"options[2]\" size=\"5\" maxlength=\"255\" value=\"" . $options[2] . "\" type=\"text\" pattern=\"^\d+$\" /><br />\n";
+ if ($options[3] == false){
+ $checked_yes = '';
+ $checked_no = 'checked="checked"';
+ }else{
+ $checked_yes = 'checked="checked"';
+ $checked_no = '';
+ }
+ $form .= _MB_PAGE_ALLCONTENT . ": <input name=\"options[3]\" value=\"1\" type=\"radio\" " . $checked_yes . "/>" . _YES . " \n";
+ $form .= "<input name=\"options[3]\" value=\"0\" type=\"radio\" " . $checked_no . "/>" . _NO . "<br />\n";
+ return $form;
+}
\ No newline at end of file
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/blocks/page_blocks.php
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:keywords
+ Author Date Id Rev URL
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/class
___________________________________________________________________
Added: tsvn:autoprops
+ *.php = svn:executable=*;svn:keywords=Author Date Id Rev URL;
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/class/form
___________________________________________________________________
Added: tsvn:autoprops
+ *.php = svn:executable=*;svn:keywords=Author Date Id Rev URL;
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/class/form/index.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/class/fo...
[truncated message content] |
|
From: <ma...@us...> - 2012-11-25 11:17:40
|
Revision: 10272
http://sourceforge.net/p/xoops/svn/10272
Author: mageg
Date: 2012-11-25 11:17:38 +0000 (Sun, 25 Nov 2012)
Log Message:
-----------
little bug in comment_view.php
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/comment_view.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/include/comment_view.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/include/comment_view.php 2012-11-25 01:21:41 UTC (rev 10271)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/include/comment_view.php 2012-11-25 11:17:38 UTC (rev 10272)
@@ -25,7 +25,7 @@
include_once $xoops->path('include/comment_constants.php');
-if (XOOPS_COMMENT_APPROVENONE != $xoops->moduleConfig['com_rule']) {
+if (XOOPS_COMMENT_APPROVENONE != $xoops->getModuleConfig('com_rule')) {
include_once $xoops->path('modules/system/constants.php');
$gperm_handler = $xoops->getHandlerGroupperm();
$groups = $xoops->isUser() ? $xoops->user->getGroups() : XOOPS_GROUP_ANONYMOUS;
|
|
From: <tr...@us...> - 2012-11-25 01:21:44
|
Revision: 10271
http://sourceforge.net/p/xoops/svn/10271
Author: trabis
Date: 2012-11-25 01:21:41 +0000 (Sun, 25 Nov 2012)
Log Message:
-----------
Fixing some notification related bugs
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/notification_functions.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_notification_select.html
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/include/notification_functions.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/include/notification_functions.php 2012-11-24 00:09:14 UTC (rev 10270)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/include/notification_functions.php 2012-11-25 01:21:41 UTC (rev 10271)
@@ -139,7 +139,7 @@
{
$xoops = Xoops::getInstance();
if (!isset($module_id)) {
- $module_id = !$xoops->isModule() ? $xoops->module->getVar('mid') : 0;
+ $module_id = $xoops->isModule() ? $xoops->module->getVar('mid') : 0;
$module = $xoops->module;
} else {
$module = $xoops->getHandlerModule()->getById($module_id);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_notification_select.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_notification_select.html 2012-11-24 00:09:14 UTC (rev 10270)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_notification_select.html 2012-11-25 01:21:41 UTC (rev 10271)
@@ -2,7 +2,7 @@
<form name="notification_select" action="<{$xoops_notification.target_page}>" method="post">
<h4 class="txtcenter"><{$lang_activenotifications}></h4>
<input type="hidden" name="not_redirect" value="<{$xoops_notification.redirect_script}>" />
- <input type="hidden" name="XOOPS_TOKEN_REQUEST" value="<{php}>echo $xoops->security->createToken();<{/php}>" />
+ <input type="hidden" name="XOOPS_TOKEN_REQUEST" value="<{php}>echo Xoops::getInstance()->security->createToken();<{/php}>" />
<table class="outer">
<tr><th colspan="3"><{$lang_notificationoptions}></th></tr>
<tr>
|
|
From: <du...@us...> - 2012-11-24 00:09:18
|
Revision: 10270
http://sourceforge.net/p/xoops/svn/10270
Author: dugris
Date: 2012-11-24 00:09:14 +0000 (Sat, 24 Nov 2012)
Log Message:
-----------
Add hightlight for search result
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_search.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/search.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops.css
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_search.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_search.html 2012-11-23 22:37:04 UTC (rev 10269)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_search.html 2012-11-24 00:09:14 UTC (rev 10270)
@@ -43,7 +43,7 @@
<{foreach from=$module.result item=result}>
<div class="searchItem">
- <div class="bold"><a href="<{$result.link}>" title="<{$result.title}>"><{$result.title}></a></div>
+ <div class="bold"><a href="<{$result.link}>" title="<{$result.title}>"><{$result.title_highligh}></a></div>
<div><{$result.content}></div>
<span class='x-small'>
<{if $result.uid}>
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/search.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/search.php 2012-11-23 22:37:04 UTC (rev 10269)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/search.php 2012-11-24 00:09:14 UTC (rev 10270)
@@ -123,6 +123,7 @@
$q = trim($q);
if (strlen($q) >= $xoopsConfigSearch['keyword_min']) {
$queries[] = $myts->addSlashes($q);
+ $queries_pattern[] = '~(' . $q . ')~sUi';
} else {
$ignored_queries[] = $myts->addSlashes($q);
}
@@ -136,6 +137,7 @@
$xoops->redirect('search.php', 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
}
$queries = array($myts->addSlashes($query));
+ $queries_pattern[] = '~(' . $myts->addSlashes($query) . ')~sUi';
}
}
switch ($action) {
@@ -184,10 +186,11 @@
$res[$i]['link'] = 'modules/' . $module->getVar('dirname') . '/' . $results[$i]['link'];
}
$res[$i]['title'] = $myts->htmlspecialchars($results[$i]['title']);
+ $res[$i]['title_highligh'] = preg_replace( $queries_pattern, "<span class='searchHighlight'>$1</span>", $myts->htmlspecialchars($results[$i]['title']));
$res[$i]['uid'] = @intval($results[$i]['uid']);
$res[$i]['uname'] = XoopsUser::getUnameFromId($results[$i]['uid']);
$res[$i]['time'] = !empty($results[$i]['time']) ? " (" . XoopsLocal::formatTimestamp(intval($results[$i]['time'])) . ")" : "";
- $res[$i]['content'] = !empty($results[$i]['content']) ? $results[$i]['content'] : "";
+ $res[$i]['content'] = empty($results[$i]['content']) ? "" : preg_replace( $queries_pattern, "<span class='searchHighlight'>$1</span>", $results[$i]['content']);
}
if ($count >= 5) {
$search_url = XOOPS_URL . '/search.php?query=' . urlencode(stripslashes(implode(' ', $queries)));
@@ -245,10 +248,11 @@
$res[$i]['link'] = 'modules/' . $module->getVar('dirname') . '/' . $results[$i]['link'];
}
$res[$i]['title'] = $myts->htmlspecialchars($results[$i]['title']);
+ $res[$i]['title_highligh'] = preg_replace( $queries_pattern, "<span class='searchHighlight'>$1</span>", $myts->htmlspecialchars($results[$i]['title']));
$res[$i]['uid'] = @intval($results[$i]['uid']);
$res[$i]['uname'] = XoopsUser::getUnameFromId($results[$i]['uid']);
$res[$i]['time'] = !empty($results[$i]['time']) ? " (" . XoopsLocal::formatTimestamp(intval($results[$i]['time'])) . ")" : "";
- $res[$i]['content'] = !empty($results[$i]['content']) ? $results[$i]['content'] : "";
+ $res[$i]['content'] = empty($results[$i]['content']) ? "" : preg_replace( $queries_pattern, "<span class='searchHighlight'>$1</span>", $results[$i]['content']);
}
if ( count($res) > 0 ) {
$modules_result[$mid]['result'] = $res;
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops.css
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops.css 2012-11-23 22:37:04 UTC (rev 10269)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops.css 2012-11-24 00:09:14 UTC (rev 10270)
@@ -439,4 +439,7 @@
margin: 10px 0;
padding: 5px;
border: 1px solid #eee;
-}
\ No newline at end of file
+}
+.searchHighlight {
+ background-color: #ffed00;
+}
|
|
From: <du...@us...> - 2012-11-23 22:37:07
|
Revision: 10269
http://sourceforge.net/p/xoops/svn/10269
Author: dugris
Date: 2012-11-23 22:37:04 +0000 (Fri, 23 Nov 2012)
Log Message:
-----------
original mainfile.php
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/mainfile.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/mainfile.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/mainfile.php 2012-11-23 22:33:12 UTC (rev 10268)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/mainfile.php 2012-11-23 22:37:04 UTC (rev 10269)
@@ -17,65 +17,6 @@
* @version $Id$
*/
-if (!defined("XOOPS_MAINFILE_INCLUDED")) {
- define("XOOPS_MAINFILE_INCLUDED", 1);
-
- // XOOPS Physical Paths
-
- // Physical path to the XOOPS documents (served) directory WITHOUT trailing slash
- define('XOOPS_ROOT_PATH', 'C:/Internet/Xoops/Xoops_2.6.0/htdocs');
-
- // For forward compatibility
- // Physical path to the XOOPS library directory WITHOUT trailing slash
- define('XOOPS_PATH', 'C:/Internet/Xoops/Xoops_2.6.0/htdocs/xoops_lib');
- // Physical path to the XOOPS datafiles (writable) directory WITHOUT trailing slash
- define('XOOPS_VAR_PATH', 'C:/Internet/Xoops/Xoops_2.6.0/htdocs/xoops_data');
- // Alias of XOOPS_PATH, for compatibility, temporary solution
- define("XOOPS_TRUST_PATH", XOOPS_PATH);
-
- // URL Association for SSL and Protocol Compatibility
- $http = 'http://';
- if (!empty($_SERVER['HTTPS'])) {
- $http = ($_SERVER['HTTPS']=='on') ? 'https://' : 'http://';
- }
- define('XOOPS_PROT', $http);
-
- // XOOPS Virtual Path (URL)
- // Virtual path to your main XOOPS directory WITHOUT trailing slash
- // Example: define('XOOPS_URL', 'http://dugris.no-ip.org/Xoops/Xoops_2.6.0/htdocs');
- define('XOOPS_URL', 'http://dugris.no-ip.org:8090');
-
- // Shall be handled later, don't forget!
- define("XOOPS_CHECK_PATH", 0);
- // Protect against external scripts execution if safe mode is not enabled
- if (XOOPS_CHECK_PATH && !@ini_get("safe_mode")) {
- if (function_exists("debug_backtrace")) {
- $xoopsScriptPath = debug_backtrace();
- if (!count($xoopsScriptPath)) {
- die("XOOPS path check: this file cannot be requested directly");
- }
- $xoopsScriptPath = $xoopsScriptPath[0]["file"];
- } else {
- $xoopsScriptPath = isset($_SERVER["PATH_TRANSLATED"]) ? $_SERVER["PATH_TRANSLATED"] : $_SERVER["SCRIPT_FILENAME"];
- }
- if (DIRECTORY_SEPARATOR != "/") {
- // IIS6 may double the \ chars
- $xoopsScriptPath = str_replace(strpos($xoopsScriptPath, "\\\\", 2) ? "\\\\" : DIRECTORY_SEPARATOR, "/", $xoopsScriptPath);
- }
- if (strcasecmp(substr($xoopsScriptPath, 0, strlen(XOOPS_ROOT_PATH)), str_replace(DIRECTORY_SEPARATOR, "/", XOOPS_ROOT_PATH))) {
- exit("XOOPS path check: Script is not inside XOOPS_ROOT_PATH and cannot run.");
- }
- }
-
- // Secure file
- require XOOPS_VAR_PATH . '/data/secure.php';
-
- define('XOOPS_GROUP_ADMIN', '1');
- define('XOOPS_GROUP_USERS', '2');
- define('XOOPS_GROUP_ANONYMOUS', '3');
-
- if (!isset($xoopsOption["nocommon"]) && XOOPS_ROOT_PATH != "") {
- include XOOPS_ROOT_PATH."/include/common.php";
- }
-
+if (! defined('XOOPS_INSTALL')) {
+ header('Location: install/index.php');
}
\ No newline at end of file
|
|
From: <du...@us...> - 2012-11-23 22:33:15
|
Revision: 10268
http://sourceforge.net/p/xoops/svn/10268
Author: dugris
Date: 2012-11-23 22:33:12 +0000 (Fri, 23 Nov 2012)
Log Message:
-----------
Add template for search result
Fix admin theme
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/mainfile.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/search.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops.css
Added Paths:
-----------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_search.html
Property Changed:
----------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/search.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/mainfile.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/mainfile.php 2012-11-22 19:38:36 UTC (rev 10267)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/mainfile.php 2012-11-23 22:33:12 UTC (rev 10268)
@@ -17,6 +17,65 @@
* @version $Id$
*/
-if (! defined('XOOPS_INSTALL')) {
- header('Location: install/index.php');
+if (!defined("XOOPS_MAINFILE_INCLUDED")) {
+ define("XOOPS_MAINFILE_INCLUDED", 1);
+
+ // XOOPS Physical Paths
+
+ // Physical path to the XOOPS documents (served) directory WITHOUT trailing slash
+ define('XOOPS_ROOT_PATH', 'C:/Internet/Xoops/Xoops_2.6.0/htdocs');
+
+ // For forward compatibility
+ // Physical path to the XOOPS library directory WITHOUT trailing slash
+ define('XOOPS_PATH', 'C:/Internet/Xoops/Xoops_2.6.0/htdocs/xoops_lib');
+ // Physical path to the XOOPS datafiles (writable) directory WITHOUT trailing slash
+ define('XOOPS_VAR_PATH', 'C:/Internet/Xoops/Xoops_2.6.0/htdocs/xoops_data');
+ // Alias of XOOPS_PATH, for compatibility, temporary solution
+ define("XOOPS_TRUST_PATH", XOOPS_PATH);
+
+ // URL Association for SSL and Protocol Compatibility
+ $http = 'http://';
+ if (!empty($_SERVER['HTTPS'])) {
+ $http = ($_SERVER['HTTPS']=='on') ? 'https://' : 'http://';
+ }
+ define('XOOPS_PROT', $http);
+
+ // XOOPS Virtual Path (URL)
+ // Virtual path to your main XOOPS directory WITHOUT trailing slash
+ // Example: define('XOOPS_URL', 'http://dugris.no-ip.org/Xoops/Xoops_2.6.0/htdocs');
+ define('XOOPS_URL', 'http://dugris.no-ip.org:8090');
+
+ // Shall be handled later, don't forget!
+ define("XOOPS_CHECK_PATH", 0);
+ // Protect against external scripts execution if safe mode is not enabled
+ if (XOOPS_CHECK_PATH && !@ini_get("safe_mode")) {
+ if (function_exists("debug_backtrace")) {
+ $xoopsScriptPath = debug_backtrace();
+ if (!count($xoopsScriptPath)) {
+ die("XOOPS path check: this file cannot be requested directly");
+ }
+ $xoopsScriptPath = $xoopsScriptPath[0]["file"];
+ } else {
+ $xoopsScriptPath = isset($_SERVER["PATH_TRANSLATED"]) ? $_SERVER["PATH_TRANSLATED"] : $_SERVER["SCRIPT_FILENAME"];
+ }
+ if (DIRECTORY_SEPARATOR != "/") {
+ // IIS6 may double the \ chars
+ $xoopsScriptPath = str_replace(strpos($xoopsScriptPath, "\\\\", 2) ? "\\\\" : DIRECTORY_SEPARATOR, "/", $xoopsScriptPath);
+ }
+ if (strcasecmp(substr($xoopsScriptPath, 0, strlen(XOOPS_ROOT_PATH)), str_replace(DIRECTORY_SEPARATOR, "/", XOOPS_ROOT_PATH))) {
+ exit("XOOPS path check: Script is not inside XOOPS_ROOT_PATH and cannot run.");
+ }
+ }
+
+ // Secure file
+ require XOOPS_VAR_PATH . '/data/secure.php';
+
+ define('XOOPS_GROUP_ADMIN', '1');
+ define('XOOPS_GROUP_USERS', '2');
+ define('XOOPS_GROUP_ANONYMOUS', '3');
+
+ if (!isset($xoopsOption["nocommon"]) && XOOPS_ROOT_PATH != "") {
+ include XOOPS_ROOT_PATH."/include/common.php";
+ }
+
}
\ No newline at end of file
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_search.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_search.html (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_search.html 2012-11-23 22:33:12 UTC (rev 10268)
@@ -0,0 +1,82 @@
+<fieldset>
+ <{if $search}>
+ <legend><{$smarty.const._SR_SEARCHRESULTS}></legend>
+ <div>
+ <{$smarty.const._SR_KEYWORDS}> :
+ <span class="bold">
+ <{foreachq from=$queries item=query name=foo}>
+ <{$query}><{if !$smarty.foreach.foo.last}>,<{/if}>
+ <{/foreach}>
+ </span>
+ <{if $sr_showing}>
+ <br />
+ <{$sr_showing}>
+ <{/if}>
+ </div>
+ <{if count($ignored_queries) != 0}>
+ <div>
+ <{$ignored_words}> :
+ <span class="bold">
+ <{foreachq from=$ignored_queries item=query name=foo}>
+ <{$query}><{if !$smarty.foreach.foo.last}>,<{/if}>
+ <{/foreach}>
+ </span>
+ </div>
+ <{/if}>
+ <{/if}>
+
+ <{if count($modules) > 0}>
+ <{foreachq from=$modules item=module name=foo}>
+ <div class="searchModule">
+ <div class="searchIcon floatleft">
+ <img src="<{$module.image}>" alt="<{$module.name}>">
+ </div>
+ <div class="searchTitle floatleft">
+ <{$module.name}>
+ </div>
+ <{if $module.search_url}>
+ <div class="floatright">
+ <a href="<{$module.search_url}>" title="<{$smarty.const._SR_SHOWALLR}>"><{$smarty.const._SR_SHOWALLR}></a>
+ </div>
+ <{/if}>
+ <div class="clear"></div>
+
+ <{foreach from=$module.result item=result}>
+ <div class="searchItem">
+ <div class="bold"><a href="<{$result.link}>" title="<{$result.title}>"><{$result.title}></a></div>
+ <div><{$result.content}></div>
+ <span class='x-small'>
+ <{if $result.uid}>
+ <a href="<{$xoops_url}>/userinfo.php?uid=<{$result.uid}>" title="<{$result.uname}>"><{$result.uname}></a>
+ <{/if}>
+ ( <{$result.time}> )
+ </span>
+ </div>
+ <{/foreach}>
+ </div>
+
+ <!-- prev / next -->
+ <{if $module.prev || $module.next}>
+ <div>
+ <{if $module.prev}>
+ <div class="floatleft">
+ <a href="<{$module.prev}>" title="<{$smarty.const._SR_PREVIOUS}>"><{$smarty.const._SR_PREVIOUS}></a>
+ </div>
+ <{/if}>
+ <{if $module.next}>
+ <div class="floatright">
+ <a href="<{$module.next}>" title="<{$smarty.const._SR_NEXT}>"><{$smarty.const._SR_NEXT}></a>
+ </div>
+ <{/if}>
+ </div>
+ <{/if}>
+ <{/foreach}>
+ <{else}>
+ <div class="searchModule bold">
+ <{$smarty.const._SR_NOMATCH}>
+ </div>
+ <{/if}>
+</fieldset>
+
+<!-- Display form -->
+<{includeq file="module:system|system_form.html"}>
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_search.html
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php 2012-11-22 19:38:36 UTC (rev 10267)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php 2012-11-23 22:33:12 UTC (rev 10268)
@@ -88,8 +88,11 @@
foreach (array_keys($mod_options) as $item) {
$mod_options[$item]['link'] = empty($mod_options[$item]['absolute'])
? XOOPS_URL . "/modules/{$moddir}/" . $mod_options[$item]['link'] : $mod_options[$item]['link'];
- $mod_options[$item]['icon'] = empty($mod_options[$item]['icon']) ? ''
- : XOOPS_URL . "/media/xoops/images/icons/32/" . $mod_options[$item]['icon'];
+ if ( file_exists($xoops->path("/media/xoops/images/icons/32/" . $mod_options[$item]['icon']) ) ) {
+ $mod_options[$item]['icon'] = $xoops->url("/media/xoops/images/ico |
|
From: <be...@us...> - 2012-11-22 19:38:40
|
Revision: 10267
http://sourceforge.net/p/xoops/svn/10267
Author: beckmi
Date: 2012-11-22 19:38:36 +0000 (Thu, 22 Nov 2012)
Log Message:
-----------
Add Country and Date selection (Mariane)
Modified Paths:
--------------
XoopsModules/xforms/branches/mamba/xforms/admin/editelement.php
XoopsModules/xforms/branches/mamba/xforms/admin/elements.php
XoopsModules/xforms/branches/mamba/xforms/class/elementrenderer.php
XoopsModules/xforms/branches/mamba/xforms/docs/changelog.txt
XoopsModules/xforms/branches/mamba/xforms/docs/lang_diff.txt
XoopsModules/xforms/branches/mamba/xforms/include/form_execute.php
XoopsModules/xforms/branches/mamba/xforms/language/english/admin.php
XoopsModules/xforms/branches/mamba/xforms/language/english/modinfo.php
XoopsModules/xforms/branches/mamba/xforms/xoops_version.php
Added Paths:
-----------
XoopsModules/xforms/branches/mamba/xforms/admin/ele_date.php
XoopsModules/xforms/branches/mamba/xforms/admin/ele_select_ctry.php
Modified: XoopsModules/xforms/branches/mamba/xforms/admin/editelement.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/admin/editelement.php 2012-11-21 05:34:42 UTC (rev 10266)
+++ XoopsModules/xforms/branches/mamba/xforms/admin/editelement.php 2012-11-22 19:38:36 UTC (rev 10267)
@@ -79,6 +79,12 @@
case 'select':
include 'ele_select.php';
break;
+ case 'select2':
+ include 'ele_select_ctry.php';
+ break;
+ case 'date':
+ include 'ele_date.php';
+ break;
case 'checkbox':
include 'ele_check.php';
break;
@@ -204,6 +210,36 @@
}
$value[2] = $v2;
break;
+ case 'select2':
+ $value[0] = $ele_value[0]>1 ? intval($ele_value[0]) : 1;
+ $value[1] = !empty($ele_value[1]) ? 1 : 0;
+ $value[2] = !empty($ele_value[2]) ? $ele_value[2] : 'LB';
+ /*
+ $v2 = array();
+ $multi_flag = 1;
+ while( $v = each($ele_value[2]) ){
+ if( !empty($v['value']) ){
+ if( $value[1] == 1 || $multi_flag ){
+ if( $checked[$v['key']] == 1 ){
+ $check = 1;
+ $multi_flag = 0;
+ }else{
+ $check = 0;
+ }
+ }else{
+ $check = 0;
+ }
+ $v2[$v['value']] = $check;
+ }
+ }
+ $value[2] = $v2;
+ */
+ break;
+ case 'date':
+ $value = array();
+ $value[] = $ele_value;
+
+ break;
case 'checkbox':
while( $v = each($ele_value) ){
if( !empty($v['value']) ){
@@ -267,6 +303,8 @@
<li><a href='"._THIS_PAGE."?op=edit&ele_type=text'>"._AM_ELE_TEXT."</a></li>
<li><a href='"._THIS_PAGE."?op=edit&ele_type=textarea'>"._AM_ELE_TAREA."</a></li>
<li><a href='"._THIS_PAGE."?op=edit&ele_type=select'>"._AM_ELE_SELECT."</a></li>
+ <li><a href='"._THIS_PAGE."?op=edit&ele_type=select2'>"._AM_ELE_SELECT_CTRY."</a></li>
+ <li><a href='"._THIS_PAGE."?op=edit&ele_type=date'>"._AM_ELE_DATE."</a></li>
<li><a href='"._THIS_PAGE."?op=edit&ele_type=checkbox'>"._AM_ELE_CHECK."</a></li>
<li><a href='"._THIS_PAGE."?op=edit&ele_type=radio'>"._AM_ELE_RADIO."</a></li>
<li><a href='"._THIS_PAGE."?op=edit&ele_type=yn'>"._AM_ELE_YN."</a></li>
Added: XoopsModules/xforms/branches/mamba/xforms/admin/ele_date.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/admin/ele_date.php (rev 0)
+++ XoopsModules/xforms/branches/mamba/xforms/admin/ele_date.php 2012-11-22 19:38:36 UTC (rev 10267)
@@ -0,0 +1,16 @@
+<?php
+###############################################################################
+## See license.txt ##
+###############################################################################
+
+if( !defined('xforms_ROOT_PATH') ){ exit(); }
+
+ if($value[0] != "Y-m-d" AND $value[0] != "") {
+ $date_value = strtotime($value[0]);
+ } else {
+ $date_value = "";
+ }
+ $date = new XoopsFormTextDateSelect (_AM_ELE_DATE, 'ele_value', $size = 15, $date_value);
+ $output->addElement($date);
+
+?>
Added: XoopsModules/xforms/branches/mamba/xforms/admin/ele_select_ctry.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/admin/ele_select_ctry.php (rev 0)
+++ XoopsModules/xforms/branches/mamba/xforms/admin/ele_select_ctry.php 2012-11-22 19:38:36 UTC (rev 10267)
@@ -0,0 +1,25 @@
+<?php
+###############################################################################
+## See license.txt ##
+###############################################################################
+if (!defined('xforms_ROOT_PATH')) {
+ exit();
+}
+
+if (empty($addopt) && !empty($ele_id)) {
+ $ele_value = $element->getVar('ele_value');
+}
+$ele_size = !empty($ele_value[0]) ? $ele_value[0] : 1;
+$size = new XoopsFormText(_AM_ELE_SIZE, 'ele_value[0]', 3, 2, $ele_size);
+$allow_multi = empty($ele_value[1]) ? 0 : 1;
+$multiple = new XoopsFormRadioYN(_AM_ELE_MULTIPLE, 'ele_value[1]', $allow_multi);
+$country = xoops_getModuleOption('mycountry', 'xforms');
+$countries = !empty($ele_value[2]) ? $ele_value[2] : $country;
+$reg_form = new XoopsFormSelectCountry(_AM_ELE_SELECT_CTRY, 'ele_value[2]', $countries);
+//
+$output->addElement($size, 1);
+$output->addElement($multiple);
+//$output->addElement($opt_tray);
+$output->addElement($reg_form);
+
+?>
\ No newline at end of file
Modified: XoopsModules/xforms/branches/mamba/xforms/admin/elements.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/admin/elements.php 2012-11-21 05:34:42 UTC (rev 10266)
+++ XoopsModules/xforms/branches/mamba/xforms/admin/elements.php 2012-11-22 19:38:36 UTC (rev 10267)
@@ -23,6 +23,8 @@
$jump[0]->addOptionArray(array('text' => _AM_ELE_TEXT,
'textarea' => _AM_ELE_TAREA,
'select' => _AM_ELE_SELECT,
+ 'select2' => _AM_ELE_SELECT_CTRY,
+ 'date' => _AM_ELE_DATE,
'checkbox' => _AM_ELE_CHECK,
'radio' => _AM_ELE_RADIO,
'yn' => _AM_ELE_YN,
@@ -127,6 +129,13 @@
case 'html':
$value[0] = $ele_value[$id];
break;
+ case 'date':
+ $value = array();
+ $value[] = $ele_value[$id];
+ break;
+ case 'select2':
+ $value[2] = !empty($ele_value[$id]) ? $ele_value[$id] : 'LB';
+ break;
case 'select':
$new_vars = array();
$opt_count = 1;
Modified: XoopsModules/xforms/branches/mamba/xforms/class/elementrenderer.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/class/elementrenderer.php 2012-11-21 05:34:42 UTC (rev 10266)
+++ XoopsModules/xforms/branches/mamba/xforms/class/elementrenderer.php 2012-11-22 19:38:36 UTC (rev 10267)
@@ -64,7 +64,31 @@
$check_req->setExtra('disabled="disabled"');
}
break;
-
+ case 'date':
+ if ($post_val) {
+ $ele_value = $post_val;
+ }
+ $form_ele = new XoopsFormTextDateSelect(
+ $ele_caption,
+ $form_ele_id,
+ 15,
+ strtotime($ele_value[0])
+ );
+
+
+
+ break;
+
+ case 'select2':
+ if ($post_val) {
+ $ele_value = $post_val;
+ }
+ $form_ele = new XoopsFormSelectCountry(
+ $ele_caption,
+ $form_ele_id,
+ $myts->htmlspecialchars($myts->stripSlashesGPC($ele_value[2])) // default value
+ );
+ break;
case 'select':
$selected = array();
$options = array();
Modified: XoopsModules/xforms/branches/mamba/xforms/docs/changelog.txt
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/docs/changelog.txt 2012-11-21 05:34:42 UTC (rev 10266)
+++ XoopsModules/xforms/branches/mamba/xforms/docs/changelog.txt 2012-11-22 19:38:36 UTC (rev 10267)
@@ -1,3 +1,7 @@
+1.22 Mariane (2012-11-20)
+=================================
+- add Country and Date selection (Mariane)
+
1.21 Mamba (2012-06-26)
=================================
- fixing some bugs: (black_beard)
Modified: XoopsModules/xforms/branches/mamba/xforms/docs/lang_diff.txt
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/docs/lang_diff.txt 2012-11-21 05:34:42 UTC (rev 10266)
+++ XoopsModules/xforms/branches/mamba/xforms/docs/lang_diff.txt 2012-11-22 19:38:36 UTC (rev 10267)
@@ -53,4 +53,13 @@
// index.php
define("_MI_XPARTNERS_MENU_01", "Home");
define("_PARTNERS_ADMIN_ABOUT", "About");
-define("_PARTNERS_ADMIN_HELP", "Help");
\ No newline at end of file
+define("_PARTNERS_ADMIN_HELP", "Help");
+
+Version 1.11
+----------------
+
+admin.php
+-----------
+define("_AM_ELE_DATE","Date Selection");
+define("_AM_ELE_SELECT_CTRY","Country Selection");
+define("_AM_ELE_SELECT_CTRY_DEFAULT","Select Default Country");
\ No newline at end of file
Modified: XoopsModules/xforms/branches/mamba/xforms/include/form_execute.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/include/form_execute.php 2012-11-21 05:34:42 UTC (rev 10266)
+++ XoopsModules/xforms/branches/mamba/xforms/include/form_execute.php 2012-11-22 19:38:36 UTC (rev 10267)
@@ -45,6 +45,8 @@
if( $ele_caption != '' ){
$msg[$ele_id] = "\n".$myts->stripSlashesGPC($ele_caption)."\n";
}
+ include_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
+ $countries = XoopsLists::getCountryList();
switch($ele_type){
case 'upload':
case 'uploadimg':
@@ -106,6 +108,37 @@
$opt_count++;
}
break;
+ case 'select2':
+ $ele[$ele_id] = trim($ele[$ele_id]);
+ if( preg_match('/\{EMAIL\}/', $ele_value[2]) ){
+ if( !checkEmail($ele[$ele_id]) ){
+ $err[] = _LIAISE_ERR_INVALIDMAIL;
+ }else{
+ $reply_mail = $ele[$ele_id];
+ }
+ }
+ if( preg_match('/\{UNAME\}/', $ele_value[2]) ){
+ $reply_name = $ele[$ele_id];
+ }
+ // $msg[$ele_id] .= $myts->stripSlashesGPC($ele[$ele_id]);
+
+ $msg[$ele_id] .= $countries[$myts->stripSlashesGPC($ele[$ele_id])];
+
+ break;
+ case 'date':
+ $ele[$ele_id] = trim($ele[$ele_id]);
+ if( preg_match('/\{EMAIL\}/', $ele_value) ){
+ if( !checkEmail($ele[$ele_id]) ){
+ $err[] = _LIAISE_ERR_INVALIDMAIL;
+ }else{
+ $reply_mail = $ele[$ele_id];
+ }
+ }
+ if( preg_match('/\{UNAME\}/', $ele_value) ){
+ $reply_name = $ele[$ele_id];
+ }
+ $msg[$ele_id] .= $myts->stripSlashesGPC($ele[$ele_id]);
+ break;
case 'yn':
$v = ($ele[$ele_id]==2) ? _NO : _YES;
$msg[$ele_id] .= $myts->stripSlashesGPC($v);
Modified: XoopsModules/xforms/branches/mamba/xforms/language/english/admin.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/language/english/admin.php 2012-11-21 05:34:42 UTC (rev 10266)
+++ XoopsModules/xforms/branches/mamba/xforms/language/english/admin.php 2012-11-22 19:38:36 UTC (rev 10267)
@@ -116,3 +116,8 @@
define("_AM_ELE_YOUR_NAME",'Your Name');
define("_AM_ELE_YOUR_EMAIL",'Email address');
define("_AM_ELE_YOUR_COMMENTS",'Your comments');
+
+//1.22
+
+define("_AM_ELE_DATE","Date Selection");
+define("_AM_ELE_SELECT_CTRY","Country Selection");
\ No newline at end of file
Modified: XoopsModules/xforms/branches/mamba/xforms/language/english/modinfo.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/language/english/modinfo.php 2012-11-21 05:34:42 UTC (rev 10266)
+++ XoopsModules/xforms/branches/mamba/xforms/language/english/modinfo.php 2012-11-22 19:38:36 UTC (rev 10267)
@@ -63,4 +63,6 @@
define("_MI_xforms_NOFORM_DEFAULT","Sorry, there are currently no forms (visible for you).");
define("_MI_xforms_ADMENU0","Home");
-?>
\ No newline at end of file
+
+//1.22
+define("_MI_ELE_SELECT_CTRY_DEFAULT","Select Default Country");
\ No newline at end of file
Modified: XoopsModules/xforms/branches/mamba/xforms/xoops_version.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/xoops_version.php 2012-11-21 05:34:42 UTC (rev 10266)
+++ XoopsModules/xforms/branches/mamba/xforms/xoops_version.php 2012-11-22 19:38:36 UTC (rev 10267)
@@ -4,7 +4,7 @@
###################################
$modversion['name'] = _MI_xforms_NAME;
-$modversion['version'] = '1.21';
+$modversion['version'] = '1.22';
$modversion['description'] = _MI_xforms_DESC;
$modversion['author'] = "XD Soft";
$modversion['credits'] = "Creator of xforms Dylian Melgert and special thanks to Brandycoke Productions (http://www.brandycoke.com/) for creating liaise (The base of this module)";
@@ -19,10 +19,10 @@
$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
//about
-$modversion['release_date'] = '2012/06/25';
+$modversion['release_date'] = '2012/11/20';
$modversion["module_website_url"] = "www.xoops.org/";
$modversion["module_website_name"] = "XOOPS";
-$modversion["module_status"] = "Final";
+$modversion["module_status"] = "Beta 1";
$modversion['min_php']='5.2';
$modversion['min_xoops']="2.5";
$modversion['min_admin']='1.1';
@@ -101,6 +101,17 @@
$modversion['config'][$i]['default'] = array('user', 'ip', 'agent');
$modversion['config'][$i]['options'] = array(_MI_xforms_MOREINFO_USER => 'user', _MI_xforms_MOREINFO_IP => 'ip', _MI_xforms_MOREINFO_AGENT => 'agent', _MI_xforms_MOREINFO_FORM => 'form');
$i++;
+
+// Select Default Country
+$modversion['config'][$i]['name'] = "mycountry";
+$modversion['config'][$i]['title'] = '_MI_ELE_SELECT_CTRY_DEFAULT';
+$modversion['config'][$i]['description'] = '';
+$modversion['config'][$i]['formtype'] = 'select';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = '-----';
+xoops_load('XoopsLists');
+$modversion['config'][$i]['options'] = array_flip(XoopsLists::getCountryList());
+$i++;
// $xoopsModuleConfig['mail_charset']
$modversion['config'][$i]['name'] = 'mail_charset';
$modversion['config'][$i]['title'] = '_MI_xforms_MAIL_CHARSET';
|
|
From: <be...@us...> - 2012-11-21 05:34:46
|
Revision: 10266
http://sourceforge.net/p/xoops/svn/10266
Author: beckmi
Date: 2012-11-21 05:34:42 +0000 (Wed, 21 Nov 2012)
Log Message:
-----------
Updating for compatibility with PHP 5.4
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.6/htdocs/install/include/functions.php
XoopsCore/branches/2.5.x/2.5.6/htdocs/install/language/english/install.php
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/install/include/functions.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/install/include/functions.php 2012-11-21 05:10:08 UTC (rev 10265)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/install/include/functions.php 2012-11-21 05:34:42 UTC (rev 10266)
@@ -28,7 +28,7 @@
if ($hash_login != md5($user->getVar('pass') . XOOPS_DB_NAME . XOOPS_DB_PASS . XOOPS_DB_PREFIX)) {
return false;
}
- $myts =& MyTextsanitizer::getInstance();
+ $myts = MyTextsanitizer::getInstance();
if (is_object($GLOBALS['xoops']) && method_exists($GLOBALS['xoops'], 'acceptUser')) {
$res = $GLOBALS['xoops']->acceptUser($uname, true, $msg);
return $res;
@@ -51,7 +51,7 @@
function xoFormField( $name, $value, $label, $help = '' )
{
- $myts =& MyTextSanitizer::getInstance();
+ $myts = MyTextSanitizer::getInstance();
$label = $myts->htmlspecialchars($label, ENT_QUOTES, _INSTALL_CHARSET, false);
$name = $myts->htmlspecialchars($name, ENT_QUOTES, _INSTALL_CHARSET, false);
$value = $myts->htmlspecialchars($value, ENT_QUOTES);
@@ -68,7 +68,7 @@
function xoPassField($name, $value, $label, $help = '')
{
- $myts =& MyTextSanitizer::getInstance();
+ $myts = MyTextSanitizer::getInstance();
$label = $myts->htmlspecialchars( $label, ENT_QUOTES, _INSTALL_CHARSET, false);
$name = $myts->htmlspecialchars( $name, ENT_QUOTES, _INSTALL_CHARSET, false);
$value = $myts->htmlspecialchars( $value, ENT_QUOTES );
@@ -259,7 +259,7 @@
return "";
}
- $myts =& MyTextSanitizer::getInstance();
+ $myts = MyTextSanitizer::getInstance();
$label = $myts->htmlspecialchars($label, ENT_QUOTES, _INSTALL_CHARSET, false);
$name = $myts->htmlspecialchars($name, ENT_QUOTES, _INSTALL_CHARSET, false);
$value = $myts->htmlspecialchars($value, ENT_QUOTES);
@@ -315,7 +315,7 @@
ksort($chars);
$charsets = array_merge($charsets, $chars);
- $myt |
|
From: <be...@us...> - 2012-11-21 05:10:10
|
Revision: 10265
http://sourceforge.net/p/xoops/svn/10265
Author: beckmi
Date: 2012-11-21 05:10:08 +0000 (Wed, 21 Nov 2012)
Log Message:
-----------
Updating for compatibility with PHP 5.4, and consistency among modules
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.6/htdocs/class/database/databasefactory.php
XoopsCore/branches/2.5.x/2.5.6/htdocs/class/module.textsanitizer.php
XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopsstory.php
XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/admin/admin_footer.php
XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/admin/admin_header.php
XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/admin/menu.php
XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/docs/changelog.txt
XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/language/english/help/help.html
XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/xoops_version.php
XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/admin/admin_footer.php
XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/admin/admin_header.php
XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/admin/menu.php
XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/docs/changelog.txt
XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/xoops_version.php
XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/users/jquery.php
XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/users/users.php
XoopsCore/branches/2.5.x/2.5.6/htdocs/xoops_lib/modules/protector/module_icon.php
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/database/databasefactory.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/database/databasefactory.php 2012-11-21 04:52:11 UTC (rev 10264)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/database/databasefactory.php 2012-11-21 05:10:08 UTC (rev 10265)
@@ -80,7 +80,7 @@
* @staticvar object The only instance of database class
* @return object Reference to the only instance of database class
*/
- function &getDatabase()
+ static function getDatabase()
{
static $database;
if (!isset($database)) {
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/module.textsanitizer.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/module.textsanitizer.php 2012-11-21 04:52:11 UTC (rev 10264)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/module.textsanitizer.php 2012-11-21 05:10:08 UTC (rev 10265)
@@ -233,7 +233,7 @@
* @static
* @staticvar object
*/
- function &getInstance()
+ static function getInstance()
{
static $instance;
if (!isset($instance)) {
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopsstory.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopsstory.php 2012-11-21 04:52:11 UTC (rev 10264)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopsstory.php 2012-11-21 05:10:08 UTC (rev 10265)
@@ -23,7 +23,7 @@
}
$GLOBALS['xoopsLogger']->addDeprecated("'/class/xoopstory.php' is deprecated since XOOPS 2.5.4, please create your own class instead.");
include_once XOOPS_ROOT_PATH."/class/xoopstopic.php";
-include_once XOOPS_ROOT_PATH."/class/xoopsuser.php";
+include_once XOOPS_ROOT_PATH."/kernel/user.php";
class XoopsStory
{
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/admin/admin_footer.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/admin/admin_footer.php 2012-11-21 04:52:11 UTC (rev 10264)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/admin/admin_footer.php 2012-11-21 05:10:08 UTC (rev 10265)
@@ -17,9 +17,11 @@
* @version: $Id $
**/
-global $moduleInfo;
-
-echo "<div align=\"center\"><a href=\"http://www.xoops.org\" target=\"_blank\"><img src=" . XOOPS_URL ."/". $moduleInfo->getInfo("dirmoduleadmin")."/icons/32/xoopsmicrobutton.gif".' '." alt=\"XOOPS\" title=\"XOOPS\"></a></div>";
-echo "<div class='center smallsmall italic pad5'><strong>" . $xoopsModule->getVar("name") . "</strong> is maintained by the <a class='tooltip' rel='external' href='http://www.xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>";
+echo "<div class='adminfooter'>\n"
+ ." <div style='text-align: center;'>\n"
+ ." <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
+ ." </div>\n"
+ ." " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
+ ."</div>";
xoops_cp_footer();
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/admin/admin_header.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/admin/admin_header.php 2012-11-21 04:52:11 UTC (rev 10264)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/admin/admin_header.php 2012-11-21 05:10:08 UTC (rev 10265)
@@ -18,27 +18,29 @@
*/
-include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php';
-//include_once XOOPS_ROOT_PATH . '/include/cp_functions.php';
-include("../../../include/cp_header.php");
-//require_once XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['xoopsModule']->getVar('dirname') . '/include/functions.php';
+$path = dirname(dirname(dirname(dirname(__FILE__))));
+include_once $path . '/mainfile.php';
+include_once $path . '/include/cp_functions.php';
+require_once $path . '/include/cp_header.php';
-if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))){
- include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php');
- //return true;
- }else{
- redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false);
- //return false;
- }
+global $xoopsModule;
-$myts =& MyTextSanitizer::getInstance();
-
-$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
-$pathIcon16 = XOOPS_URL .'/'. $moduleInfo->getInfo('icons16');
-$pathIcon32 = XOOPS_URL .'/'. $moduleInfo->getInfo('icons32');
+$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname');
+//if functions.php file exist
+//require_once dirname(dirname(__FILE__)) . '/include/functions.php';
+// Load language files
+xoops_loadLanguage('admin', $thisModuleDir);
+xoops_loadLanguage('modinfo', $thisModuleDir);
+xoops_loadLanguage('main', $thisModuleDir);
+$pathIcon16 = '../'.$xoopsModule->getInfo('icons16');
+$pathIcon32 = '../'.$xoopsModule->getInfo('icons32');
+$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
+
+include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php');
+
if ($xoopsUser) {
$moduleperm_handler =& xoops_gethandler('groupperm');
if (!$moduleperm_handler->checkRight('module_admin', $xoopsModule->getVar('mid'), $xoopsUser->getGroups())) {
@@ -55,20 +57,8 @@
$xoopsTpl = new XoopsTpl();
}
+//$xoopsTpl->assign('pathIcon16', $pathIcon16);
-$xoopsTpl->assign('pathIcon16', $pathIcon16);
-
-// Load language files
-if (!@include_once(XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname")."/language/" . $xoopsConfig['language'] . "/admin.php")) {
- include_once(XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname")."/language/english/admin.php");
-}
-if (!@include_once(XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname")."/language/" . $xoopsConfig['language'] . "/modinfo.php")) {
- include_once(XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname")."/language/english/modinfo.php");
-}
-if (!@include_once(XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname")."/language/" . $xoopsConfig['language'] . "/main.php")) {
- include_once(XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname")."/language/english/main.php");
-}
-
if (!isset($GLOBALS['xoopsTpl']) || !is_object($GLOBALS['xoopsTpl'])) {
include_once XOOPS_ROOT_PATH . '/class/template.php';
$GLOBALS['xoopsTpl'] = new XoopsTpl();
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/admin/menu.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/admin/menu.php 2012-11-21 04:52:11 UTC (rev 10264)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/admin/menu.php 2012-11-21 05:10:08 UTC (rev 10265)
@@ -17,22 +17,36 @@
* @version $Id$
*/
-$module_handler =& xoops_gethandler('module');
-$xoopsModule =& XoopsModule::getByDirname('pm');
-$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
-$pathIcon32 = $moduleInfo->getInfo('icons32');
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+$path = dirname(dirname(dirname(dirname(__FILE__))));
+include_once $path . '/mainfile.php';
+
+$dirname = basename(dirname(dirname(__FILE__)));
+$module_handler = xoops_gethandler('module');
+$module = $module_handler->getByDirname($dirname);
+$pathIcon32 = $module->getInfo('icons32');
+$pathModuleAdmin = $module->getInfo('dirmoduleadmin');
+$pathLanguage = $path . $pathModuleAdmin;
+
+
+if (!file_exists($fileinc = $pathLanguage . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/' . 'main.php')) {
+ $fileinc = $pathLanguage . '/language/english/main.php';
+}
+
+include_once $fileinc;
+
$adminmenu = array();
$i = 1;
$adminmenu[$i]['title'] = _PM_MI_INDEX;
$adminmenu[$i]['link'] = "admin/admin.php";
-$adminmenu[$i]['icon'] = '../../'.$pathIcon32.'/home.png' ;
+$adminmenu[$i]['icon'] = $pathIcon32.'/home.png' ;
$i++;
$adminmenu[$i]['title'] = _PM_MI_PRUNE;
$adminmenu[$i]['link'] = "admin/prune.php";
-$adminmenu[$i]['icon'] = '../../'.$pathIcon32.'/prune.png' ;
+$adminmenu[$i]['icon'] = $pathIcon32.'/prune.png' ;
$i++;
$adminmenu[$i]['title'] = _PM_MI_ABOUT;
$adminmenu[$i]['link'] = 'admin/about.php';
-$adminmenu[$i]['icon'] = '../../'.$pathIcon32.'/about.png';
\ No newline at end of file
+$adminmenu[$i]['icon'] = $pathIcon32.'/about.png';
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/docs/changelog.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/docs/changelog.txt 2012-11-21 04:52:11 UTC (rev 10264)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/docs/changelog.txt 2012-11-21 05:10:08 UTC (rev 10265)
@@ -1,3 +1,7 @@
+Version 1.09
+-------------------
+- updated code to make it consistent with other modules (mamba)
+
Version 1.08
-------------------
- Fixed XSS (Cross Site Scripting) vulnerability in pmlite.php (High-Tech Bridge Security Research Lab/trabis)
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/language/english/help/help.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/language/english/help/help.html 2012-11-21 04:52:11 UTC (rev 10264)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/language/english/help/help.html 2012-11-21 05:10:08 UTC (rev 10265)
@@ -7,10 +7,11 @@
<p>No special measures necessary, follow the standard installation process – extract the /pm folder into the ../modules directory. Install the module through Admin -> System Module -> Modules.</p>
<p>Detailed instructions on installing modules are available in the <a href="http://goo.gl/adT2i" title="XOOPS Operations Manual">XOOPS Operations Manual</a> </p>
<h4 class="odd">Operating instructions</h4>
- <ul>
+ <p class="even">To set up this module you need to:</p>
+ <ul>
<li>You enter your Inbox directly from the front page, or by clicking on the top link "Go to module" in the PM's Admin area.</li>
<li>Configure your preferences for the module (see ‘Preferences’) and optionally the PM block if you intend to use it (see ‘Blocks’).</li>
- <li>You can do mass deleting of your messages by using the "Prune Messages" tab.</li>
+ <li>ou can do mass deleting of your messages by using the "Prune Messages" tab.</li>
</ul>
<h4 class="odd">Tutorial</h4>
<p class="even">Tutorial coming soon.</p>
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/xoops_version.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/xoops_version.php 2012-11-21 04:52:11 UTC (rev 10264)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/xoops_version.php 2012-11-21 05:10:08 UTC (rev 10265)
@@ -26,26 +26,31 @@
$modversion = array();
$modversion['name'] = _PM_MI_NAME;
-$modversion['version'] = 1.08;
+$modversion['version'] = 1.09;
$modversion['description'] = _PM_MI_DESC;
$modversion['author'] = "Jan Pedersen, Taiwen Jiang";
$modversion['credits'] = "The XOOPS Project, Wanikoo";
$modversion['help'] = 'page=help';
-$modversion['license'] = 'GNU GPL 2.0';
+$modversion['license'] = 'GNU GPL 2.0 or later';
$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html/";
$modversion['image'] = "images/logo.png";
$modversion['dirname'] = "pm";
-$modversion['dirmoduleadmin'] = 'Frameworks/moduleclasses';
-$modversion['icons16'] = 'Frameworks/moduleclasses/icons/16';
-$modversion['icons32'] = 'Frameworks/moduleclasses/icons/32';
+$modversion['dirmoduleadmin'] = '/Frameworks/moduleclasses/moduleadmin';
+$modversion['icons16'] = '../../Frameworks/moduleclasses/icons/16';
+$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
//about
-$modversion['release_date'] = '2011/10/08';
-$modversion["module_website_url"] = "http://www.xoops.org/";
+$modversion['release_date'] = '2012/07/30';
+$modversion["module_website_url"] = "http://www.xoops.org/";
$modversion["module_website_name"] = "XOOPS";
-$modversion["module_status"] = "RC";
-$modversion['min_php']='5.2';
-$modversion['min_xoops']="2.5.0";
+$modversion["module_status"] = "RC";
+$modversion['min_php'] = '5.2';
+$modversion['min_xoops'] = "2.5.5";
+$modversion['min_admin'] = '1.1';
+$modversion['min_db'] = array(
+ 'mysql' => '5.0.7',
+ 'mysqli' => '5.0.7'
+);
// Admin menu
// Set to 1 if you want to display menu generated by system module
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/admin/admin_footer.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/admin/admin_footer.php 2012-11-21 04:52:11 UTC (rev 10264)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/admin/admin_footer.php 2012-11-21 05:10:08 UTC (rev 10265)
@@ -16,7 +16,11 @@
* @author XOOPS Module Team
* @version $Id $
**/
-echo "<div align=\"center\"><a href=\"http://www.xoops.org\" target=\"_blank\"><img src=" . XOOPS_URL ."/". $moduleInfo->getInfo("icons32")."/xoopsmicrobutton.gif"." alt=\"XOOPS\" title=\"XOOPS\"></a></div>";
-echo "<div class='center smallsmall italic pad5'><strong>" . $xoopsModule->getVar("name") . "</strong> is maintained by the <a class='tooltip' rel='external' href='http://www.xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>";
+echo "<div class='adminfooter'>\n"
+ ." <div style='text-align: center;'>\n"
+ ." <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
+ ." </div>\n"
+ ." " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
+ ."</div>";
xoops_cp_footer();
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/admin/admin_header.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/admin/admin_header.php 2012-11-21 04:52:11 UTC (rev 10264)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/admin/admin_header.php 2012-11-21 05:10:08 UTC (rev 10265)
@@ -17,22 +17,27 @@
* @version $Id$
*/
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php';
-require_once XOOPS_ROOT_PATH . '/include/cp_functions.php';
-require '../../../include/cp_header.php';
+$path = dirname(dirname(dirname(dirname(__FILE__))));
+include_once $path . '/mainfile.php';
+include_once $path . '/include/cp_functions.php';
+require_once $path . '/include/cp_header.php';
-if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))){
- include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php');
- //return true;
- }else{
- echo xoops_error("Error: You don't use the Frameworks \"admin module\". Please install this Frameworks");
- //return false;
- }
+global $xoopsModule;
-$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
-$pathIcon16 = XOOPS_URL .'/'. $moduleInfo->getInfo('icons16');
-$pathIcon32 = XOOPS_URL .'/'. $moduleInfo->getInfo('icons32');
+$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname');
+//if functions.php file exist
+//require_once dirname(dirname(__FILE__)) . '/include/functions.php';
+
+// Load language files
+xoops_loadLanguage('admin', $thisModuleDir);
+xoops_loadLanguage('modinfo', $thisModuleDir);
+xoops_loadLanguage('main', $thisModuleDir);
+
+$pathIcon16 = '../'.$xoopsModule->getInfo('icons16');
+$pathIcon32 = '../'.$xoopsModule->getInfo('icons32');
+$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
+
$myts =& MyTextSanitizer::getInstance();
if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
@@ -40,41 +45,10 @@
$xoopsTpl = new XoopsTpl();
}
-//xoops_cp_header();
+include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php');
-//Load languages
-if (file_exists(
- XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->getVar('dirname') . "/language/{$xoopsConfig['language']}/admin.php"
-)
-) {
- include_once XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->getVar('dirname')
- . "/language/{$xoopsConfig['language']}/admin.php";
-} else {
- include_once XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->getVar('dirname') . "/language/english/admin.php";
-}
-if (file_exists(
- XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->getVar('dirname') . "/language/{$xoopsConfig['language']}/modinfo.php"
-)
-) {
- include_once XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->getVar('dirname')
- . "/language/{$xoopsConfig['language']}/modinfo.php";
-} else {
- include_once XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->getVar('dirname') . "/language/english/modinfo.php";
-}
-if (file_exists(
- XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->getVar('dirname') . "/language/{$xoopsConfig['language']}/main.php"
-)
-) {
- include_once XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->getVar('dirname')
- . "/language/{$xoopsConfig['language']}/main.php";
-} else {
- include_once XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->getVar('dirname') . "/language/english/main.php";
-}
-
-
xoops_loadLanguage('user');
if ( !isset($GLOBALS['xoopsTpl']) || !is_object($GLOBALS['xoopsTpl']) ) {
include_once $GLOBALS['xoops']->path( "/class/template.php" );
$GLOBALS['xoopsTpl'] = new XoopsTpl();
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/admin/menu.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/admin/menu.php 2012-11-21 04:52:11 UTC (rev 10264)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/admin/menu.php 2012-11-21 05:10:08 UTC (rev 10265)
@@ -17,39 +17,53 @@
* @author Taiwen Jiang <ph...@us...>
* @version $Id$
*/
-
-$module_handler =& xoops_gethandler('module');
-$xoopsModule =& XoopsModule::getByDirname('profile');
-$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
-$pathIcon32 = $moduleInfo->getInfo('icons32');
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+
+$path = dirname(dirname(dirname(dirname(__FILE__))));
+include_once $path . '/mainfile.php';
+
+$dirname = basename(dirname(dirname(__FILE__)));
+$module_handler = xoops_gethandler('module');
+$module = $module_handler->getByDirname($dirname);
+$pathIcon32 = $module->getInfo('icons32');
+$pathModuleAdmin = $module->getInfo('dirmoduleadmin');
+$pathLanguage = $path . $pathModuleAdmin;
+
+
+if (!file_exists($fileinc = $pathLanguage . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/' . 'main.php')) {
+ $fileinc = $pathLanguage . '/language/english/main.php';
+}
+
+include_once $fileinc;
+
$adminmenu = array();
$i = 1;
$adminmenu[$i]['title'] = _PROFILE_MI_HOME;
$adminmenu[$i]['link'] = "admin/index.php";
-$adminmenu[$i]['icon'] = '../../'.$pathIcon32.'/home.png' ;
+$adminmenu[$i]['icon'] = $pathIcon32.'/home.png' ;
$i++;
$adminmenu[$i]['title'] = _PROFILE_MI_USERS;
$adminmenu[$i]['link'] = "admin/user.php";
-$adminmenu[$i]['icon'] = '../../'.$pathIcon32.'/users.png' ;
+$adminmenu[$i]['icon'] = $pathIcon32.'/users.png' ;
$i++;
$adminmenu[$i]['title'] = _PROFILE_MI_CATEGORIES;
$adminmenu[$i]['link'] = "admin/category.php";
-$adminmenu[$i]['icon'] = '../../'.$pathIcon32.'/category.png' ;
+$adminmenu[$i]['icon'] = $pathIcon32.'/category.png' ;
$i++;
$adminmenu[$i]['title'] = _PROFILE_MI_FIELDS;
$adminmenu[$i]['link'] = "admin/field.php";
-$adminmenu[$i]['icon'] = '../../'.$pathIcon32.'/index.png' ;
+$adminmenu[$i]['icon'] = $pathIcon32.'/index.png' ;
$i++;
$adminmenu[$i]['title'] = _PROFILE_MI_STEPS;
$adminmenu[$i]['link'] = "admin/step.php";
-$adminmenu[$i]['icon'] = '../../'.$pathIcon32.'/stats.png' ;
+$adminmenu[$i]['icon'] = $pathIcon32.'/stats.png' ;
$i++;
$adminmenu[$i]['title'] = _PROFILE_MI_PERMISSIONS;
$adminmenu[$i]['link'] = "admin/permissions.php";
-$adminmenu[$i]['icon'] = '../../'.$pathIcon32.'/permissions.png' ;
+$adminmenu[$i]['icon'] = $pathIcon32.'/permissions.png' ;
$i++;
$adminmenu[$i]['title'] = _PROFILE_MI_ABOUT;
$adminmenu[$i]['link'] = 'admin/about.php';
-$adminmenu[$i]['icon'] = '../../'.$pathIcon32.'/about.png';
\ No newline at end of file
+$adminmenu[$i]['icon'] = $pathIcon32.'/about.png';
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/docs/changelog.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/docs/changelog.txt 2012-11-21 04:52:11 UTC (rev 10264)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/docs/changelog.txt 2012-11-21 05:10:08 UTC (rev 10265)
@@ -1,3 +1,7 @@
+Version 1.64 RC
+-------------------
+- updated code to make it consistent with other modules (mamba)
+
Version 1.63 RC
-------------------
- added "Required" column in Fields with Toggle functionality (mamba)
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/xoops_version.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/xoops_version.php 2012-11-21 04:52:11 UTC (rev 10264)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/xoops_version.php 2012-11-21 05:10:08 UTC (rev 10265)
@@ -25,26 +25,31 @@
*/
$modversion = array();
$modversion['name'] = _PROFILE_MI_NAME;
-$modversion['version'] = 1.63;
+$modversion['version'] = 1.64;
$modversion['description'] = _PROFILE_MI_DESC;
$modversion['author'] = "Jan Pedersen, Taiwen Jiang, alfred, Wishcraft";
$modversion['credits'] = "Ackbarr, mboyden, marco, mamba, trabis, etc.";
$modversion['help'] = 'page=help';
-$modversion['license'] = 'GNU GPL 2.0';
+$modversion['license'] = 'GNU GPL 2.0 or later';
$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html/";
$modversion['image'] = "images/logo.png";
$modversion['dirname'] = "profile";
-$modversion['dirmoduleadmin'] = 'Frameworks/moduleclasses';
-$modversion['icons16'] = 'Frameworks/moduleclasses/icons/16';
-$modversion['icons32'] = 'Frameworks/moduleclasses/icons/32';
+$modversion['dirmoduleadmin'] = '/Frameworks/moduleclasses/moduleadmin';
+$modversion['icons16'] = '../../Frameworks/moduleclasses/icons/16';
+$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
//about
-$modversion['release_date'] = '2011/10/08';
-$modversion["module_website_url"] = "http://www.xoops.org/";
+$modversion['release_date'] = '2012/07/30';
+$modversion["module_website_url"] = "http://www.xoops.org/";
$modversion["module_website_name"] = "XOOPS";
-$modversion["module_status"] = "RC";
-$modversion['min_php']='5.2';
-$modversion['min_xoops']="2.5";
+$modversion["module_status"] = "RC";
+$modversion['min_php'] = '5.2';
+$modversion['min_xoops'] = "2.5.5";
+$modversion['min_admin'] = '1.1';
+$modversion['min_db'] = array(
+ 'mysql' => '5.0.7',
+ 'mysqli' => '5.0.7'
+);
// Admin menu
// Set to 1 if you want to display menu generated by system module
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/users/jquery.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/users/jquery.php 2012-11-21 04:52:11 UTC (rev 10264)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/users/jquery.php 2012-11-21 05:10:08 UTC (rev 10265)
@@ -39,7 +39,7 @@
$GLOBALS['xoopsLogger']->activated = false;
include_once XOOPS_ROOT_PATH . '/include/comment_constants.php';
- include_once XOOPS_ROOT_PATH . '/class/xoopsmodule.php';
+ include_once XOOPS_ROOT_PATH . '/kernel/module.php';
include_once XOOPS_ROOT_PATH . '/modules/system/include/functions.php';
$tables = array();
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/users/users.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/users/users.php 2012-11-21 04:52:11 UTC (rev 10264)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/users/users.php 2012-11-21 05:10:08 UTC (rev 10265)
@@ -213,7 +213,7 @@
global $xoopsDB;
include_once XOOPS_ROOT_PATH . '/include/comment_constants.php';
- include_once(XOOPS_ROOT_PATH."/class/xoopsmodule.php");
+ include_once(XOOPS_ROOT_PATH."/kernel/module.php");
$tables = array();
// Count comments (approved only: com_status == XOOPS_COMMENT_ACTIVE)
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/xoops_lib/modules/protector/module_icon.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/xoops_lib/modules/protector/module_icon.php 2012-11-21 04:52:11 UTC (rev 10264)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/xoops_lib/modules/protector/module_icon.php 2012-11-21 05:10:08 UTC (rev 10265)
@@ -23,16 +23,7 @@
$file_base = 'module_icon' ;
}
-// branches by cores
-if( defined( 'ICMS_TRUST_PATH' ) ) {
- $draw_dirname = false ;
- $file_base .= '_icms' ;
-} else if( defined( 'XOOPS_CUBE_LEGACY' ) ) {
- $draw_dirname = false ;
- $file_base .= '_xcl' ;
-} else {
- $draw_dirname = true ;
-}
+$draw_dirname = true ;
// icon files must be PNG
$file = $file_base . '.png' ;
|
|
From: <be...@us...> - 2012-11-21 04:52:14
|
Revision: 10264
http://sourceforge.net/p/xoops/svn/10264
Author: beckmi
Date: 2012-11-21 04:52:11 +0000 (Wed, 21 Nov 2012)
Log Message:
-----------
Updating for compatibility with PHP 5.4
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.6/htdocs/class/cache/file.php
XoopsCore/branches/2.5.x/2.5.6/htdocs/class/cache/xoopscache.php
XoopsCore/branches/2.5.x/2.5.6/htdocs/class/database/mysqldatabase.php
XoopsCore/branches/2.5.x/2.5.6/htdocs/class/file/xoopsfile.php
XoopsCore/branches/2.5.x/2.5.6/htdocs/class/logger/xoopslogger.php
XoopsCore/branches/2.5.x/2.5.6/htdocs/class/preload.php
XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopslists.php
XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopsload.php
XoopsCore/branches/2.5.x/2.5.6/htdocs/language/english/calendar.php
XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/protector/preloads/core.php
XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/modulesadmin/main.php
XoopsCore/branches/2.5.x/2.5.6/htdocs/xoops_lib/modules/protector/class/protector.php
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/cache/file.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/cache/file.php 2012-11-21 04:40:56 UTC (rev 10263)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/cache/file.php 2012-11-21 04:52:11 UTC (rev 10264)
@@ -137,8 +137,9 @@
* @return boolean True if the data was succesfully cached, false on failure
* @access public
*/
- function write($key, $data = null, $duration = null)
+ function write($key, $value = null, $duration = null)
{
+ $data = $value;
if (!isset($data) || ! $this->init) {
return false;
}
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/cache/xoopscache.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/cache/xoopscache.php 2012-11-21 04:40:56 UTC (rev 10263)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/cache/xoopscache.php 2012-11-21 04:52:11 UTC (rev 10264)
@@ -66,7 +66,7 @@
* @return object
* @access public
*/
- function &getInstance()
+ static function &getInstance()
{
static $instance;
if (!isset($instance)) {
@@ -257,7 +257,7 @@
* @return mixed The cached data, or false if the data doesn't exist, has expired, or if there was an error fetching it
* @access public
*/
- function read($key, $config = null)
+ static function read($key, $config = null)
{
$key = substr(md5(XOOPS_URL), 0, 8) . '_' . $key;
$_this =& XoopsCache::getInstance();
@@ -438,7 +438,7 @@
* @return boolean True if the data was succesfully cached, false on failure
* @access public
*/
- function write($key, &$value, $duration)
+ function write($key, $value = null, $duration = null)
{
trigger_error(sprintf(__('Method write() not implemented in %s', true), get_class($this)), E_USER_ERROR);
}
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/database/mysqldatabase.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/database/mysqldatabase.php 2012-11-21 04:40:56 UTC (rev 10263)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/database/mysqldatabase.php 2012-11-21 04:52:11 UTC (rev 10264)
@@ -56,13 +56,13 @@
* @param bool $selectdb select the database now?
* @return bool successful?
*/
- function connect($selectdb = true)
+ function connect($selectdb = TRUE)
{
static $db_charset_set;
if (!extension_loaded('mysql')) {
trigger_error('notrace:mysql extension not loaded', E_USER_ERROR);
- return false;
+ return FALSE;
}
$this->allowWebChanges = ($_SERVER['REQUEST_METHOD'] != 'GET');
@@ -75,12 +75,12 @@
if (!$this->conn) {
$this->logger->addQuery('', $this->error(), $this->errno());
- return false;
+ return FALSE;
}
- if ($selectdb != false) {
+ if ($selectdb != FALSE) {
if (!mysql_select_db(XOOPS_DB_NAME)) {
$this->logger->addQuery('', $this->error(), $this->errno());
- return false;
+ return FALSE;
}
}
if (!isset($db_charset_set) && defined('XOOPS_DB_CHARSET') && XOOPS_DB_CHARSET) {
@@ -88,7 +88,7 @@
}
$db_charset_set = 1;
$this->queryF("SET SQL_BIG_SELECTS = 1");
- return true;
+ return TRUE;
}
/**
@@ -256,13 +256,13 @@
$this->logger->startTime('query_time');
$result = mysql_query($sql, $this->conn);
$this->logger->stopTime('query_time');
- $query_time = $this->logger->dumpTime('query_time', true);
+ $query_time = $this->logger->dumpTime('query_time', TRUE);
if ($result) {
- $this->logger->addQuery($sql, null, null, $query_time);
+ $this->logger->addQuery($sql, NULL, NULL, $query_time);
return $result;
} else {
$this->logger->addQuery($sql, $this->error(), $this->errno(), $query_time);
- return false;
+ return FALSE;
}
}
@@ -289,7 +289,7 @@
*/
function queryFromFile($file)
{
- if (false !== ($fp = fopen($file, 'r'))) {
+ if (FALSE !== ($fp = fopen($file, 'r'))) {
include_once XOOPS_ROOT_PATH . '/class/database/sqlutility.php';
$sql_queries = trim(fread($fp, filesize($file)));
SqlUtility::splitMySqlFile($pieces, $sql_queries);
@@ -297,13 +297,13 @@
// [0] contains the prefixed query
// [4] contains unprefixed table name
$prefixed_query = SqlUtility::prefixQuery(trim($query), $this->prefix());
- if ($prefixed_query != false) {
+ if ($prefixed_query != FALSE) {
$this->query($prefixed_query[0]);
}
}
- return true;
+ return TRUE;
}
- return false;
+ return FALSE;
}
/**
@@ -395,7 +395,7 @@
$sql = ltrim($sql);
if (!$this->allowWebChanges && strtolower(substr($sql, 0, 6)) != 'select') {
trigger_error('Database updates are not allowed during processing of a GET request', E_USER_WARNING);
- return false;
+ return FALSE;
}
return $this->queryF($sql, $limit, $start);
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/file/xoopsfile.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/file/xoopsfile.php 2012-11-21 04:40:56 UTC (rev 10263)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/file/xoopsfile.php 2012-11-21 04:52:11 UTC (rev 10264)
@@ -64,7 +64,7 @@
* @param string $name
* @return
*/
- function load($name = 'file')
+ static function load($name = 'file')
{
switch ($name) {
case 'folder':
@@ -102,7 +102,7 @@
* @param mixed $mode
* @return
*/
- function getHandler($name = 'file', $path = false, $create = false, $mode = null)
+ static function getHandler($name = 'file', $path = false, $create = false, $mode = null)
{
$handler = null;
XoopsFile::load($name);
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/logger/xoopslogger.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/logger/xoopslogger.php 2012-11-21 04:40:56 UTC (rev 10263)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/logger/xoopslogger.php 2012-11-21 04:52:11 UTC (rev 10264)
@@ -84,7 +84,7 @@
*
* @return object XoopsLogger reference to the only instance
*/
- function &getInstance()
+ static function &getInstance()
{
static $instance;
if (!isset($instance)) {
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/preload.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/preload.php 2012-11-21 04:40:56 UTC (rev 10263)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/preload.php 2012-11-21 04:52:11 UTC (rev 10264)
@@ -65,7 +65,7 @@
*
* @return object
*/
- function &getInstance()
+ static function &getInstance()
{
static $instance = false;
if (!$instance) {
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopslists.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopslists.php 2012-11-21 04:40:56 UTC (rev 10263)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopslists.php 2012-11-21 04:52:11 UTC (rev 10264)
@@ -126,7 +126,7 @@
/**
* gets list of all files in a directory
*/
- function getFileListAsArray($dirname, $prefix = '')
+ static function getFileListAsArray($dirname, $prefix = '')
{
$filelist = array();
if (substr($dirname, - 1) == '/') {
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopsload.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopsload.php 2012-11-21 04:40:56 UTC (rev 10263)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopsload.php 2012-11-21 04:52:11 UTC (rev 10264)
@@ -24,7 +24,7 @@
//static $loaded;
//static $configs;
- function load($name, $type = "core")
+ static function load($name, $type = "core")
{
static $loaded;
static $deprecated;
@@ -83,7 +83,7 @@
*
* @access private
*/
- function loadCore($name)
+ static function loadCore($name)
{
static $configs;
@@ -149,7 +149,7 @@
*
* @return
*/
- function loadCoreConfig()
+ static function loadCoreConfig()
{
return $configs = array(
'xoopsuserutility' => XOOPS_ROOT_PATH . '/class/userutility.php',
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/language/english/calendar.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/language/english/calendar.php 2012-11-21 04:40:56 UTC (rev 10263)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/language/english/calendar.php 2012-11-21 04:52:11 UTC (rev 10264)
@@ -4,39 +4,72 @@
// _CHARSET : UTF-8
// Translator: XOOPS Translation Team
// more examples: http://php.net/manual/en/function.date.php
-
+//
+// Revision by TXMod Xoops - Added shot text: 30/06/2012
+//
//%%%%% Time Zone %%%%
define("_CAL_FORMAT","Y-m-d");
+//%%%%% JQuery Calendar Time Zone %%%%
+define("_CAL_JQUERY_FORMAT","yy/mm/dd");
+// Week Mini Text
+define("_CAL_MIN_SUNDAY", "Su");
+define("_CAL_MIN_MONDAY", "Mo");
+define("_CAL_MIN_TUESDAY", "Tu");
+define("_CAL_MIN_WEDNESDAY", "We");
+define("_CAL_MIN_THURSDAY", "Th");
+define("_CAL_MIN_FRIDAY", "Fr");
+define("_CAL_MIN_SATURDAY", "Sa");
+// Week Short Text
+define("_CAL_SHORT_SUNDAY", "Sun");
+define("_CAL_SHORT_MONDAY", "Mon");
+define("_CAL_SHORT_TUESDAY", "Tue");
+define("_CAL_SHORT_WEDNESDAY", "Wed");
+define("_CAL_SHORT_THURSDAY", "Thu");
+define("_CAL_SHORT_FRIDAY", "Fri");
+define("_CAL_SHORT_SATURDAY", "Sat");
-define("_CAL_SUNDAY","Sunday");
-define("_CAL_MONDAY","Monday");
-define("_CAL_TUESDAY","Tuesday");
-define("_CAL_WEDNESDAY","Wednesday");
-define("_CAL_THURSDAY","Thursday");
-define("_CAL_FRIDAY","Friday");
-define("_CAL_SATURDAY","Saturday");
-define("_CAL_JANUARY","January");
-define("_CAL_FEBRUARY","February");
-define("_CAL_MARCH","March");
-define("_CAL_APRIL","April");
-define("_CAL_MAY","May");
-define("_CAL_JUNE","June");
-define("_CAL_JULY","July");
-define("_CAL_AUGUST","August");
-define("_CAL_SEPTEMBER","September");
-define("_CAL_OCTOBER","October");
-define("_CAL_NOVEMBER","November");
-define("_CAL_DECEMBER","December");
-define("_CAL_TGL1STD","Toggle first day of week");
-define("_CAL_PREVYR","Prev. year (hold for menu)");
-define("_CAL_PREVMNTH","Prev. month (hold for menu)");
-define("_CAL_GOTODAY","Go Today");
-define("_CAL_NXTMNTH","Next month (hold for menu)");
-define("_CAL_NEXTYR","Next year (hold for menu)");
-define("_CAL_SELDATE","Select date");
-define("_CAL_DRAGMOVE","Drag to move");
-define("_CAL_TODAY","Today");
-define("_CAL_DISPM1ST","Display Monday first");
-define("_CAL_DISPS1ST","Display Sunday first");
-
+define("_CAL_SHORT_JANUARY", "January");
+define("_CAL_SHORT_FEBRUARY", "February");
+define("_CAL_SHORT_MARCH", "March");
+define("_CAL_SHORT_APRIL", "April");
+define("_CAL_SHORT_MAY", "May");
+define("_CAL_SHORT_JUNE", "June");
+define("_CAL_SHORT_JULY", "July");
+define("_CAL_SHORT_AUGUST", "August");
+define("_CAL_SHORT_SEPTEMBER", "September");
+define("_CAL_SHORT_OCTOBER", "October");
+define("_CAL_SHORT_NOVEMBER", "November");
+define("_CAL_SHORT_DECEMBER", "December");
+// Normal Text
+define("_CAL_SUNDAY", "Sunday");
+define("_CAL_MONDAY", "Monday");
+define("_CAL_TUESDAY", "Tuesday");
+define("_CAL_WEDNESDAY", "Wednesday");
+define("_CAL_THURSDAY", "Thursday");
+define("_CAL_FRIDAY", "Friday");
+define("_CAL_SATURDAY", "Saturday");
+define("_CAL_JANUARY", "January");
+define("_CAL_FEBRUARY", "February");
+define("_CAL_MARCH", "March");
+define("_CAL_APRIL", "April");
+define("_CAL_MAY", "May");
+define("_CAL_JUNE", "June");
+define("_CAL_JULY", "July");
+define("_CAL_AUGUST", "August");
+define("_CAL_SEPTEMBER", "September");
+define("_CAL_OCTOBER", "October");
+define("_CAL_NOVEMBER", "November");
+define("_CAL_DECEMBER", "December");
+// Others
+define("_CAL_TGL1STD", "Toggle first day of week");
+define("_CAL_PREVYR", "Prev. year (hold for menu)");
+define("_CAL_PREVMNTH", "Prev. month (hold for menu)");
+define("_CAL_GOTODAY", "Go Today");
+define("_CAL_NXTMNTH", "Next month (hold for menu)");
+define("_CAL_NEXTYR", "Next year (hold for menu)");
+define("_CAL_SELDATE", "Select date");
+define("_CAL_DRAGMOVE", "Drag to move");
+define("_CAL_TODAY", "Today");
+define("_CAL_DISPM1ST", "Display Monday first");
+define("_CAL_DISPS1ST", "Display Sunday first");
?>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/protector/preloads/core.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/protector/preloads/core.php 2012-11-21 04:40:56 UTC (rev 10263)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/protector/preloads/core.php 2012-11-21 04:52:11 UTC (rev 10264)
@@ -28,7 +28,7 @@
*/
class ProtectorCorePreload extends XoopsPreloadItem
{
- function eventCoreIncludeCommonStart($args)
+ static function eventCoreIncludeCommonStart($args)
{
include XOOPS_TRUST_PATH . '/modules/protector/include/precheck.inc.php';
}
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/modulesadmin/main.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/modulesadmin/main.php 2012-11-21 04:40:56 UTC (rev 10263)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/modulesadmin/main.php 2012-11-21 04:52:11 UTC (rev 10264)
@@ -806,6 +806,7 @@
$confobj->setVar('conf_title', $config['title'], true);
$confobj->setVar('conf_desc', $config['description'], true);
$confobj->setVar('conf_formtype', $config['formtype']);
+ if (isset( $config['valuetype']))
$confobj->setVar('conf_valuetype', $config['valuetype']);
if (isset($config_old[$config['name']]['value']) && $config_old[$config['name']]['formtype'] == $config['formtype'] && $config_old[$config['name']]['valuetype'] == $config['valuetype']) {
// preserver the old value if any
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/xoops_lib/modules/protector/class/protector.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/xoops_lib/modules/protector/class/protector.php 2012-11-21 04:40:56 UTC (rev 10263)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/xoops_lib/modules/protector/class/protector.php 2012-11-21 04:52:11 UTC (rev 10264)
@@ -113,7 +113,7 @@
}
-function &getInstance()
+static function &getInstance()
{
static $instance ;
if( ! isset( $instance ) ) {
|
|
From: <be...@us...> - 2012-11-21 04:41:02
|
Revision: 10263
http://sourceforge.net/p/xoops/svn/10263
Author: beckmi
Date: 2012-11-21 04:40:56 +0000 (Wed, 21 Nov 2012)
Log Message:
-----------
Updating TinyMCE to 3.5.8
Updating Smarty to 2.6.27
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt
XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/Config_File.class.php
XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/Smarty.class.php
XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/Smarty_Compiler.class.php
XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/debug.tpl
XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/plugins/function.cycle.php
XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/plugins/function.fetch.php
XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/plugins/function.math.php
XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopseditor/tinymce/tinymce/changelog.txt
XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js
XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin.js
XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/media/js/media.js
XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js
XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin.js
XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/table/js/row.js
XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/table/row.htm
XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/editor_template.js
XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/tiny_mce.js
Removed Paths:
-------------
XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/autosave/langs/
Modified: XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2012-11-21 02:25:02 UTC (rev 10262)
+++ XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2012-11-21 04:40:56 UTC (rev 10263)
@@ -4,9 +4,11 @@
2012/08/06: Version 2.5.6 Alpha
===============================
Bugfixes:
+ - fixed errors related to static functions, so it works on PHP 5.4 (Mamba)
Updated:
- - TinyMCE to 3.5.6 (mamba)
+ - TinyMCE to 3.5.8 (mamba)
+ - Smarty to 2.6.27 (mamba)
===============================
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/Config_File.class.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/Config_File.class.php 2012-11-21 02:25:02 UTC (rev 10262)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/Config_File.class.php 2012-11-21 04:40:56 UTC (rev 10263)
@@ -19,10 +19,10 @@
*
* For questions, help, comments, discussion, etc., please join the
* Smarty mailing list. Send a blank e-mail to
- * sma...@go...
+ * sma...@go...
*
* @link http://www.smarty.net/
- * @version 2.6.26
+ * @version 2.6.25-dev
* @copyright Copyright: 2001-2005 New Digital Group, Inc.
* @author Andrei Zmievski <an...@ph...>
* @access public
@@ -301,7 +301,7 @@
$vars = array();
continue;
}
- } else {
+ } else {
$section_name = $match[1];
}
if (!isset($config_data['sections'][$section_name]))
@@ -390,4 +390,4 @@
/**#@-*/
}
-?>
\ No newline at end of file
+?>
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/Smarty.class.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/Smarty.class.php 2012-11-21 02:25:02 UTC (rev 10262)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/Smarty.class.php 2012-11-21 04:40:56 UTC (rev 10263)
@@ -27,7 +27,7 @@
* @author Monte Ohrt <monte at ohrt dot com>
* @author Andrei Zmievski <an...@ph...>
* @package Smarty
- * @version 2.6.26
+ * @version 2.6.27
*/
/* $Id$ */
@@ -465,7 +465,7 @@
*
* @var string
*/
- var $_version = '2.6.26';
+ var $_version = '2.6.27';
/**
* current template inclusion depth
@@ -1090,7 +1090,8 @@
*/
function trigger_error($error_msg, $error_type = E_USER_WARNING)
{
- trigger_error("Smarty error: $error_msg", $error_type);
+ $msg = htmlentities($error_msg);
+ trigger_error("Smarty error: $msg", $error_type);
}
@@ -1958,4 +1959,4 @@
/* vim: set expandtab: */
-?>
\ No newline at end of file
+?>
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/Smarty_Compiler.class.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/Smarty_Compiler.class.php 2012-11-21 02:25:02 UTC (rev 10262)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/Smarty_Compiler.class.php 2012-11-21 04:40:56 UTC (rev 10263)
@@ -21,7 +21,7 @@
* @link http://smarty.php.net/
* @author Monte Ohrt <monte at ohrt dot com>
* @author Andrei Zmievski <an...@ph...>
- * @version 2.6.26
+ * @version 2.6.25-dev
* @copyright 2001-2005 New Digital Group, Inc.
* @package Smarty
*/
@@ -162,7 +162,7 @@
. '(?:\s*,\s*' . $this->_obj_single_param_regexp . ')*)?\)';
$this->_obj_start_regexp = '(?:' . $this->_dvar_regexp . '(?:' . $this->_obj_ext_regexp . ')+)';
$this->_obj_call_regexp = '(?:' . $this->_obj_start_regexp . '(?:' . $this->_obj_params_regexp . ')?(?:' . $this->_dvar_math_regexp . '(?:' . $this->_num_const_regexp . '|' . $this->_dvar_math_var_regexp . ')*)?)';
-
+
// matches valid modifier syntax:
// |foo
// |@foo
@@ -304,7 +304,7 @@
}
}
}
-
+
/* Compile the template tags into PHP code. */
$compiled_tags = array();
for ($i = 0, $for_max = count($template_tags); $i < $for_max; $i++) {
@@ -333,7 +333,7 @@
for ($j = $i + 1; $j < $for_max; $j++) {
/* remove leading and trailing whitespaces of each line */
$text_blocks[$j] = preg_replace('![\t ]*[\r\n]+[\t ]*!', '', $text_blocks[$j]);
- if ($compiled_tags[$j] == '{/strip}') {
+ if ($compiled_tags[$j] == '{/strip}') {
/* remove trailing whitespaces from the last text_block */
$text_blocks[$j] = rtrim($text_blocks[$j]);
}
@@ -349,9 +349,9 @@
}
}
$compiled_content = '';
-
+
$tag_guard = '%%%SMARTYOTG' . md5(uniqid(rand(), true)) . '%%%';
-
+
/* Interleave the compiled contents and text blocks to get the final result. */
for ($i = 0, $for_max = count($compiled_tags); $i < $for_max; $i++) {
if ($compiled_tags[$i] == '') {
@@ -361,7 +361,7 @@
// replace legit PHP tags with placeholder
$text_blocks[$i] = str_replace('<?', $tag_guard, $text_blocks[$i]);
$compiled_tags[$i] = str_replace('<?', $tag_guard, $compiled_tags[$i]);
-
+
$compiled_content .= $text_blocks[$i] . $compiled_tags[$i];
}
$compiled_content .= str_replace('<?', $tag_guard, $text_blocks[$i]);
@@ -371,8 +371,8 @@
$compiled_content = preg_replace("~(?<!')language\s*=\s*[\"\']?\s*php\s*[\"\']?~", "<?php echo 'language=php' ?>\n", $compiled_content);
// recover legit tags
- $compiled_content = str_replace($tag_guard, '<?', $compiled_content);
-
+ $compiled_content = str_replace($tag_guard, '<?', $compiled_content);
+
// remove \n from the end of the file, if any
if (strlen($compiled_content) && (substr($compiled_content, -1) == "\n") ) {
$compiled_content = substr($compiled_content, 0, -1);
@@ -437,7 +437,7 @@
/* Matched comment. */
if (substr($template_tag, 0, 1) == '*' && substr($template_tag, -1) == '*')
return '';
-
+
/* Split tag into two three parts: command, command modifiers and the arguments. */
if(! preg_match('~^(?:(' . $this->_num_const_regexp . '|' . $this->_obj_call_regexp . '|' . $this->_var_regexp
. '|\/?' . $this->_reg_obj_regexp . '|\/?' . $this->_func_regexp . ')(' . $this->_mod_regexp . '*))
@@ -445,7 +445,7 @@
~xs', $template_tag, $match)) {
$this->_syntax_error("unrecognized tag: $template_tag", E_USER_ERROR, __FILE__, __LINE__);
}
-
+
$tag_command = $match[1];
$tag_modifier = isset($match[2]) ? $match[2] : null;
$tag_args = isset($match[3]) ? $match[3] : null;
@@ -585,7 +585,7 @@
} else if ($this->_compile_block_tag($tag_command, $tag_args, $tag_modifier, $output)) {
return $output;
} else if ($this->_compile_custom_tag($tag_command, $tag_args, $tag_modifier, $output)) {
- return $output;
+ return $output;
} else {
$this->_syntax_error("unrecognized tag '$tag_command'", E_USER_ERROR, __FILE__, __LINE__);
}
@@ -936,7 +936,7 @@
if (empty($name)) {
return $this->_syntax_error("missing insert name", E_USER_ERROR, __FILE__, __LINE__);
}
-
+
if (!preg_match('~^\w+$~', $name)) {
return $this->_syntax_error("'insert: 'name' must be an insert function name", E_USER_ERROR, __FILE__, __LINE__);
}
@@ -1225,7 +1225,7 @@
$buffer = isset($attrs['name']) ? $attrs['name'] : "'default'";
$assign = isset($attrs['assign']) ? $attrs['assign'] : null;
$append = isset($attrs['append']) ? $attrs['append'] : null;
-
+
$output = "<?php ob_start(); ?>";
$this->_capture_stack[] = array($buffer, $assign, $append);
} else {
@@ -1266,11 +1266,11 @@
if(empty($tokens)) {
$_error_msg = $elseif ? "'elseif'" : "'if'";
- $_error_msg .= ' statement requires arguments';
+ $_error_msg .= ' statement requires arguments';
$this->_syntax_error($_error_msg, E_USER_ERROR, __FILE__, __LINE__);
}
-
-
+
+
// make sure we have balanced parenthesis
$token_count = array_count_values($tokens);
if(isset($token_count['(']) && $token_count['('] != $token_count[')']) {
@@ -1368,8 +1368,8 @@
if ($is_arg_start != 0) {
if (preg_match('~^' . $this->_func_regexp . '$~', $tokens[$is_arg_start-1])) {
$is_arg_start--;
- }
- }
+ }
+ }
} else
$is_arg_start = $i-1;
/* Construct the argument for 'is' expression, so it knows
@@ -1400,7 +1400,7 @@
}
} elseif(preg_match('~^' . $this->_var_regexp . '$~', $token) && (strpos('+-*/^%&|', substr($token, -1)) === false) && isset($tokens[$i+1]) && $tokens[$i+1] == '(') {
// variable function call
- $this->_syntax_error("variable function call '$token' not allowed in if statement", E_USER_ERROR, __FILE__, __LINE__);
+ $this->_syntax_error("variable function call '$token' not allowed in if statement", E_USER_ERROR, __FILE__, __LINE__);
} elseif(preg_match('~^' . $this->_obj_call_regexp . '|' . $this->_var_regexp . '(?:' . $this->_mod_regexp . '*)$~', $token)) {
// object or variable
$token = $this->_parse_var_props($token);
@@ -1753,12 +1753,12 @@
$_var_ref = $var_expr;
else
$_var_ref = substr($var_expr, 1);
-
+
if(!$_has_math) {
-
+
// get [foo] and .foo and ->foo and (...) pieces
preg_match_all('~(?:^\w+)|' . $this->_obj_params_regexp . '|(?:' . $this->_var_bracket_regexp . ')|->\$?\w+|\.\$?\w+|\S+~', $_var_ref, $match);
-
+
$_indexes = $match[0];
$_var_name = array_shift($_indexes);
@@ -2018,7 +2018,7 @@
array_shift($indexes);
$compiled_ref = "(\$this->_foreach[$_var]['iteration']-1)";
break;
-
+
case 'first':
array_shift($indexes);
$compiled_ref = "(\$this->_foreach[$_var]['iteration'] <= 1)";
@@ -2028,12 +2028,12 @@
array_shift($indexes);
$compiled_ref = "(\$this->_foreach[$_var]['iteration'] == \$this->_foreach[$_var]['total'])";
break;
-
+
case 'show':
array_shift($indexes);
$compiled_ref = "(\$this->_foreach[$_var]['total'] > 0)";
break;
-
+
default:
unset($_max_index);
$compiled_ref = "\$this->_foreach[$_var]";
@@ -2159,7 +2159,7 @@
case 'rdelim':
$compiled_ref = "'$this->right_delimiter'";
break;
-
+
default:
$this->_syntax_error('$smarty.' . $_ref . ' is an unknown reference', E_USER_ERROR, __FILE__, __LINE__);
break;
@@ -2362,4 +2362,4 @@
/* vim: set et: */
-?>
\ No newline at end of file
+?>
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/debug.tpl
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/debug.tpl 2012-11-21 02:25:02 UTC (rev 10262)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/debug.tpl 2012-11-21 04:40:56 UTC (rev 10263)
@@ -1,157 +1,157 @@
-{* Smarty *}
-{* debug.tpl, last updated version 2.1.0 *}
-{assign_debug_info}
-{capture assign=debug_output}
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-<head>
- <title>Smarty Debug Console</title>
-{literal}
-<style type="text/css">
-/* <![CDATA[ */
-body, h1, h2, td, th, p {
- font-family: sans-serif;
- font-weight: normal;
- font-size: 0.9em;
- margin: 1px;
- padding: 0;
-}
-
-h1 {
- margin: 0;
- text-align: left;
- padding: 2px;
- background-color: #f0c040;
- color: black;
- font-weight: bold;
- font-size: 1.2em;
- }
-
-h2 {
- background-color: #9B410E;
- color: white;
- text-align: left;
- font-weight: bold;
- padding: 2px;
- border-top: 1px solid black;
-}
-
-body {
- background: black;
-}
-
-p, table, div {
- background: #f0ead8;
-}
-
-p {
- margin: 0;
- font-style: italic;
- text-align: center;
-}
-
-table {
- width: 100%;
-}
-
-th, td {
- font-family: monospace;
- vertical-align: top;
- text-align: left;
- width: 50%;
-}
-
-td {
- color: green;
-}
-
-.odd {
- background-color: #eeeeee;
-}
-
-.even {
- background-color: #fafafa;
-}
-
-.exectime {
- font-size: 0.8em;
- font-style: italic;
-}
-
-#table_assigned_vars th {
- color: blue;
-}
-
-#table_config_vars th {
- color: maroon;
-}
-/* ]]> */
-</style>
-{/literal}
-</head>
-<body>
-
-<h1>Smarty Debug Console</h1>
-
-<h2>included templates & config files (load time in seconds)</h2>
-
-<div>
-{section name=templates loop=$_debug_tpls}
- {section name=indent loop=$_debug_tpls[templates].depth} {/section}
- <font color={if $_debug_tpls[templates].type eq "template"}brown{elseif $_debug_tpls[templates].type eq "insert"}black{else}green{/if}>
- {$_debug_tpls[templates].filename|escape:html}</font>
- {if isset($_debug_tpls[templates].exec_time)}
- <span class="exectime">
- ({$_debug_tpls[templates].exec_time|string_format:"%.5f"})
- {if %templates.index% eq 0}(total){/if}
- </span>
- {/if}
- <br />
-{sectionelse}
- <p>no templates included</p>
-{/section}
-</div>
-
-<h2>assigned template variables</h2>
-
-<table id="table_assigned_vars">
- {section name=vars loop=$_debug_keys}
- <tr class="{cycle values="odd,even"}">
- <th>{ldelim}${$_debug_keys[vars]|escape:'html'}{rdelim}</th>
- <td>{$_debug_vals[vars]|@debug_print_var}</td></tr>
- {sectionelse}
- <tr><td><p>no template variables assigned</p></td></tr>
- {/section}
-</table>
-
-<h2>assigned config file variables (outer template scope)</h2>
-
-<table id="table_config_vars">
- {section name=config_vars loop=$_debug_config_keys}
- <tr class="{cycle values="odd,even"}">
- <th>{ldelim}#{$_debug_config_keys[config_vars]|escape:'html'}#{rdelim}</th>
- <td>{$_debug_config_vals[config_vars]|@debug_print_var}</td></tr>
- {sectionelse}
- <tr><td><p>no config vars assigned</p></td></tr>
- {/section}
-</table>
-</body>
-</html>
-{/capture}
-{if isset($_smarty_debug_output) and $_smarty_debug_output eq "html"}
- {$debug_output}
-{else}
-<script type="text/javascript">
-// <![CDATA[
- if ( self.name == '' ) {ldelim}
- var title = 'Console';
- {rdelim}
- else {ldelim}
- var title = 'Console_' + self.name;
- {rdelim}
- _smarty_console = window.open("",title.value,"width=680,height=600,resizable,scrollbars=yes");
- _smarty_console.document.write('{$debug_output|escape:'javascript'}');
- _smarty_console.document.close();
-// ]]>
-</script>
+{* Smarty *}
+{* debug.tpl, last updated version 2.1.0 *}
+{assign_debug_info}
+{capture assign=debug_output}
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+ <title>Smarty Debug Console</title>
+{literal}
+<style type="text/css">
+/* <![CDATA[ */
+body, h1, h2, td, th, p {
+ font-family: sans-serif;
+ font-weight: normal;
+ font-size: 0.9em;
+ margin: 1px;
+ padding: 0;
+}
+
+h1 {
+ margin: 0;
+ text-align: left;
+ padding: 2px;
+ background-color: #f0c040;
+ color: black;
+ font-weight: bold;
+ font-size: 1.2em;
+ }
+
+h2 {
+ background-color: #9B410E;
+ color: white;
+ text-align: left;
+ font-weight: bold;
+ padding: 2px;
+ border-top: 1px solid black;
+}
+
+body {
+ background: black;
+}
+
+p, table, div {
+ background: #f0ead8;
+}
+
+p {
+ margin: 0;
+ font-style: italic;
+ text-align: center;
+}
+
+table {
+ width: 100%;
+}
+
+th, td {
+ font-family: monospace;
+ vertical-align: top;
+ text-align: left;
+ width: 50%;
+}
+
+td {
+ color: green;
+}
+
+.odd {
+ background-color: #eeeeee;
+}
+
+.even {
+ background-color: #fafafa;
+}
+
+.exectime {
+ font-size: 0.8em;
+ font-style: italic;
+}
+
+#table_assigned_vars th {
+ color: blue;
+}
+
+#table_config_vars th {
+ color: maroon;
+}
+/* ]]> */
+</style>
+{/literal}
+</head>
+<body>
+
+<h1>Smarty Debug Console</h1>
+
+<h2>included templates & config files (load time in seconds)</h2>
+
+<div>
+{section name=templates loop=$_debug_tpls}
+ {section name=indent loop=$_debug_tpls[templates].depth} {/section}
+ <font color={if $_debug_tpls[templates].type eq "template"}brown{elseif $_debug_tpls[templates].type eq "insert"}black{else}green{/if}>
+ {$_debug_tpls[templates].filename|escape:html}</font>
+ {if isset($_debug_tpls[templates].exec_time)}
+ <span class="exectime">
+ ({$_debug_tpls[templates].exec_time|string_format:"%.5f"})
+ {if %templates.index% eq 0}(total){/if}
+ </span>
+ {/if}
+ <br />
+{sectionelse}
+ <p>no templates included</p>
+{/section}
+</div>
+
+<h2>assigned template variables</h2>
+
+<table id="table_assigned_vars">
+ {section name=vars loop=$_debug_keys}
+ <tr class="{cycle values="odd,even"}">
+ <th>{ldelim}${$_debug_keys[vars]|escape:'html'}{rdelim}</th>
+ <td>{$_debug_vals[vars]|@debug_print_var}</td></tr>
+ {sectionelse}
+ <tr><td><p>no template variables assigned</p></td></tr>
+ {/section}
+</table>
+
+<h2>assigned config file variables (outer template scope)</h2>
+
+<table id="table_config_vars">
+ {section name=config_vars loop=$_debug_config_keys}
+ <tr class="{cycle values="odd,even"}">
+ <th>{ldelim}#{$_debug_config_keys[config_vars]|escape:'html'}#{rdelim}</th>
+ <td>{$_debug_config_vals[config_vars]|@debug_print_var}</td></tr>
+ {sectionelse}
+ <tr><td><p>no config vars assigned</p></td></tr>
+ {/section}
+</table>
+</body>
+</html>
+{/capture}
+{if isset($_smarty_debug_output) and $_smarty_debug_output eq "html"}
+ {$debug_output}
+{else}
+<script type="text/javascript">
+// <![CDATA[
+ if ( self.name == '' ) {ldelim}
+ var title = 'Console';
+ {rdelim}
+ else {ldelim}
+ var title = 'Console_' + self.name;
+ {rdelim}
+ _smarty_console = window.open("",title.value,"width=680,height=600,resizable,scrollbars=yes");
+ _smarty_console.document.write('{$debug_output|escape:'javascript'}');
+ _smarty_console.document.close();
+// ]]>
+</script>
{/if}
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/plugins/function.cycle.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/plugins/function.cycle.php 2012-11-21 02:25:02 UTC (rev 10262)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/plugins/function.cycle.php 2012-11-21 04:40:56 UTC (rev 10263)
@@ -63,7 +63,11 @@
$cycle_vars[$name]['values'] = $params['values'];
}
- $cycle_vars[$name]['delimiter'] = (isset($params['delimiter'])) ? $params['delimiter'] : ',';
+ if (isset($params['delimiter'])) {
+ $cycle_vars[$name]['delimiter'] = $params['delimiter'];
+ } elseif (!isset($cycle_vars[$name]['delimiter'])) {
+ $cycle_vars[$name]['delimiter'] = ',';
+ }
if(is_array($cycle_vars[$name]['values'])) {
$cycle_array = $cycle_vars[$name]['values'];
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/plugins/function.fetch.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/plugins/function.fetch.php 2012-11-21 02:25:02 UTC (rev 10262)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/plugins/function.fetch.php 2012-11-21 04:40:56 UTC (rev 10263)
@@ -181,12 +181,12 @@
$content .= fgets($fp,4096);
}
fclose($fp);
- $csplit = split("\r\n\r\n",$content,2);
+ $csplit = preg_split("!\r\n\r\n!",$content,2);
$content = $csplit[1];
if(!empty($params['assign_headers'])) {
- $smarty->assign($params['assign_headers'],split("\r\n",$csplit[0]));
+ $smarty->assign($params['assign_headers'],preg_split("!\r\n!",$csplit[0]));
}
}
} else {
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/plugins/function.math.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/plugins/function.math.php 2012-11-21 02:25:02 UTC (rev 10262)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/plugins/function.math.php 2012-11-21 04:40:56 UTC (rev 10263)
@@ -37,7 +37,7 @@
}
// match all vars in equation, make sure all are passed
- preg_match_all("!(?:0x[a-fA-F0-9]+)|([a-zA-Z][a-zA-Z0-9_]+)!",$equation, $match);
+ preg_match_all("!(?:0x[a-fA-F0-9]+)|([a-zA-Z][a-zA-Z0-9_]*)!",$equation, $match);
$allowed_funcs = array('int','abs','ceil','cos','exp','floor','log','log10',
'max','min','pi','pow','rand','round','sin','sqrt','srand','tan');
@@ -82,4 +82,4 @@
/* vim: set expandtab: */
-?>
+?>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopseditor/tinymce/tinymce/changelog.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopseditor/tinymce/tinymce/changelog.txt 2012-11-21 02:25:02 UTC (rev 10262)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopseditor/tinymce/tinymce/changelog.txt 2012-11-21 04:40:56 UTC (rev 10263)
@@ -1,445 +1,477 @@
-Version 3.5.6 (2012-07-26)
- Added "text" as a valid option to the editor.getContent format option. Makes it easier to get a text representation of the editor contents.
- Fixed bug where resizing an image to less that 0x0 pixels would display the ghost image at an incorrect position.
- Fixed bug where the remove format button would produce extra paragraphs on WebKit if all of the contents was selected.
- Fixed issue where edge resize handles on images of wouldn't scale it with the same aspect ratio.
- Fixed so force_p_newlines option works again since some users want mixed mode paragraphs.
- Fixed so directionality plugin modifies the dir attribute of all selected blocks in the editor.
- Fixed bug where backspace/delete of a custom element would move it's attributes to the parent block on Gecko.
-Version 3.5.5 (2012-07-19)
- Added full resize support for images and tables on WebKit/Opera. It now behaves just like Gecko.
- Added automatic embed support for Vimeo, Stream.cz and Google Maps in media plugin. Patch contributed by Jakub Matas.
- Fixed bug where the lists plugin wouldn't properly remove all li elements when toggling selected items of. Patched by Taku AMANO.
- Fixed bug where the lists plugin would remove the entire list if you pressed deleted at the beginning of the first element. Patched by Taku AMANO.
- Fixed bug where the ordered/unordered list buttons could both be enabled if you nested lists. Patch contributed by Craig Petchell.
- Fixed bug where shift+enter wouldn't produce a BR in a LI when having forced_root_blocks set to false.
- Fixed bug where scrollbars aren't visible in fullscreen when window is resized.
- Fixed bug with updating the border size using the advimage dialog on IE 9.
- Fixed bug where the selection of inner elements on IE 8 in contentEditable mode would select the whole parent element.
- Fixed bug where the enter key would produce an empty anchor if you pressed it at the space after a link on IE.
- Fixed bug where autolink plugin would produce an exception for specific html see bug #5365
- Fixed so the formatChanged function takes an optional "similar" parameter to use while matching the format.
-Version 3.5.4.1 (2012-06-24)
- Fixed issue with Shift+A selecting all contents on Chrome.
-Version 3.5.4 (2012-06-21)
- Added missing mouse events to HTML5 schema. Some events needs to be manually defined though since the spec is huge.
- Added image resizing for WebKit browsers by faking the whole resize behavior.
- Fixed bug in context menu plugin where listener to hide menu wasn't removed correctly.
- Fixed bug where media plugin wouldn't use placeholder size for the object/video elements.
- Fixed bug where jQuery plugin would break attr function in jQuery 1.7.2.
- Fixed bug where jQuery plugin would throw an error if you used the tinymce pseudo selector when TinyMCE wasn't loaded.
- Fixed so encoding option gets applied when using jQuery val() or attr() to extract the contents.
- Fixed so any non valid width/height passed to media plugin would get parsed to proper integer or percent values.
-Version 3.5.3 (2012-06-19)
- Added missing wbr element to HTML5 schema.
- Added new mceToggleFormat command. Enabled you to toggle a specific format on/off.
- Fixed bug where undo/redo state didn't update correctly after executing an execCommand call.
- Fixed bug where the editor would get auto focused on IE running in quirks mode.
- Fixed bug where pressing enter before an IMG or INPUT element wouldn't properly split the block.
- Fixed bug where backspace would navigate back when selecting control types on IE.
- Fixed bug where the editor remove method would unbind events for controls outside the editor instance UI.
- Fixed bug where the autosave plugin would try to store a draft copy of editors that where removed.
- Fixed bug where floated elements wouldn't expand the block created when pressing enter on non IE browsers.
- Fixed bug where the caret would be placed in the wrong location when pressing enter at the beginning of a block.
- Fixed bug where it wasn't possible to block events using the handle_event_callback option.
- Fixed bug where keyboard navigation of the ColorSplitButton.js didn't work correctly.
- Fixed bug where keyboard navigation didn't work correctly on split buttons.
- Fixed bug where the legacy Event.add function didn't properly handle multiple id:s passed in.
- Fixed bug where the caret would disappear on IE when selecting all contents and pressing backspace/delete.
- Fixed bug where the getStart/getEnd methods would sometimes return elements from the wrong document on IE.
- Fixed so paragraphs gets created if you press enter inside a form element.
-Version 3.5.2 (2012-05-31)
- Added new formatChanged method to tinymce.Formatter class. Enables easier state change handling of formats.
- Added new selectorChanged method to tinymce.dom.Selection class. Enables easier state change handling of matching CSS selectors.
- Changed the default theme to be advanced instead of simple since most users uses the advanced theme.
- Changed so the theme_advanced_buttons doesn't have a default set if one button row is specified.
- Changed the theme_advanced_toolbar_align default value to "left".
- Changed the theme_advanced_toolbar_location default value to "top".
- Changed the theme_advanced_statusbar_location default value to "bottom".
- Fixed bug where the simple link dialog would remove class and target attributes from links when updating them if the drop downs wasn't visible.
- Fixed bug where the link/unlink buttons wouldn't get disabled once a link was created by the autolink plugin logic.
- Fixed bug where the border attribute was missing in the HTML5 schema.
- Fixed bug where the legacyoutput plugin would use inline styles for font color.
- Fixed bug where editing of anchor names wouldn't produce an undo level.
- Fixed bug where the table plugin would delete the last empty block element in the editor.
- Fixed bug where pasting table rows when they where selected would make it impossible to editor that table row.
- Fixed bug with pressing enter in IE while having a select list focused would produce a JS error.
- Fixed bug where it wasn't possible to merge table cells by selecting them and using merge from context menu.
- Removed summary from HTML5 table attributes and fixed so this and other deprecated table fields gets hidden in the table dialog.
-Version 3.5.1.1 (2012-05-25)
- Fixed bug with control creation where plugin specific controls didn't work as expected.
-Version 3.5.1 (2012-05-25)
- Added new onBeforeAdd event to UndoManager patch contributed by Dan Rumney.
- Added support for overriding the theme rendering logic by using a custom function.
- Fixed bug where links wasn't automatically created by the autolink plugin on old IE versions when pressing enter in BR mode.
- Fixed bug where enter on older IE versions wouldn't produce a new paragraph if the previous sibling paragraph was empty.
- Fixed bug where toString on a faked DOM range on older IE versions wouldn't return a proper string.
- Fixed bug where named anchors wouldn't work properly when schema was set to HTML5.
- Fixed bug where HTML5 datalist options wasn't correctly parsed or indented.
- Fixed bug where linking would add anchors around block elements when the HTML5 schema was used.
- Fixed issue where the autolink plugin wouldn't properly handle mailto:us...@do....
- Optimized initialization and reduced rendering flicker by hiding the target element while initializing.
-Version 3.5.0.1 (2012-05-10)
- Fixed bug where selection normalization logic would break the selections of parent elements using the element path.
- Fixed bug where the autolink plugin would include trailing dots in domain names in the link creation.
- Fixed bug where the autolink plugin would produce an error on older IE versions when pressing enter.
- Fixed bug where old IE versions would throw an error during initialization when the editor was placed in an size restricted div.
-Version 3.5 (2012-05-03)
- Fixed menu rendering issue if the document was in rtl mode.
- Fixed bug where the hide function would throw an error about a missing variable.
- Fixed bug where autolink wouldn't convert URLs when hitting enter on IE due to the new enter key logic.
- Fixed bug where formatting using shortcuts like ctrl+b wouldn't work properly the first time.
- Fixed bug where selection.setContent after a formatter call wouldn't generate formatted contents.
- Fixed bug where whitespace would be removed before/after invalid_elements when they where removed.
- Fixed bug where updating styles using the theme image dialog in non inline mode on IE9 would produce errors.
- Fixed bug where IE 8 would produce an error when using the contextmenu plugin.
- Fixed bug where delete/backspace could remove contents of noneditable elements.
- Fixed so background color in style preview gets computed from body element if the current style element is transparent.
-Version 3.5b3 (2012-03-29)
- Added cancel button to colour picker dialog.
- Added figure and figcaption to the html5 visualblocks plugin.
- Added default alignment options for the figure element.
- Fixed bug where empty inline elements within block elements would sometimes produce a br child element.
- Fixed bug where urls pointing to the same domain as the current one would cause undefined errors. Patch contributed by Paul Giberson.
- Fixed bug where enter inside an editable element inside an non editable element would split the element.
- Fixed bug where cut/copy/paste of noneditable elements didn't work.
- Fixed bug where backspace would sometimes produce font elements on WebKit.
- Fixed bug where WebKit would produce spans out of various inline elements when using backspace.
- Fixed bug where IE9 wouldn't properly update image styles when images where resized.
- Fixed bug where drag/drop of noneditable elements didn't work correctly.
- Fixed bug where applying formatting to all contents wouldn't work correctly when an end point was inside an empty bock. Patch contributed by Jose Luiz.
- Fixed bug where IE10 removed the scopeName from the DOM element interface and there for it produced an undefined string in element path.
- Fixed bug where the caret would be placed at an incorrect location if you applied block formatting while having the caret at the end of the block.
- Fixed bug where applying column changes using the cell dialog would only update the first column. Patch contributed by krzyko.
- Fixed bug where the visualblocks plugin would force editor focus if it was turned on by default.
- Fixed bug where the tabfocus plugin would tab to iframes these are now ignored.
- Fixed bug where format drop down list wouldn't show the currently active format for a parent element.
- Fixed bug where paste of plain text in IE 9 would remove the new line characters from text.
- Fixed bug where the menu buttons/split button menus wouldn't be opened at the right location on older IE versions.
- Fixed bug where Gecko browsers wouldn't properly display the right format when having the selection as specific places.
- Fixed bug where shift+enter inside the body when having forced_root_blocks set to false would throw an error.
- Fixed bug where the jQuery plugin would break the attr method of jQuery 1.7.2. Patch contributed by Markus Kemmerling.
- Fixed so options like content_css accepts and array as well as a comma separated string as input.
- Restructured the internal logic to make it more separate from Editor.js.
- Updated the Sizzle engine to the latest version.
-Version 3.5b2 (2012-03-15)
- Rewrote the enter key logic to normalize browser behavior.
- Fixed so enter within PRE elements produces a BR and shift+enter breaks/end the PRE. Can be disabled using the br_in_pre option.
- Fixed bug where the selection wouldn't be correct after applying formatting and having the caret at the end of the new format node.
- Fixed bug where the noneditable plugin would process contents on raw input calls for example on undo/redo calls.
- Fixed bug where WebKit could produce an exception when a bookmark was requested when there wasn't a proper selection.
- Fixed bug where WebKit would fail to open the image dialog since it would be returning false for a class name instead of a string.
- Fixed so alignment and indentation works properly when forced_root_blocks is set to false. It will produce a DIV by default.
-Version 3.5b1 (2012-03-08)
- Added new event class that is faster and enables support for faking events.
- Added new self_closing_elements, short_ended_elements, boolean_attributes, non_empty_elements and block_elements options to control the HTML Schema.
- Added new schema option and support for the HTML5 schema.
- Added new visualblocks plugin that shows html5 blocks with visual borders.
- Added new types and selector options to make it easier to create editor instances with different configs.
- Added new preview of formatting options in various listboxes.
- Added new preview_styles option that enables control over what gets previewed.
- Fixed bug where content css would be loaded twice into iframe.
- Fixed bug where start elements with only whitespace in the attribute part wouldn't be correctly parsed.
- Fixed bug where the advlink dialog would produce an error about the addSelectAccessibility function not being defined.
- Fixed bug where the caret would be placed at an incorrect position if span was removed by the invalid_elements setting.
- Fixed bug where elements inside a white space preserve element like pre didn't inherit the behavior while parsing.
-Version 3.4.9 (2012-02-23)
- Added settings to wordcount plugin to configure update rate and checking wordcount on backspace and delete using wordcount_update_rate and wordcount_update_on_delete.
- Fixed bug in Webkit and IE where deleting empty paragraphs would remove entire editor contents.
- Fixed bug where pressing enter on end of list item with a heading would create a new item with heading.
- Fixed edit css style dialog text-decoration none checkbox so it disables other text-decoration options when enabled.
- Fixed bug in Gecko where undo wasn't added when focus was lost.
- Fixed bug in Gecko where shift-enter in table cell ending with BR doesn't move caret to new line.
- Fixed bug where right-click on formatted text in IE selected the entire line.
- Fixed bug where text ending with space could not be unformatted in IE.
- Fixed bug where caret formatting would be removed when moving the caret when a selector expression was used.
- Fixed bug where formatting would be applied to the body element when all contents where selected and format had both inline and selector parts.
- Fixed bug where the media plugin would throw errors if you had iframe set as an invalid element in config.
- Fixed bug where the caret would be placed at the top of the document if you inserted a table and undo:ed that operation. Patch contributed by Wesley Walser.
- Fixed bug where content css files where loaded twice into the iframe.
- Fixed so elements with comments would be trated as non empty elements. Patch contributed by Arjan Scherpenisse.
-Version 3.4.8 (2012-02-02)
- Fixed bug in IE where selected text ending with space cannot be formatted then formatted again to get original text.
- Fixed bug in IE where images larger than editor area were being deselected when toolbar buttons are clicked.
- Fixed bug where wrong text align buttons are active when multiple block elements are selected.
- Fixed bug where selected link not showing in target field of link dialog in some selection cases.
- Use settings for remove_trailing_br so this can be turned off instead of hard coding the value.
- Fixed bug in IE where the media plugin displayed null text when some values aren't filled in.
- Added API method 'onSetAttrib' that fires when the attribute value on a node changes.
- Fix font size dropdown value not being updated when text already has a font size in the advanced template.
- Fixed bug in IE where IE doesn't use ARIA attributes properly on options - causing labels to be read out 2 times.
- Fixed bug where caret cannot be placed after table if table is at end of document in IE.
- Fixed bug where adding range isn't always successful so we need to check range count otherwise an exception can occur.
- Added spacebar onclick handler to toolbar buttons to ensure that the accessibility behaviour works correctly.
- Fixed bug where a stranded bullet point would get created in WebKit.
- Fixed bug where selecting text in a blockquote and pressing backspace toggles the style.
- Fixed bug where pressing enter from a heading in IE, the resulting P tag below it shares the style property.
- Fix white space in between spans from being deleted.
- Fixed bug where scrollbars where visible in the character map dialog on Gecko.
- Fixed issue with missing translation for one of the emoticons.
- Fixed bug where dots in id:s where causing problems. Patch provided by Abhishek Dev.
- Fixed bug where urls with an at sign in the path wouldn't be parsed correctly. Patch contributed by Jason Grout.
- Fixed bug where Opera would remove the first character of a inline formatted word if you pressed backspace.
- Fixed bugs with the autoresize plugin on various browsers and removed the need for the throbber.
- Fixed performance issue where the contextmenu plugin would try to remove the menu even if it was removed. Patch contributed by mhu.
-Version 3.4.7 (2011-11-03)
- Modified the caret formatting behavior to word similar to common desktop wordprocessors like Word or Libre Office.
- Fixed bug in Webkit - Cursor positioning does not work vertically within a table cell with multiple lines of text.
- Fixed bug in IE where Inserting a table in IE8 places cursor in the second cell of the first row.
- Fixed bug in IE where editor in a frame doesn't give focus to the toolbar using ALT-F10.
- Fix for webkit and gecko so that deleting bullet from start of list outdents inner list items and moves first item into paragraph.
- Fix new list items in IE8 not displayed on a new line when list contains nested list items.
- Clear formatting in table cell breaks the cell.
- Made media type list localisable.
- Fix out of memory error when using prototype in media dialog.
- Fixed bug where could not add a space in the middle of a th cell.
- Fixed bug where adding a bullet between two existing bullets adds an extra one
- Fixed bug where trying to insert a new entry midway through a bulleted list fails dismally when the next entry is tabbed in.
- Fixed bug where pressing enter on an empty list item does not outdent properly in FF
- Fixed bug where adding a heading after a list item in a table cell changes all styles in that cell
- Fixed bug where hitting enter to exit from a bullet list moves cursor to the top of the page in Firefox.
- Fixed bug where pressing backspace would not delete HRs in Firefox and IE when next to an empty paragraph.
- Fixed bug where deleting part of the link text can cause a link with no destination to be saved.
- Fixed bug where css style border widths wasn't handled correctly in table dialog.
- Fixed bug where parsing invalid html contents on IE or WebKit could produce an infinite loop.
- Fixed bug where scripts with custom script types wasn't properly passed though the editor.
- Fixed issue where some Japanese kanji characters wasn't properly entity encoded when numeric entity mode was enabled.
- Made emoticons dialog use the keyboard naviation.
- Added navigation instructions to the symbols dialog.
- Added ability to set default values for the media plugin.
- Added new font_size_legacy_values option for converting old font element sizes to span with font-size properties.
- Fixed bug where the symbols dialog was not accessible.
- Added quirk for IE ensuring that the body of the document containing tinyMCE has a role="application" for accessibility.
- Fixed bug where the advanced color picker wasn't working properly on FF 7.
- Fixed issue where the advanced color picker was producing uppercase hex codes.
- Fixed bug where IE 8 could throw exceptions if the contents contained resizable content elements.
- Fixed bug where caret formatting wouldn't be correctly applied to previous sibling on WebKit.
- Fixed bug where the select boxes for font size/family would loose it's value on WebKit due to recent iOS fixes.
-Version 3.4.6 (2011-09-29)
- Fixed bug where list items were being created for empty divs.
- Added support in Media plugin for audio media using the embed tag
- Fixed accessibility bugs in WebKit and IE8 where toolbar items were not being read.
- Added new use_accessible_selects option to ensure accessible list boxes are used in all browsers (custom widget in firefox native on other browsers)
- Fixed bug where classid attribute was not being checked from embed objects.
- Fixed bug in jsrobot tests with intermittently failing.
- Fixed bug where anchors wasn't updated properly if you edited them using IE 8.
- Fixed bug where input method on WebKit on Mac OS X would fail to initialize when sometimes focusing the editor.
- Fixed bug where it wasn't possible to select HR elements on WebKit by simply clicking on them.
- Fixed bug where the media plugin wouldn't work on IE9 when not using the inlinepopups plugin.
- Fixed bug where hspace,vspace,align and bgcolor would be removed from object elements in the media plugin.
- Fixed bug where the new youtube format wouldn't be properly parsed by the media plugin.
- Fixed bug where the style attribute of layers wasn't properly updated on IE and Gecko.
- Fixed bug where editing contents in a layer would fail on Gecko since contentEditable doesn't inherit properly.
- Fixed bug where IE 6/7 would produce JS errors when serializing contents containing layers.
-Version 3.4.5 (2011-09-06)
- Fixed accessibility bug in WebKit where the right and left arrow keys would update native list boxes.
- Added new whitespace_elements option to enable users to specify specific elements where the whitespace is preserved.
- Added new merge_siblings option to formats. This option makes it possible to disable the auto merging of siblings when applying formats.
- Fixed bug in IE where trailing comma in paste plugin would cause plugin to not run correctly.
- Fixed bug in WebKit where console messages would be logged when deleting an empty document.
- Fixed bug in IE8 where caret positioned is on list item instead of paragraph when outdent splits the list
- Fixed bug with image dialogs not inserting an image if id was omitted from valid_elements.
- Fixed bug where the selection normalization logic wouldn't properly handle image elements in specific config cases.
- Fixed bug where the map elements coords attribute would be messed up by IE when serializing the DOM.
- Fixed bug where IE wouldn't properly handle custom elements when the contents was serialized.
- Fixed bug where you couldn't move the caret in Gecko if you focused the editor using the API or a UI control.
- Fixed bug where adjacent links would get merged on IE due to bugs in their link command.
- Fixed bug where the color split buttons would loose the selection on IE if the editor was placed in a frame/iframe.
- Fixed bug where floated images in WebKit wouldn't get properly linked.
- Fixed bug where the fullscreen mode in a separate window wasn't forced into IE9+ standards mode.
- Fixed bug where pressing enter in an empty editor on WebKit could produce DIV elements instead of P.
- Fixed bug where spans would get removed incorrectly when merging two blocks on backspace/delete on WebKit.
- Fixed bug where the editor contents wouldn't be completely removed on backspace/delete on WebKit.
- Fixed bug where the fullpage plugin wouldn't properly render style elements in the head on IE 6/7.
- Fixed bug where the nonbreaking_force_tab option in the nonbreaking plugin wouldn't work on Gecko/WebKit.
- Fixed bug where the isDirty state would become true on non IE browsers if there was an table at the end of the contents.
- Fixed bug where entities wasn't properly encoded on WebKit when pasting text as plain text.
- Fixed bug where empty editors would produce an exception of valid_elements didn't include body and forced_root_blocks where disabled.
- Fixed bug where the fullscreen mode wouldn't retain the header/footer in the fullpage plugin.
- Fixed issue where the plaintext_mode and plaintext_mode_sticky language keys where swapped.
-Version 3.4.4 (2011-08-04)
- Added new html5 audio support. Patch contributed by Ronald M. Clifford.
- Added mute option for video elements and preload options for video/audio patch contributed by Dmitry Kalinkin.
- Fixed selection to match visual selection before applying formatting changes.
- Fixed browser specific bugs in lists for WebKit and IE.
- Fixed bug where IE would scroll the window if you closed an inline dialog that was larger than the viewport. Patch by Laurence Keijmel.
- Fixed bug where pasting contents near a span element could remove parts of that span. Patch contributed by Wesley Walser.
- Fixed bug where formatting change would be lost after pressing enter.
- Fixed bug in WebKit where deleting across blocks would add extra styles.
- Fixed bug where moving cursor vertically in tables in WebKit wasn't working.
- Fixed bug in IE where deleting would cause error in console.
- Fixed bug where the formatter was not applying formats across list elements.
- Fixed bug where the wordcount plugin would try and update the wordcount if tinymce had been destroyed.
- Fixed bug where tabfocus plugin would attempt to focus elements not displayed when their parent element was hidden.
- Fixed bug where the contentEditable state would sometimes be removed if you deleted contents in Gecko.
- Fixed bug where inserting contents using mceInsertContent would fail if "span" was disabled in valid_elements.
- Fixed bug where initialization might fail if some resource on gecko wouldn't load properly and fire the onload event.
- Fixed bug where ctrl+7/8/9 keys wouldn't properly add the specific formats associated with them.
- Fixed bug where the HTML tags wasn't properly closed in the style plugins properties dialog.
- Fixed bug where the list plugin would produce an exception if the user tried to delete an element at the very first location.
-Version 3.4.3.2 (2011-06-30)
- Fixed bug where deleting all of a paragraph inside a table cell would behave badly in webkit.
- Fixed bugs in tests in firefox5 and WebKit.
- Fixed bug where selection of table cells would produce an exception on Gecko.
- Fixed bug where the caret wasn't properly rendered on Gecko when the editor was hidden.
- Fixed bug where pasting plain text into WebKit would produce a pre element it will now produce more semantic markup.
- Fixed bug where selecting list type formats using the advlist plugin on IE8 would loose editor selection.
- Fixed bug where forced root blocks logic wouldn't properly pad elements created if they contained data attributes.
- Fixed bug where it would remove all contents of the editor if you inserted an image when not having a caret in the document.
- Fixed bug where the YUI compressor wouldn't properly encode strings with only a quote in them.
- Fixed bug where WebKit on iOS5 wouldn't call nodeChanged when the selection was changed.
- Fixed bug where mceFocus command wouldn't work properly on Gecko since it didn't focus the body element.
- Fixed performance issue with the noneditable plugin where it would enable/disable controls to often.
-Version 3.4.3.1 (2011-06-16)
- Fixed bug where listboxes were not being handled correctly by JAWS in firefox with the o2k7 skin.
- Fixed bug where custom buttons were not being rendered correctly when in high contrast mode.
- Added support for iOS 5 that now supporting contentEditable in it's latest beta.
- Fixed bug where urls in style attributes with a _ character followed by a number would cause incorrect output.
- Fixed bug where custom_elements option wasn't working properly on IE browsers.
- Fixed bug where custom_elements marked as block elements wouldn't get correctly treated as block elements.
- Fixed bug where attributes with </> wasn't properly encoded as XML entities.
-Version 3.4.3 (2011-06-09)
- Fixed bug where deleting backwards before an image into a list would put the cursor in the wrong location.
- Fixed bug where styles plugin would not apply styles across multiple selected block elements correctly.
- Fixed bug where cursor would jump to start of document when selection contained empty table cells in IE8.
- Fixed bug where applied styles wouldn't be kept if you pressed enter twice to produce two paragraphs.
- Fixed bug where a ghost like caret would appear on Gecko when pressing enter while having a text color applied.
- Fixed bug where IE would produce absolute urls if you inserted a image/link and reloaded the page.
- Fixed bug where applying a heading style to a list item would cascade style to children list items.
- Fixed bug where Editor loses focus when backspacing and changing styles in WebKit.
- Fixed bug where exception was thrown in tinymce.util.URI when parsing a relative URI and no base_uri setting was provided.
- Fixed bug where alt-f10 was not always giving focus to the toolbar on Safari.
- Added new 'allow_html_in_named_anchor' option to allow html to occur within a named anchor tag. Use at own risk.
- Added plugin dependency support. Will autoload plugins specified as a dependency if they haven't been loaded.
- Fixed bug where the autolink plugin didn't work with non-English keyboards when pressing ).
- Added possibility to change properties of all table cells in a column.
- Added external_image_list option to get images list from user-defined variable or function.
- Fixed bug where the autoresize plugin wouldn't reduce the editors height on Chrome.
- Fixed bug where table size inputs were to small for values with size units.
- Fixed bug where table cell/row size input values were not validated.
- Fixed bug where menu item line-height would be set to wrong value by external styles.
- Fixed bug where hasUndo() would return wrong answer.
- Fixed bug where page title would be set to undefined by fullpage plugin.
- Fixed bug where HTML5 video properties were not updated in embedded media settings.
- Fixed bug where HTML comment on the first line would cause an error.
- Fixed bug where spellchecker menu was positioned incorrectly on IE.
- Fixed bug where breaking out of list elements on WebKit would produce a DIV instead of P after the list.
- Fixed bug where pasting from Word in IE9 would add extra BR elements when text was word wrapped.
- Fixed bug where numeric entities with leading zeros would produce incorrect decoding.
- Fixed bug where hexadecimal entities wasn't properly decoded.
- Fixed bug where bookmarks wasn't properly stored/restored on undo/redo.
- Fixed bug where the mceInsertCommand didn't retain the values of links if they contained non url contents.
- Fixed bug where the valid_styles option wouldn't be properly used on styles for specific elements.
- Fixed so contentEditable is used for the body of the editor if it's supported.
- Fixed so trailing BR elements gets removed even when forced_root_blocks option was set to false/null.
- Fixed performance issue with mceInsertCommand and inserting very simple contents.
- Fixed performance issue with older IE version and huge documents by optimizing the forced root blocks logic.
- Fixed performance issue with table plugin where it checked for selected cells to often.
- Fixed bug where creating a link on centered/floated image would produce an error on WebKit browsers.
- Fixed bug where Gecko would remove single paragraphs if there where contents before/after it.
- Fixed bug where the scrollbar would move up/down when pasting contents using the paste plugin.
-Version 3.4.2 (2011-04-07)
- Added new 'paste_text_sticky_default' option to paste plugin, enables you to set the default state for paste as plain text.
- Added new autoresize_bottom_margin option to autoresize plugin that enables you to add an extra margin at the bottom. Patch contributed by Andrew Ozz.
- Rewritten the fullpage plugin to handle style contents better and have a more normalized behavior across browsers.
- Fixed bug where contents inserted with mceInsertContent wasn't parsed using the default dom parser.
- Fixed bug where blocks containing a single anchor element would be treated as empty.
- Fixed bug where merging of table cells on IE 6, 7 wouldn't look correctly until the contents was refreshed.
- Fixed bug where context menu wouldn't work properly on Safari since it was passing out the ctrl key as pressed.
- Fixed bug where image border color/style values were overwritten by advimage plugin.
- Fixed bug where setting border in advimage plugin would throw error in IE.
- Fixed bug where empty anchors list in link settings wasn't hidden.
- Fixed bug where xhtmlextras popups were missing localized popup-size parameters.
- Fixed bug where the context menu wouldn't select images on WebKit browsers.
- Fixed bug where paste plugin wouldn't properly extract the contents on WebKit due to recent changes in browser behavior.
- Fixed bug where focus of the editor would get on control contents on IE lost due to a bug in the ColorSplitButton control.
- Fixed bug where contextmenu wasn't disabled on noneditable elements.
- Fixed bug where getStyle function would trigger error when called on element without style property.
- Fixed bug where editor fail to load if Javascript Compressor was used.
- Fixed bug where list-style-type=lower-greek would produce errors in IE<8.
- Fixed bug where spellchecker plugin would produce errors on IE6-7.
- Fixed bug where theme_advanced_containers configuration option causes error.
- Fixed bug where the mceReplaceContent command would produce an error since it didn't correctly handle a return value.
- Fixed bug where you couldn't enter float point values for em in dialog input fields since it wouldn't be considered a valid size.
- Fixed bug in xhtmlxtras plugin where it wasn't possible to remove some attributes in the attributes dialog.
-Version 3.4.1 (2011-03-24)
- Added significantly improved list handling via the new 'lists' plugin.
- Added 'autolink' plugin to enable automatically linking URLs. Similar to the behavior IE has by default.
- Added 'theme_advanced_show_current_color' setting to enable the forecolor and backcolor buttons to continuously show the current text color.
- Added 'contextmenu_never_use_native' setting to disable the ctrl-right-click showing the native browser context menu behaviour.
- Added 'paste_enable_default_filters' setting to enable the default paste filters to be disabled.
- Fixed bug where selection locations on undo/redo didn't work correctly on specific contents.
- Fixed bug where an exception would be trown on IE when loading TinyMCE inside an iframe.
- Fixed bug where some ascii numeric entities wasn't properly decoded.
- Fixed bug where some non western language codes wasn't proper...
[truncated message content] |
|
From: <be...@us...> - 2012-11-21 02:25:06
|
Revision: 10262
http://sourceforge.net/p/xoops/svn/10262
Author: beckmi
Date: 2012-11-21 02:25:02 +0000 (Wed, 21 Nov 2012)
Log Message:
-----------
Adding corrected .htaccess file (Trabis)
Modified Paths:
--------------
XoopsModules/newbb/branches/irmtfan/newbb/docs/changelog.txt
Added Paths:
-----------
XoopsModules/newbb/branches/irmtfan/newbb/.htaccess
Removed Paths:
-------------
XoopsModules/newbb/branches/irmtfan/newbb/_htaccess
Added: XoopsModules/newbb/branches/irmtfan/newbb/.htaccess
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/.htaccess (rev 0)
+++ XoopsModules/newbb/branches/irmtfan/newbb/.htaccess 2012-11-21 02:25:02 UTC (rev 10262)
@@ -0,0 +1,3 @@
+RewriteEngine on
+RewriteRule ^([a-z]+)-([0-9]+)(/(.+))? modules/newbb/seo.php?seoOp=$1&seoArg=$2&seoOther=$4&%{QUERY_STRING} [L]
+#RewriteRule ^(.*)$ $1 [L]
\ No newline at end of file
Deleted: XoopsModules/newbb/branches/irmtfan/newbb/_htaccess
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/_htaccess 2012-11-20 08:47:14 UTC (rev 10261)
+++ XoopsModules/newbb/branches/irmtfan/newbb/_htaccess 2012-11-21 02:25:02 UTC (rev 10262)
@@ -1,3 +0,0 @@
-RewriteEngine on
-RewriteRule ^([a-z]+)-([0-9]+)(/(.+))? seo.php?seoOp=$1&seoArg=$2&seoOther=$4&%{QUERY_STRING} [L]
-RewriteRule ^(.*)$ $1 [L]
Modified: XoopsModules/newbb/branches/irmtfan/newbb/docs/changelog.txt
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/docs/changelog.txt 2012-11-20 08:47:14 UTC (rev 10261)
+++ XoopsModules/newbb/branches/irmtfan/newbb/docs/changelog.txt 2012-11-21 02:25:02 UTC (rev 10262)
@@ -1,4 +1,11 @@
newBB
+Changelog 4.3i (changes by Irmtfan)
+11/20/2012
+===========================================
+- needs to be updated with all the changes
+- fixed .htaccess (Trabis)
+
+newBB
Changelog 4.3
08/25/2012
===========================================
|
|
From: <txm...@us...> - 2012-11-20 08:47:16
|
Revision: 10261
http://sourceforge.net/p/xoops/svn/10261
Author: txmodxoops
Date: 2012-11-20 08:47:14 +0000 (Tue, 20 Nov 2012)
Log Message:
-----------
Updated
Modified Paths:
--------------
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/theme.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/tpl/metas.html
Modified: XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/theme.html
===================================================================
--- XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/theme.html 2012-11-20 08:19:17 UTC (rev 10260)
+++ XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/theme.html 2012-11-20 08:47:14 UTC (rev 10261)
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html>
+<html lang="<{$xoops_langcode}>">
<head>
<{* Center blocks display order valid values are: lrc (left right / center) lcr (left center right) clr (center / left right) *}>
<{assign var=theme_top_order value=clr}>
@@ -14,20 +14,16 @@
<{includeq file="$theme_tpl/metas.html"}>
<{* Additionals Scripts *}>
<{includeq file="$theme_tpl/scripts.html"}>
- </head>
- </head>
- <body>
+ </head>
+ <body id="<{$xoops_dirname}>" class="<{$xoops_langcode}>">
+ <noscript><h1><{if $xoops_pagetitle !=''}><{$xoops_pagetitle}> : <{/if}><{$xoops_sitename}></h1></noscript>
<!-- Home -->
- <div data-role="page" id="page1">
+ <div data-role="page" id="<{$xoops_dirname}>">
<!-- Additionals Header -->
<{includeq file="$theme_tpl/header.html"}>
<div data-role="content">
<{includeq file="$theme_tpl/login.html"}>
- <!-- Additionals Ads -->
- <{includeq file="$theme_tpl/advertise.html"}>
<{if $xoops_contents && ($xoops_contents != ' ') }><div data-role="content"><{$xoops_contents}></div><{/if}>
- <!-- Additionals Ads -->
- <{includeq file="$theme_tpl/advertise.html"}>
</div>
<!-- Additionals Footer -->
<{includeq file="$theme_tpl/footer.html"}>
Modified: XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/tpl/metas.html
===================================================================
--- XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/tpl/metas.html 2012-11-20 08:19:17 UTC (rev 10260)
+++ XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/tpl/metas.html 2012-11-20 08:47:14 UTC (rev 10261)
@@ -1,5 +1,7 @@
<meta http-equiv="content-type" content="text/html; charset=<{$xoops_charset}>" />
+<meta http-equiv="content-language" content="<{$xoops_langcode}>" />
<title><{if $xoops_pagetitle !=''}><{$xoops_pagetitle}> : <{/if}><{$xoops_sitename}></title>
+<base href="http://www.txmodxoops.org/" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="robots" content="<{$xoops_meta_robots}>" />
<meta name="keywords" content="<{$xoops_meta_keywords}>" />
@@ -8,6 +10,9 @@
<meta name="author" content="<{$xoops_meta_author}>" />
<meta name="copyright" content="<{$xoops_meta_copyright}>" />
<meta name="generator" content="XOOPS" />
+<link rel="apple-touch-icon" href="<{xoAppUrl images/icons/apple/icon.png}>" />
+<{* Mobile Specific Metas *}>
+<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
<{if $url}>
<meta http-equiv="Refresh" content="<{$time}>; url=<{$url}>" />
<{/if}>
|
|
From: <txm...@us...> - 2012-11-20 08:19:22
|
Revision: 10260
http://sourceforge.net/p/xoops/svn/10260
Author: txmodxoops
Date: 2012-11-20 08:19:17 +0000 (Tue, 20 Nov 2012)
Log Message:
-----------
Updated
Added Paths:
-----------
XoopsCore/tags/2.5mobile timgno/htdocs/images/
XoopsCore/tags/2.5mobile timgno/htdocs/images/icons/
XoopsCore/tags/2.5mobile timgno/htdocs/images/icons/apple/
XoopsCore/tags/2.5mobile timgno/htdocs/images/icons/apple/icon.png
XoopsCore/tags/2.5mobile timgno/htdocs/images/icons/apple/index.html
Added: XoopsCore/tags/2.5mobile timgno/htdocs/images/icons/apple/icon.png
===================================================================
(Binary files differ)
Property changes on: XoopsCore/tags/2.5mobile timgno/htdocs/images/icons/apple/icon.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsCore/tags/2.5mobile timgno/htdocs/images/icons/apple/index.html
===================================================================
|
|
From: <txm...@us...> - 2012-11-19 21:42:42
|
Revision: 10259
http://sourceforge.net/p/xoops/svn/10259
Author: txmodxoops
Date: 2012-11-19 21:42:38 +0000 (Mon, 19 Nov 2012)
Log Message:
-----------
Added more files
Updated
Modified Paths:
--------------
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/css/mobile.css
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/theme.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/tpl/header.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/tpl/scripts.html
Added Paths:
-----------
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/js/jquery.mobile.js
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/language/
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/language/english/
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/language/english/index.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/language/english/main.php
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/language/english/script.js
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/language/english/style.css
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/language/index.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/language/italian/
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/language/italian/index.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/language/italian/main.php
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/language/italian/main.rar
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/language/italian/script.js
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/language/italian/style.css
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/tpl/login.html
Modified: XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/css/mobile.css
===================================================================
--- XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/css/mobile.css 2012-11-19 20:05:16 UTC (rev 10258)
+++ XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/css/mobile.css 2012-11-19 21:42:38 UTC (rev 10259)
@@ -88,5 +88,4 @@
.content-primary {
width: 60%;
}
-}
-
+}
\ No newline at end of file
Added: XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/js/jquery.mobile.js
===================================================================
--- XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/js/jquery.mobile.js (rev 0)
+++ XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/js/jquery.mobile.js 2012-11-19 21:42:38 UTC (rev 10259)
@@ -0,0 +1,275 @@
+(function($) {
+ $.widget('mobile.tabbar', $.mobile.navbar, {
+ _create: function() {
+ // Set the theme before we call the prototype, which will
+ // ensure buttonMarkup() correctly grabs the inheritied theme.
+ // We default to the "a" swatch if none is found
+ var theme = this.element.jqmData('theme') || "a";
+ this.element.addClass('ui-footer ui-footer-fixed ui-bar-' + theme);
+
+ // Make sure the page has padding added to it to account for the fixed bar
+ this.element.closest('[data-role="page"]').addClass('ui-page-footer-fixed');
+
+
+ // Call the NavBar _create prototype
+ $.mobile.navbar.prototype._create.call(this);
+ },
+
+ // Set the active URL for the Tab Bar, and highlight that button on the bar
+ setActive: function(url) {
+ // Sometimes the active state isn't properly cleared, so we reset it ourselves
+ this.element.find('a').removeClass('ui-btn-active ui-state-persist');
+ this.element.find('a[href="' + url + '"]').addClass('ui-btn-active ui-state-persist');
+ }
+ });
+
+ $(document).bind('pagecreate create', function(e) {
+ return $(e.target).find(":jqmData(role='tabbar')").tabbar();
+ });
+
+ $(":jqmData(role='page')").live('pageshow', function(e) {
+ // Grab the id of the page that's showing, and select it on the Tab Bar on the page
+ var tabBar, id = $(e.target).attr('id');
+
+ tabBar = $.mobile.activePage.find(':jqmData(role="tabbar")');
+ if(tabBar.length) {
+ tabBar.tabbar('setActive', '#' + id);
+ }
+ });
+
+var attachEvents = function() {
+ var hoverDelay = $.mobile.buttonMarkup.hoverDelay, hov, foc;
+
+ $( document ).bind( {
+ "vmousedown vmousecancel vmouseup vmouseover vmouseout focus blur scrollstart": function( event ) {
+ var theme,
+ $btn = $( closestEnabledButton( event.target ) ),
+ evt = event.type;
+
+ if ( $btn.length ) {
+ theme = $btn.attr( "data-" + $.mobile.ns + "theme" );
+
+ if ( evt === "vmousedown" ) {
+ if ( $.support.touch ) {
+ hov = setTimeout(function() {
+ $btn.removeClass( "ui-btn-up-" + theme ).addClass( "ui-btn-down-" + theme );
+ }, hoverDelay );
+ } else {
+ $btn.removeClass( "ui-btn-up-" + theme ).addClass( "ui-btn-down-" + theme );
+ }
+ } else if ( evt === "vmousecancel" || evt === "vmouseup" ) {
+ $btn.removeClass( "ui-btn-down-" + theme ).addClass( "ui-btn-up-" + theme );
+ } else if ( evt === "vmouseover" || evt === "focus" ) {
+ if ( $.support.touch ) {
+ foc = setTimeout(function() {
+ $btn.removeClass( "ui-btn-up-" + theme ).addClass( "ui-btn-hover-" + theme );
+ }, hoverDelay );
+ } else {
+ $btn.removeClass( "ui-btn-up-" + theme ).addClass( "ui-btn-hover-" + theme );
+ }
+ } else if ( evt === "vmouseout" || evt === "blur" || evt === "scrollstart" ) {
+ $btn.removeClass( "ui-btn-hover-" + theme + " ui-btn-down-" + theme ).addClass( "ui-btn-up-" + theme );
+ if ( hov ) {
+ clearTimeout( hov );
+ }
+ if ( foc ) {
+ clearTimeout( foc );
+ }
+ }
+ }
+ },
+ "focusin focus": function( event ){
+ $( closestEnabledButton( event.target ) ).addClass( $.mobile.focusClass );
+ },
+ "focusout blur": function( event ){
+ $( closestEnabledButton( event.target ) ).removeClass( $.mobile.focusClass );
+ }
+ });
+
+ attachEvents = null;
+};
+
+$.fn.buttonMarkup = function( options ) {
+ var $workingSet = this;
+
+ // Enforce options to be of type string
+ options = ( options && ( $.type( options ) == "object" ) )? options : {};
+ for ( var i = 0; i < $workingSet.length; i++ ) {
+ var el = $workingSet.eq( i ),
+ e = el[ 0 ],
+ o = $.extend( {}, $.fn.buttonMarkup.defaults, {
+ icon: options.icon !== undefined ? options.icon : el.jqmData( "icon" ),
+ iconpos: options.iconpos !== undefined ? options.iconpos : el.jqmData( "iconpos" ),
+ theme: options.theme !== undefined ? options.theme : el.jqmData( "theme" ) || $.mobile.getInheritedTheme( el, "c" ),
+ inline: options.inline !== undefined ? options.inline : el.jqmData( "inline" ),
+ shadow: options.shadow !== undefined ? options.shadow : el.jqmData( "shadow" ),
+ corners: options.corners !== undefined ? options.corners : el.jqmData( "corners" ),
+ iconshadow: options.iconshadow !== undefined ? options.iconshadow : el.jqmData( "iconshadow" ),
+ iconsize: options.iconsize !== undefined ? options.iconsize : el.jqmData( "iconsize" ),
+ mini: options.mini !== undefined ? options.mini : el.jqmData( "mini" )
+ }, options ),
+
+ // Classes Defined
+ innerClass = "ui-btn-inner",
+ textClass = "ui-btn-text",
+ buttonClass, iconClass,
+ // Button inner markup
+ buttonInner,
+ buttonText,
+ buttonIcon,
+ buttonElements;
+
+ $.each(o, function(key, value) {
+ e.setAttribute( "data-" + $.mobile.ns + key, value );
+ el.jqmData(key, value);
+ });
+
+ // Check if this element is already enhanced
+ buttonElements = $.data(((e.tagName === "INPUT" || e.tagName === "BUTTON") ? e.parentNode : e), "buttonElements");
+
+ if (buttonElements) {
+ e = buttonElements.outer;
+ el = $(e);
+ buttonInner = buttonElements.inner;
+ buttonText = buttonElements.text;
+ // We will recreate this icon below
+ $(buttonElements.icon).remove();
+ buttonElements.icon = null;
+ }
+ else {
+ buttonInner = document.createElement( o.wrapperEls );
+ buttonText = document.createElement( o.wrapperEls );
+ }
+ buttonIcon = o.icon ? document.createElement( "span" ) : null;
+
+ if ( attachEvents && !buttonElements) {
+ attachEvents();
+ }
+
+ // if not, try to find closest theme container
+ if ( !o.theme ) {
+ o.theme = $.mobile.getInheritedTheme( el, "c" );
+ }
+
+ buttonClass = "ui-btn ui-btn-up-" + o.theme;
+ buttonClass += o.inline ? " ui-btn-inline" : "";
+ buttonClass += o.shadow ? " ui-shadow" : "";
+ buttonClass += o.corners ? " ui-btn-corner-all" : "";
+
+ if ( o.mini !== undefined ) {
+ // Used to control styling in headers/footers, where buttons default to `mini` style.
+ buttonClass += o.mini ? " ui-mini" : " ui-fullsize";
+ }
+
+ if ( o.inline !== undefined ) {
+ // Used to control styling in headers/footers, where buttons default to `mini` style.
+ buttonClass += o.inline === false ? " ui-btn-block" : " ui-btn-inline";
+ }
+
+
+ if ( o.icon ) {
+ o.icon = "ui-icon-" + o.icon;
+ o.iconpos = o.iconpos || "left";
+
+ iconClass = "ui-icon " + o.icon;
+
+ if ( o.iconshadow ) {
+ iconClass += " ui-icon-shadow";
+ }
+
+ if ( o.iconsize ) {
+ iconClass += " ui-iconsize-" + o.iconsize;
+ }
+ }
+
+ if ( o.iconpos ) {
+ buttonClass += " ui-btn-icon-" + o.iconpos;
+
+ if ( o.iconpos == "notext" && !el.attr( "title" ) ) {
+ el.attr( "title", el.getEncodedText() );
+ }
+ }
+
+ innerClass += o.corners ? " ui-btn-corner-all" : "";
+
+ if ( o.iconpos && o.iconpos === "notext" && !el.attr( "title" ) ) {
+ el.attr( "title", el.getEncodedText() );
+ }
+
+ if ( buttonElements ) {
+ el.removeClass( buttonElements.bcls || "" );
+ }
+ el.removeClass( "ui-link" ).addClass( buttonClass );
+
+ buttonInner.className = innerClass;
+
+ buttonText.className = textClass;
+ if ( !buttonElements ) {
+ buttonInner.appendChild( buttonText );
+ }
+ if ( buttonIcon ) {
+ buttonIcon.className = iconClass;
+ if ( !(buttonElements && buttonElements.icon) ) {
+ buttonIcon.appendChild( document.createTextNode("\u00a0") );
+ buttonInner.appendChild( buttonIcon );
+ }
+ }
+
+ while ( e.firstChild && !buttonElements) {
+ buttonText.appendChild( e.firstChild );
+ }
+
+ if ( !buttonElements ) {
+ e.appendChild( buttonInner );
+ }
+
+ // Assign a structure containing the elements of this button to the elements of this button. This
+ // will allow us to recognize this as an already-enhanced button in future calls to buttonMarkup().
+ buttonElements = {
+ bcls : buttonClass,
+ outer : e,
+ inner : buttonInner,
+ text : buttonText,
+ icon : buttonIcon
+ };
+
+ $.data(e, 'buttonElements', buttonElements);
+ $.data(buttonInner, 'buttonElements', buttonElements);
+ $.data(buttonText, 'buttonElements', buttonElements);
+ if (b |
|
From: <txm...@us...> - 2012-11-19 20:05:19
|
Revision: 10258
http://sourceforge.net/p/xoops/svn/10258
Author: txmodxoops
Date: 2012-11-19 20:05:16 +0000 (Mon, 19 Nov 2012)
Log Message:
-----------
Added alpha 1 Mobile for xoops 2.5.5
Added Paths:
-----------
XoopsCore/tags/2.5mobile timgno/
XoopsCore/tags/2.5mobile timgno/htdocs/
XoopsCore/tags/2.5mobile timgno/htdocs/modules/
XoopsCore/tags/2.5mobile timgno/htdocs/modules/contact/
XoopsCore/tags/2.5mobile timgno/htdocs/modules/contact/templates/
XoopsCore/tags/2.5mobile timgno/htdocs/modules/contact/templates/contact_index.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/css/
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/css/index.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/css/jquery.mobile.css
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/css/mobile.css
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/index.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/js/
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/js/index.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/js/mobile.js
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/plugins/
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/plugins/index.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/theme.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/tpl/
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/tpl/footer.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/tpl/header.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/tpl/index.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/tpl/metas.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/tpl/scripts.html
Added: XoopsCore/tags/2.5mobile timgno/htdocs/modules/contact/templates/contact_index.html
===================================================================
--- XoopsCore/tags/2.5mobile timgno/htdocs/modules/contact/templates/contact_index.html (rev 0)
+++ XoopsCore/tags/2.5mobile timgno/htdocs/modules/contact/templates/contact_index.html 2012-11-19 20:05:16 UTC (rev 10258)
@@ -0,0 +1,32 @@
+<div class="contact">
+ <form id="contact_form" action="<{$xoops_url}>/modules/contact/index.php" method="POST">
+ <div data-role="fieldcontain">
+ <fieldset data-role="controlgroup" data-mini="true">
+ <input name="name" id="name" placeholder="" value="Name" type="text" />
+ </fieldset>
+ </div>
+ <div data-role="fieldcontain">
+ <fieldset data-role="controlgroup" data-mini="true">
+ <input name="email" id="email" placeholder="" value="Email" type="email" />
+ </fieldset>
+ </div>
+ <div data-role="fieldcontain">
+ <fieldset data-role="controlgroup" data-mini="true">
+ <input name="url" id="url" placeholder="" value="Url" type="url" />
+ </fieldset>
+ </div>
+ <div data-role="fieldcontain">
+ <fieldset data-role="controlgroup" data-mini="true">
+ <input name="location" id="location" placeholder="" value="Location" type="text" />
+ </fieldset>
+ </div>
+ <div data-role="fieldcontain">
+ <fieldset data-role="controlgroup">
+ <textarea name="message" id="message" placeholder="">
+ Enter a message
+ </textarea>
+ </fieldset>
+ </div>
+ <input id="submit_button" type="submit" data-inline="true" data-theme="b" data-icon="arrow-r" data-iconpos="left" value="Submit" data-mini="true" />
+ </form>
+</div>
\ No newline at end of file
Added: XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/css/index.html
===================================================================
--- XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/css/index.html (rev 0)
+++ XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/css/index.html 2012-11-19 20:05:16 UTC (rev 10258)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/css/jquery.mobile.css
===================================================================
--- XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/css/jquery.mobile.css (rev 0)
+++ XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/css/jquery.mobile.css 2012-11-19 20:05:16 UTC (rev 10258)
@@ -0,0 +1,92 @@
+.text-align-center {
+ text-align: center;
+}
+.text-align-right {
+ text-align: right;
+}
+
+/** CSS for non-standard jQuery Mobile styles or Codiqa components **/
+.split-wrapper {
+ width: 100%;
+ min-height: 200px;
+ clear: both;
+}
+@media all and (min-width: 650px) {
+ .content-secondary {
+ text-align: left;
+ float: left;
+ width: 45%;
+ background: none;
+ padding: 1.5em 6% 3em 0;
+ margin: 0;
+ }
+ .content-secondary {
+ background: none;
+ border-top: none;
+ }
+ .content-primary {
+ width: 45%;
+ float: right;
+ margin-right: 1%;
+ padding-right: 1%;
+ }
+ .content-primary ul:first-child {
+ margin-top: 0;
+ }
+ .content-secondary ul.ui-listview, .content-secondary ul.ui-listview-inset {
+ margin: 0;
+ }
+ .content-secondary ul.ui-listview .ui-li-divider, .content-secondary ul.ui-listview .ui-li {
+ border-radius: 0px;
+ }
+ .content-secondary ul.ui-listview .ui-li {
+ border-left: 0;
+ border-right: 0;
+ }
+ .content-secondary h2 {
+ position: absolute;
+ left: -9999px;
+ }
+ .content-secondary .ui-li-divider {
+ padding-top: 1em;
+ padding-bottom: 1em;
+ }
+ .content-secondary {
+ margin: 0;
+ padding: 0;
+ }
+
+}
+@media all and (min-width: 750px){
+ .content-secondary {
+ width: 34%;
+ }
+ .content-primary {
+ width: 60%;
+ padding-right: 1%;
+ }
+}
+
+@media all and (min-width: 1200px){
+ .content-secondary {
+ width: 30%;
+ padding-right:6%;
+ margin: 0px 0 20px 5%;
+ }
+ .content-secondary ul {
+ margin: 0;
+ }
+ .content-secondary {
+ margin: 0;
+ padding: 0;
+ }
+ .content-primary {
+ width: 50%;
+ margin-right: 5%;
+ padding-right: 3%;
+ }
+ .content-primary {
+ width: 60%;
+ }
+}
+
Added: XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/css/mobile.css
===================================================================
--- XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/css/mobile.css (rev 0)
+++ XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/css/mobile.css 2012-11-19 20:05:16 UTC (rev 10258)
@@ -0,0 +1,92 @@
+.text-align-center {
+ text-align: center;
+}
+.text-align-right {
+ text-align: right;
+}
+
+/** CSS for non-standard jQuery Mobile styles or Codiqa components **/
+.split-wrapper {
+ width: 100%;
+ min-height: 200px;
+ clear: both;
+}
+@media all and (min-width: 650px) {
+ .content-secondary {
+ text-align: left;
+ float: left;
+ width: 45%;
+ background: none;
+ padding: 1.5em 6% 3em 0;
+ margin: 0;
+ }
+ .content-secondary {
+ background: none;
+ border-top: none;
+ }
+ .content-primary {
+ width: 45%;
+ float: right;
+ margin-right: 1%;
+ padding-right: 1%;
+ }
+ .content-primary ul:first-child {
+ margin-top: 0;
+ }
+ .content-secondary ul.ui-listview, .content-secondary ul.ui-listview-inset {
+ margin: 0;
+ }
+ .content-secondary ul.ui-listview .ui-li-divider, .content-secondary ul.ui-listview .ui-li {
+ border-radius: 0px;
+ }
+ .content-secondary ul.ui-listview .ui-li {
+ border-left: 0;
+ border-right: 0;
+ }
+ .content-secondary h2 {
+ position: absolute;
+ left: -9999px;
+ }
+ .content-secondary .ui-li-divider {
+ padding-top: 1em;
+ padding-bottom: 1em;
+ }
+ .content-secondary {
+ margin: 0;
+ padding: 0;
+ }
+
+}
+@media all and (min-width: 750px){
+ .content-secondary {
+ width: 34%;
+ }
+ .content-primary {
+ width: 60%;
+ padding-right: 1%;
+ }
+}
+
+@media all and (min-width: 1200px){
+ .content-secondary {
+ width: 30%;
+ padding-right:6%;
+ margin: 0px 0 20px 5%;
+ }
+ .content-secondary ul {
+ margin: 0;
+ }
+ .content-secondary {
+ margin: 0;
+ padding: 0;
+ }
+ .content-primary {
+ width: 50%;
+ margin-right: 5%;
+ padding-right: 3%;
+ }
+ .content-primary {
+ width: 60%;
+ }
+}
+
Added: XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/index.html
===================================================================
--- XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/index.html (rev 0)
+++ XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/index.html 2012-11-19 20:05:16 UTC (rev 10258)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/js/index.html
===================================================================
--- XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/js/index.html (rev 0)
+++ XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/js/index.html 2012-11-19 20:05:16 UTC (rev 10258)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/js/mobile.js
===================================================================
--- XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/js/mobile.js (rev 0)
+++ XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/js/mobile.js 2012-11-19 20:05:16 UTC (rev 10258)
@@ -0,0 +1,275 @@
+(function($) {
+ $.widget('mobile.tabbar', $.mobile.navbar, {
+ _create: function() {
+ // Set the theme before we call the prototype, which will
+ // ensure buttonMarkup() correctly grabs the inheritied theme.
+ // We default to the "a" swatch if none is found
+ var theme = this.element.jqmData('theme') || "a";
+ this.element.addClass('ui-footer ui-footer-fixed ui-bar-' + theme);
+
+ // Make sure the page has padding added to it to account for the fixed bar
+ this.element.closest('[data-role="page"]').addClass('ui-page-footer-fixed');
+
+
+ // Call the NavBar _create prototype
+ $.mobile.navbar.prototype._create.call(this);
+ },
+
+ // Set the active URL for the Tab Bar, and highlight that button on the bar
+ setActive: function(url) {
+ // Sometimes the active state isn't properly cleared, so we reset it ourselves
+ this.element.find('a').removeClass('ui-btn-active ui-state-persist');
+ this.element.find('a[href="' + url + '"]').addClass('ui-btn-active ui-state-persist');
+ }
+ });
+
+ $(document).bind('pagecreate create', function(e) {
+ return $(e.target).find(":jqmData(role='tabbar')").tabbar();
+ });
+
+ $(":jqmData(role='page')").live('pageshow', function(e) {
+ // Grab the id of the page that's showing, and select it on the Tab Bar on the page
+ var tabBar, id = $(e.target).attr('id');
+
+ tabBar = $.mobile.activePage.find(':jqmData(role="tabbar")');
+ if(tabBar.length) {
+ tabBar.tabbar('setActive', '#' + id);
+ }
+ });
+
+var attachEvents = function() {
+ var hoverDelay = $.mobile.buttonMarkup.hoverDelay, hov, foc;
+
+ $( document ).bind( {
+ "vmousedown vmousecancel vmouseup vmouseover vmouseout focus blur scrollstart": function( event ) {
+ var theme,
+ $btn = $( closestEnabledButton( event.target ) ),
+ evt = event.type;
+
+ if ( $btn.length ) {
+ theme = $btn.attr( "data-" + $.mobile.ns + "theme" );
+
+ if ( evt === "vmousedown" ) {
+ if ( $.support.touch ) {
+ hov = setTimeout(function() {
+ $btn.removeClass( "ui-btn-up-" + theme ).addClass( "ui-btn-down-" + theme );
+ }, hoverDelay );
+ } else {
+ $btn.removeClass( "ui-btn-up-" + theme ).addClass( "ui-btn-down-" + theme );
+ }
+ } else if ( evt === "vmousecancel" || evt === "vmouseup" ) {
+ $btn.removeClass( "ui-btn-down-" + theme ).addClass( "ui-btn-up-" + theme );
+ } else if ( evt === "vmouseover" || evt === "focus" ) {
+ if ( $.support.touch ) {
+ foc = setTimeout(function() {
+ $btn.removeClass( "ui-btn-up-" + theme ).addClass( "ui-btn-hover-" + theme );
+ }, hoverDelay );
+ } else {
+ $btn.removeClass( "ui-btn-up-" + theme ).addClass( "ui-btn-hover-" + theme );
+ }
+ } else if ( evt === "vmouseout" || evt === "blur" || evt === "scrollstart" ) {
+ $btn.removeClass( "ui-btn-hover-" + theme + " ui-btn-down-" + theme ).addClass( "ui-btn-up-" + theme );
+ if ( hov ) {
+ clearTimeout( hov );
+ }
+ if ( foc ) {
+ clearTimeout( foc );
+ }
+ }
+ }
+ },
+ "focusin focus": function( event ){
+ $( closestEnabledButton( event.target ) ).addClass( $.mobile.focusClass );
+ },
+ "focusout blur": function( event ){
+ $( closestEnabledButton( event.target ) ).removeClass( $.mobile.focusClass );
+ }
+ });
+
+ attachEvents = null;
+};
+
+$.fn.buttonMarkup = function( options ) {
+ var $workingSet = this;
+
+ // Enforce options to be of type string
+ options = ( options && ( $.type( options ) == "object" ) )? options : {};
+ for ( var i = 0; i < $workingSet.length; i++ ) {
+ var el = $workingSet.eq( i ),
+ e = el[ 0 ],
+ o = $.extend( {}, $.fn.buttonMarkup.defaults, {
+ icon: options.icon !== undefined ? options.icon : el.jqmData( "icon" ),
+ iconpos: options.iconpos !== undefined ? options.iconpos : el.jqmData( "iconpos" ),
+ theme: options.theme !== undefined ? options.theme : el.jqmData( "theme" ) || $.mobile.getInheritedTheme( el, "c" ),
+ inline: options.inline !== undefined ? options.inline : el.jqmData( "inline" ),
+ shadow: options.shadow !== undefined ? options.shadow : el.jqmData( "shadow" ),
+ corners: options.corners !== undefined ? options.corners : el.jqmData( "corners" ),
+ iconshadow: options.iconshadow !== undefined ? options.iconshadow : el.jqmData( "iconshadow" ),
+ iconsize: options.iconsize !== undefined ? options.iconsize : el.jqmData( "iconsize" ),
+ mini: options.mini !== undefined ? options.mini : el.jqmData( "mini" )
+ }, options ),
+
+ // Classes Defined
+ innerClass = "ui-btn-inner",
+ textClass = "ui-btn-text",
+ buttonClass, iconClass,
+ // Button inner markup
+ buttonInner,
+ buttonText,
+ buttonIcon,
+ buttonElements;
+
+ $.each(o, function(key, value) {
+ e.setAttribute( "data-" + $.mobile.ns + key, value );
+ el.jqmData(key, value);
+ });
+
+ // Check if this element is already enhanced
+ buttonElements = $.data(((e.tagName === "INPUT" || e.tagName === "BUTTON") ? e.parentNode : e), "buttonElements");
+
+ if (buttonElements) {
+ e = buttonElements.outer;
+ el = $(e);
+ buttonInner = buttonElements.inner;
+ buttonText = buttonElements.text;
+ // We will recreate this icon below
+ $(buttonElements.icon).remove();
+ buttonElements.icon = null;
+ }
+ else {
+ buttonInner = document.createElement( o.wrapperEls );
+ buttonText = document.createElement( o.wrapperEls );
+ }
+ buttonIcon = o.icon ? document.createElement( "span" ) : null;
+
+ if ( attachEvents && !buttonElements) {
+ attachEvents();
+ }
+
+ // if not, try to find closest theme container
+ if ( !o.theme ) {
+ o.theme = $.mobile.getInheritedTheme( el, "c" );
+ }
+
+ buttonClass = "ui-btn ui-btn-up-" + o.theme;
+ buttonClass += o.inline ? " ui-btn-inline" : "";
+ buttonClass += o.shadow ? " ui-shadow" : "";
+ buttonClass += o.corners ? " ui-btn-corner-all" : "";
+
+ if ( o.mini !== undefined ) {
+ // Used to control styling in headers/footers, where buttons default to `mini` style.
+ buttonClass += o.mini ? " ui-mini" : " ui-fullsize";
+ }
+
+ if ( o.inline !== undefined ) {
+ // Used to control styling in headers/footers, where buttons default to `mini` style.
+ buttonClass += o.inline === false ? " ui-btn-block" : " ui-btn-inline";
+ }
+
+
+ if ( o.icon ) {
+ o.icon = "ui-icon-" + o.icon;
+ o.iconpos = o.iconpos || "left";
+
+ iconClass = "ui-icon " + o.icon;
+
+ if ( o.iconshadow ) {
+ iconClass += " ui-icon-shadow";
+ }
+
+ if ( o.iconsize ) {
+ iconClass += " ui-iconsize-" + o.iconsize;
+ }
+ }
+
+ if ( o.iconpos ) {
+ buttonClass += " ui-btn-icon-" + o.iconpos;
+
+ if ( o.iconpos == "notext" && !el.attr( "title" ) ) {
+ el.attr( "title", el.getEncodedText() );
+ }
+ }
+
+ innerClass += o.corners ? " ui-btn-corner-all" : "";
+
+ if ( o.iconpos && o.iconpos === "notext" && !el.attr( "title" ) ) {
+ el.attr( "title", el.getEncodedText() );
+ }
+
+ if ( buttonElements ) {
+ el.removeClass( buttonElements.bcls || "" );
+ }
+ el.removeClass( "ui-link" ).addClass( buttonClass );
+
+ buttonInner.className = innerClass;
+
+ buttonText.className = textClass;
+ if ( !buttonElements ) {
+ buttonInner.appendChild( buttonText );
+ }
+ if ( buttonIcon ) {
+ buttonIcon.className = iconClass;
+ if ( !(buttonElements && buttonElements.icon) ) {
+ buttonIcon.appendChild( document.createTextNode("\u00a0") );
+ buttonInner.appendChild( buttonIcon );
+ }
+ }
+
+ while ( e.firstChild && !buttonElements) {
+ buttonText.appendChild( e.firstChild );
+ }
+
+ if ( !buttonElements ) {
+ e.appendChild( buttonInner );
+ }
+
+ // Assign a structure containing the elements of this button to the elements of this button. This
+ // will allow us to recognize this as an already-enhanced button in future calls to buttonMarkup().
+ buttonElements = {
+ bcls : buttonClass,
+ outer : e,
+ inner : buttonInner,
+ text : buttonText,
+ icon : buttonIcon
+ };
+
+ $.data(e, 'buttonElements', buttonElements);
+ $.data(buttonInner, 'buttonElements', buttonElements);
+ $.data(buttonText, 'buttonElements', buttonElements);
+ if (buttonIcon) {
+ $.data(buttonIcon, 'buttonElements', buttonElements);
+ }
+ }
+
+ return this;
+};
+
+$.fn.buttonMarkup.defaults = {
+ corners: true,
+ shadow: true,
+ iconshadow: true,
+ iconsize: 18,
+ wrapperEls: "span"
+};
+
+function closestEnabledButton( element ) {
+ var cname;
+
+ while ( element ) {
+ // Note that we check for typeof className below because the element we
+ // handed could be in an SVG DOM where className on SVG elements is defined to
+ // be of a different type (SVGAnimatedString). We only operate on HTML DOM
+ // elements, so we look for plain "string".
+ cname = ( typeof element.className === 'string' ) && (element.className + ' ');
+ if ( cname && cname.indexOf("ui-btn ") > -1 && cname.indexOf("ui-disabled ") < 0 ) {
+ break;
+ }
+
+ element = element.parentNode;
+ }
+
+ return element;
+}
+
+
+})(jQuery);
Added: XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/plugins/index.html
===================================================================
--- XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/plugins/index.html (rev 0)
+++ XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/plugins/index.html 2012-11-19 20:05:16 UTC (rev 10258)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/theme.html
===================================================================
--- XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/theme.html (rev 0)
+++ XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/theme.html 2012-11-19 20:05:16 UTC (rev 10258)
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <{* Center blocks display order valid values are: lrc (left right / center) lcr (left center right) clr (center / left right) *}>
+ <{assign var=theme_top_order value=clr}>
+ <{assign var=theme_bottom_order value=clr}>
+ <{* Theme name *}>
+ <{assign var=theme_name value=$xoTheme->folderName}>
+ <{* Directory html blocks files or additional html files by include *}>
+ <{assign var=theme_tpl value=$xoTheme->folderName|cat:'/tpl'}>
+ <{* Directory html plugins files *}>
+ <{assign var=theme_plugin value=$xoTheme->folderName|cat:'/plugins'}>
+ <{* Metas, Titles, and Style Sheets *}>
+ <{includeq file="$theme_tpl/metas.html"}>
+ <{* Additionals Scripts *}>
+ <{includeq file="$theme_tpl/scripts.html"}>
+ </head>
+ </head>
+ <body>
+ <!-- Home -->
+ <div data-role="page" id="page1">
+ <!-- Additionals Header -->
+ <{includeq file="$theme_tpl/header.html"}>
+ <div data-role="content">
+ <a data-role="button" data-inline="true" data-theme="b" href="<{xoAppUrl user.php}>" data-icon="gear" data-iconpos="left">Login</a>
+ <a data-role="button" data-inline="true" data-theme="b" href="<{xoAppUrl modules/profile/register.php}>" data-icon="star" data-iconpos="left">Register</a>
+ <{if xoops_isadmin}>
+ <a data-role="button" data-inline="true" data-theme="b" href="<{xoAppUrl admin.php}>" data-icon="back" data-iconpos="left">Admin</a>
+ <{/if}>
+ <{if $xoops_contents && ($xoops_contents != ' ') }><div data-role="content"><{$xoops_contents}></div><{/if}>
+ </div>
+ <!-- Additionals Footer -->
+ <{includeq file="$theme_tpl/footer.html"}>
+ </div>
+ </body>
+</html>
\ No newline at end of file
Added: XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/tpl/footer.html
===================================================================
--- XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/tpl/footer.html (rev 0)
+++ XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/tpl/footer.html 2012-11-19 20:05:16 UTC (rev 10258)
@@ -0,0 +1 @@
+<div id="footer" data-theme="a" data-role="footer" data-position="fixed"><{$xoops_footer}></div>
\ No newline at end of file
Added: XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/tpl/header.html
===================================================================
--- XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/tpl/header.html (rev 0)
+++ XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/tpl/header.html 2012-11-19 20:05:16 UTC (rev 10258)
@@ -0,0 +1,17 @@
+ <div data-theme="a" data-role="header">
+ <h3 id="welcome"><{$xoops_sitename}></h3>
+ <div data-role="navbar" data-iconpos="left">
+ <ul>
+ <li>
+ <a href="<{xoAppUrl /}>" data-theme="" data-icon="home" class="ui-btn-active ui-state-persist">
+ Home
+ </a>
+ </li>
+ <li>
+ <a href="<{xoAppUrl modules/contact/index.php}>" data-theme="c" data-icon="star">
+ Contact
+ </a>
+ </li>
+ </ul>
+ </div>
+ </div>
\ No newline at end of file
Added: XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/tpl/index.html
===================================================================
--- XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/tpl/index.html (rev 0)
+++ XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/tpl/index.html 2012-11-19 20:05:16 UTC (rev 10258)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/tpl/metas.html
===================================================================
--- XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/tpl/metas.html (rev 0)
+++ XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/tpl/metas.html 2012-11-19 20:05:16 UTC (rev 10258)
@@ -0,0 +1,25 @@
+<meta http-equiv="content-type" content="text/html; charset=<{$xoops_charset}>" />
+<title><{if $xoops_pagetitle !=''}><{$xoops_pagetitle}> : <{/if}><{$xoops_sitename}></title>
+<meta name="viewport" content="width=device-width, initial-scale=1" />
+<meta name="robots" content="<{$xoops_meta_robots}>" />
+<meta name="keywords" content="<{$xoops_meta_keywords}>" />
+<meta name="description" content="<{$xoops_meta_description}>" />
+<meta name="rating" content="<{$xoops_meta_rating}>" />
+<meta name="author" content="<{$xoops_meta_author}>" />
+<meta name="copyright" content="<{$xoops_meta_copyright}>" />
+<meta name="generator" content="XOOPS" />
+<{if $url}>
+ <meta http-equiv="Refresh" content="<{$time}>; url=<{$url}>" />
+<{/if}>
+<{if $isMsie}>
+ <noscript>
+ <meta http-equiv="refresh" content="0; url=<{xoAppUrl . xoops_theme_select=mdefault}>" />
+ </noscript>
+<{/if}>
+<link rel="alternate" type="application/rss+xml" title="<{$smarty.const.THEME_RSS}>" href="<{xoAppUrl backend.php}>" />
+<link rel="shortcut icon" type="image/ico" href="<{xoImgUrl icons/favicon.ico}>" />
+<link rel="icon" type="image/png" href="<{xoImgUrl icons/icon.png}>" />
+<link rel="stylesheet" type="text/css" media="screen" href="<{xoAppUrl xoops.css}>" />
+<link rel="stylesheet" href="https://ajax.aspnetcdn.com/ajax/jquery.mobile/1.1.1/jquery.mobile-1.1.1.min.css" />
+<link rel="stylesheet" type="text/css" media="all" title="mobile" href="<{xoImgUrl css/mobile.css}>" />
+<{$xoops_module_header}>
\ No newline at end of file
Added: XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/tpl/scripts.html
===================================================================
--- XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/tpl/scripts.html (rev 0)
+++ XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/tpl/scripts.html 2012-11-19 20:05:16 UTC (rev 10258)
@@ -0,0 +1,4 @@
+<!-- Under Construction -->
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
+<script src="https://ajax.aspnetcdn.com/ajax/jquery.mobile/1.1.1/jquery.mobile-1.1.1.min.js"></script>
+<script src="<{xoImgUrl js/mobile.js}>"></script>
\ No newline at end of file
|
|
From: <ir...@us...> - 2012-11-19 07:18:34
|
Revision: 10257
http://sourceforge.net/p/xoops/svn/10257
Author: irmtfan
Date: 2012-11-19 07:18:31 +0000 (Mon, 19 Nov 2012)
Log Message:
-----------
bug fix: moderator have all access over forum regardless of his/her group access
Modified Paths:
--------------
XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt
XoopsModules/newbb/branches/irmtfan/newbb/class/forum.php
Modified: XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt 2012-11-18 22:32:49 UTC (rev 10256)
+++ XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt 2012-11-19 07:18:31 UTC (rev 10257)
@@ -1,3 +1,8 @@
+date 2012-11-19
+===================================
+1- bug fix: in viewforum.php?forum=XXX . moderator have all access over the forum regardless of his/her group access.
+in newbb/class/forum.php
+
date 2012-11-14
===================================
1- feature add: add pdf and print permissions. fix html and signature permission in new install.
Modified: XoopsModules/newbb/branches/irmtfan/newbb/class/forum.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/class/forum.php 2012-11-18 22:32:49 UTC (rev 10256)
+++ XoopsModules/newbb/branches/irmtfan/newbb/class/forum.php 2012-11-19 07:18:31 UTC (rev 10257)
@@ -555,9 +555,12 @@
static $_cachedPerms;
if ($type == "all") return true;
- if ($GLOBALS["xoopsUserIsAdmin"] && $xoopsModule->getVar("dirname") == "newbb") {
- return true;
- }
+ // irmtfan - if user is forum moderator then return true
+ mod_loadFunctions("user", "newbb");
+ if (newbb_isAdmin($forum)) return true;
+ //if ($GLOBALS["xoopsUserIsAdmin"] && $xoopsModule->getVar("dirname") == "newbb") {
+ //return true;
+ //}
if (!is_object($forum)) $forum =& $this->get($forum);
@@ -568,14 +571,16 @@
}
$type = strtolower($type);
- if ("moderate" == $type) {
- require_once XOOPS_ROOT_PATH . "/modules/newbb/include/functions.user.php";
- $permission = newbb_isModerator($forum);
- } else {
+ // START irmtfan commented and removed
+ //if ("moderate" == $type) {
+ //require_once XOOPS_ROOT_PATH . "/modules/newbb/include/functions.user.php";
+ //$permission = newbb_isModerator($forum);
+ //} else {
$forum_id = $forum->getVar('forum_id');
$perm_handler =& xoops_getmodulehandler('permission', 'newbb');
$permission = $perm_handler->getPermission("forum", $type, $forum_id);
- }
+ //}
+ // END irmtfan commented and removed
return $permission;
}
|
|
From: <du...@us...> - 2012-11-18 22:32:52
|
Revision: 10256
http://sourceforge.net/p/xoops/svn/10256
Author: dugris
Date: 2012-11-18 22:32:49 +0000 (Sun, 18 Nov 2012)
Log Message:
-----------
Fiw form
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/admin/index.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/class/xcaptcha.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/plugins/image.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/plugins/recaptcha.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/plugins/text.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/xoops_version.php
Added Paths:
-----------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/class/form/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/class/form/captcha.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/class/form/image.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/class/form/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/class/form/recaptcha.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/class/form/text.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/admin/index.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/admin/index.php 2012-11-18 22:30:39 UTC (rev 10255)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/admin/index.php 2012-11-18 22:32:49 UTC (rev 10256)
@@ -48,12 +48,14 @@
if ( $type == 'config' ) {
$admin_page->renderNavigation('index.php?type=config');
$admin_page->addInfoBox(_AM_XCAPTCHA_FORM);
- $admin_page->addInfoBoxLine($xcaptcha_handler->getForm());
+ $form = $xoops->getModuleForm($xcaptcha_handler, 'captcha', 'xcaptcha');
+ $admin_page->addInfoBoxLine( $form->render() );
} else {
- if ($xcaptcha_handler->loadPluginHandler( $type )) {
+ if ( $plugin = $xcaptcha_handler->loadPluginHandler( $type )) {
$title = constant('_XCAPTCHA_FORM_' . strtoupper($type) );
+ $form = $xoops->getModuleForm($plugin, $type, 'xcaptcha');
$admin_page->addInfoBox( $title );
- $admin_page->addInfoBoxLine($xcaptcha_handler->Pluginhandler->getForm());
+ $admin_page->addInfoBoxLine( $form->render() );
} else {
$xoops->redirect('index.php', 5, _AM_XCAPTCHA_ERROR);
}
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/class/form
___________________________________________________________________
Added: tsvn:autoprops
+ *.php = svn:executable=*;svn:keywords=Author Date Id Rev URL;
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/class/form/captcha.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/class/form/captcha.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/class/form/captcha.php 2012-11-18 22:32:49 UTC (rev 10256)
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Xcaptcha module
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * 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.
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package Xcaptcha
+ * @since 2.6.0
+ * @author Laurent JEN (Aka DuGris)
+ * @version $Id$
+ */
+
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
+class XcaptchaCaptchaForm extends XoopsThemeForm
+{
+ /**
+ * @param null $obj
+ */
+ public function __construct($object = null)
+ {
+ $this->object = $object;
+ $this->config = $object->config;
+ }
+
+ /**
+ * Maintenance Form
+ * @return void
+ */
+ public function CaptchaForm()
+ {
+ $xoops = Xoops::getInstance();
+
+ parent::__construct('', 'xcaptchaform', $xoops->getEnv('PHP_SELF'), 'post', true, 'horizontal');
+
+ $activate = new XoopsFormRadio(_AM_XCAPTCHA_ACTIVATE, 'disabled', $this->config['disabled'] );
+ $activate->addOption(1, _AM_XCAPTCHA_ENABLE);
+ $activate->addOption(0, _AM_XCAPTCHA_DISABLE);
+ $this->addElement($activate, false);
+
+ $plugin_List = new XoopsFormSelect(_AM_XCAPTCHA_PLUGINS, 'mode', $this->config['mode'] );
+ $plugin_List->addOptionArray( $this->object->plugin_List );
+ $this->addElement($plugin_List, false);
+
+ $this->addElement(new XoopsFormText(_AM_XCAPTCHA_NAME, 'name', 50, 50, $this->config['name'] ), true);
+
+ $skipmember = new XoopsFormRadio(_AM_XCAPTCHA_SKIPMEMBER, 'skipmember', $this->config['skipmember'] );
+ $skipmember->addOption(1, _AM_XCAPTCHA_ENABLE);
+ $skipmember->addOption(0, _AM_XCAPTCHA_DISABLE);
+ $this->addElement($skipmember, false);
+
+ $this->addElement(new XoopsFormText(_AM_XCAPTCHA_MAXATTEMPTS, 'maxattempts', 2, 2, $this->config['maxattempts'] ), true);
+
+ $this->addElement(new XoopsFormHidden('type', 'config' ));
+
+ $button_tray = new XoopsFormElementTray('', '');
+ $button_tray->addElement(new XoopsFormHidden('op', 'save'));
+ $button_tray->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
+ $button_tray->addElement(new XoopsFormButton('', 'reset', _RESET, 'reset'));
+ $cancel_send = new XoopsFormButton('', 'cancel', _CANCEL, 'button');
+ $cancel_send->setExtra("onclick='javascript:history.go(-1);'");
+ $button_tray->addElement($cancel_send);
+
+ $this->addElement($button_tray);
+ }
+
+ public function render()
+ {
+ $this->CaptchaForm();
+ ob_start();
+ parent::render();
+ $ret = ob_get_contents();
+ ob_end_clean();
+ return $ret;
+ }
+}
+?>
\ No newline at end of file
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/class/form/captcha.php
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:keywords
+ Author Date Id Rev URL
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/class/form/image.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/class/form/image.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/class/form/image.php 2012-11-18 22:32:49 UTC (rev 10256)
@@ -0,0 +1,107 @@
+<?php
+/**
+ * Xcaptcha module
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * 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.
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package Xcaptcha
+ * @since 2.6.0
+ * @author Laurent JEN (Aka DuGris)
+ * @version $Id$
+ */
+
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
+class XcaptchaImageForm extends XoopsThemeForm
+{
+ /**
+ * @param null $obj
+ */
+ public function __construct($object = null)
+ {
+ $this->object = $object;
+ $this->config = $object->config;
+ }
+
+ /**
+ * Maintenance Form
+ * @return void
+ */
+ public function ImageForm()
+ {
+ $xoops = Xoops::getInstance();
+
+ parent::__construct('', 'xcaptchaform', $xoops->getEnv('PHP_SELF'), 'post', true, 'horizontal');
+
+ $this->addElement(new XoopsFormText(_XCAPTCHA_NUM_CHARS, 'num_chars', 2, 2, $this->config['num_chars'] ), true);
+
+ $this->addElement(new XoopsFormRadioYN(_XCAPTCHA_CASESENSITIVE, 'casesensitive', $this->config['casesensitive'], _YES, _NO));
+
+ $fontmin_form = new XoopsFormSelect(_XCAPTCHA_FONTSIZE_MIN, 'fontsize_min', $this->config['fontsize_min']);
+ for ($i = 10; $i <= 30; $i++) {
+ $fontmin_form->addOption($i, $i);
+ }
+ $this->addElement($fontmin_form, false);
+
+ $fontmax_form = new XoopsFormSelect(_XCAPTCHA_FONTSIZE_MAX, 'fontsize_max', $this->config['fontsize_max']);
+ for ($i = 10; $i <= 30; $i++) {
+ $fontmax_form->addOption($i, $i);
+ }
+ $this->addElement($fontmax_form, false);
+
+ $backtype_form = new XoopsFormSelect(_XCAPTCHA_BACKGROUND_TYPE, 'background_type', $this->config['background_type'], $size = 7);
+ $backtype_form->addOption(0, _XCAPTCHA_BACKGROUND_BAR);
+ $backtype_form->addOption(1, _XCAPTCHA_BACKGROUND_CIRCLE);
+ $backtype_form->addOption(2, _XCAPTCHA_BACKGROUND_LINE);
+ $backtype_form->addOption(3, _XCAPTCHA_BACKGROUND_RECTANGLE);
+ $backtype_form->addOption(4, _XCAPTCHA_BACKGROUND_ELLIPSE);
+ $backtype_form->addOption(5, _XCAPTCHA_BACKGROUND_POLYGONE);
+ $backtype_form->addOption(100, _XCAPTCHA_BACKGROUND_IMAGE);
+ $this->addElement($backtype_form, false);
+
+ $backnum_form = new XoopsFormSelect(_XCAPTCHA_BACKGROUND_NUM, 'background_num', $this->config['background_num']);
+ for ($i = 10; $i <= 100; $i = $i+10) {
+ $backnum_form->addOption($i, $i);
+ }
+ $this->addElement($backnum_form, false);
+
+ $polygon_point = new XoopsFormSelect(_XCAPTCHA_POLYGON_POINT, 'polygon_point', $this->config['polygon_point']);
+ for ($i = 3; $i <= 20; $i++) {
+ $polygon_point->addOption($i, $i);
+ }
+ $this->addElement($polygon_point, false);
+
+ $value = implode('|', $this->config['skip_characters']);
+ $this->addElement(new XoopsFormTextarea(_XCAPTCHA_SKIP_CHARACTERS, 'skip_characters', $value, 5, 50 ), true);
+
+ $this->addElement(new XoopsFormHidden('type', 'image' ));
+
+ $button_tray = new XoopsFormElementTray('', '');
+ $button_tray->addElement(new XoopsFormHidden('op', 'save'));
+ $button_tray->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
+ $button_tray->addElement(new XoopsFormButton('', 'reset', _RESET, 'reset'));
+ $cancel_send = new XoopsFormButton('', 'cancel', _CANCEL, 'button');
+ $cancel_send->setExtra("onclick='javascript:history.go(-1);'");
+ $button_tray->addElement($cancel_send);
+
+ $this->addElement($button_tray);
+ }
+
+ public function render()
+ {
+ $this->ImageForm();
+ ob_start();
+ parent::render();
+ $ret = ob_get_contents();
+ ob_end_clean();
+ return $ret;
+ }
+}
+?>
\ No newline at end of file
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/class/form/image.php
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:keywords
+ Author Date Id Rev URL
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/class/form/index.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/class/form/index.html (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/class/form/index.html 2012-11-18 22:32:49 UTC (rev 10256)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/class/form/recaptcha.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/class/form/recaptcha.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/class/form/recaptcha.php 2012-11-18 22:32:49 UTC (rev 10256)
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Xcaptcha module
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * 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.
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package Xcaptcha
+ * @since 2.6.0
+ * @author Laurent JEN (Aka DuGris)
+ * @version $Id$
+ */
+
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
+class XcaptchaRecaptchaForm extends XoopsThemeForm
+{
+ /**
+ * @param null $obj
+ */
+ public function __construct($object = null)
+ {
+ $this->object = $object;
+ $this->config = $object->config;
+ }
+
+ /**
+ * Maintenance Form
+ * @return void
+ */
+ public function RecaptchaForm()
+ {
+ $xoops = Xoops::getInstance();
+
+ parent::__construct('', 'xcaptchaform', $xoops->getEnv('PHP_SELF'), 'post', true, 'horizontal');
+
+ $this->addElement(new XoopsFormTextarea(_XCAPTCHA_PRIVATE_KEY, 'private_key', $this->config['private_key'], 5, 50 ), true);
+ $this->addElement(new XoopsFormTextarea(_XCAPTCHA_PUBLIC_KEY, 'public_key', $this->config['public_key'], 5, 50 ), true);
+
+ $theme_form = new XoopsFormSelect(_XCAPTCHA_THEME, 'theme', $this->config['theme'], $size = 4);
+ $theme_form->addOptionArray($this->object->getThemes() );
+ $this->addElement($theme_form, false);
+
+ $lang_form = new XoopsFormSelect(_XCAPTCHA_LANG, 'lang', $this->config['lang'], $size = 4);
+ $lang_form->addOptionArray($this->object->getLanguages() );
+ $this->addElement($lang_form, false);
+
+ $this->addElement(new XoopsFormHidden('type', 'recaptcha' ));
+
+ $button_tray = new XoopsFormElementTray('', '');
+ $button_tray->addElement(new XoopsFormHidden('op', 'save'));
+ $button_tray->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
+ $button_tray->addElement(new XoopsFormButton('', 'reset', _RESET, 'reset'));
+ $cancel_send = new XoopsFormButton('', 'cancel', _CANCEL, 'button');
+ $cancel_send->setExtra("onclick='javascript:history.go(-1);'");
+ $button_tray->addElement($cancel_send);
+
+ $this->addElement($button_tray);
+ }
+
+ public function render()
+ {
+ $this->RecaptchaForm();
+ ob_start();
+ parent::render();
+ $ret = ob_get_contents();
+ ob_end_clean();
+ return $ret;
+ }
+}
+?>
\ No newline at end of file
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/class/form/recaptcha.php
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:keywords
+ Author Date Id Rev URL
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/class/form/text.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/class/form/text.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/class/form/text.php 2012-11-18 22:32:49 UTC (rev 10256)
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Xcaptcha module
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * 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.
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package Xcaptcha
+ * @since 2.6.0
+ * @author Laurent JEN (Aka DuGris)
+ * @version $Id$
+ */
+
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
+class XcaptchaTextForm extends XoopsThemeForm
+{
+ /**
+ * @param null $obj
+ */
+ public function __construct($object = null)
+ {
+ $this->object = $object;
+ $this->config = $object->config;
+ }
+
+ /**
+ * Maintenance Form
+ * @return void
+ */
+ public function TextForm()
+ {
+ $xoops = Xoops::getInstance();
+
+ parent::__construct('', 'xcaptchaform', $xoops->getEnv('PHP_SELF'), 'post', true, 'horizontal');
+
+ $this->addElement(new XoopsFormText(_XCAPTCHA_NUM_CHARS, 'num_chars', 2, 2, $this->config['num_chars'] ), true);
+
+ $this->addElement(new XoopsFormHidden('type', 'text' ));
+
+ $button_tray = new XoopsFormElementTray('', '');
+ $button_tray->addElement(new XoopsFormHidden('op', 'save'));
+ $button_tray->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
+ $button_tray->addElement(new XoopsFormButton('', 'reset', _RESET, 'reset'));
+ $cancel_send = new XoopsFormButton('', 'cancel', _CANCEL, 'button');
+ $cancel_send->setExtra("onclick='javascript:history.go(-1);'");
+ $button_tray->addElement($cancel_send);
+
+ $this->addElement($button_tray);
+ }
+
+ public function render()
+ {
+ $this->TextForm();
+ ob_start();
+ parent::render();
+ $ret = ob_get_contents();
+ ob_end_clean();
+ return $ret;
+ }
+}
+?>
\ No newline at end of file
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/class/form/text.php
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:keywords
+ Author Date Id Rev URL
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/class/xcaptcha.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/class/xcaptcha.php 2012-11-18 22:30:39 UTC (rev 10255)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/class/xcaptcha.php 2012-11-18 22:32:49 UTC (rev 10256)
@@ -92,45 +92,6 @@
return $config;
}
- public function getForm()
- {
- $captcha_form = new XoopsThemeForm('', 'xcaptchaform', 'index.php', 'post', true);
-
- $activate = new XoopsFormRadio(_AM_XCAPTCHA_ACTIVATE, 'disabled', $this->config['disabled'] );
- $activate->addOption(1, _AM_XCAPTCHA_ENABLE);
- $activate->addOption(0, _AM_XCAPTCHA_DISABLE);
- $captcha_form->addElement($activate, false);
-
- $plugin_List = new XoopsFormSelect(_AM_XCAPTCHA_PLUGINS, 'mode', $this->config['mode'] );
- $plugin_List->addOptionArray( $this->plugin_List );
- $captcha_form->addElement($plugin_List, false);
-
- $captcha_form->addElement(new XoopsFormText(_AM_XCAPTCHA_NAME, 'name', 50, 50, $this->config['name'] ), true);
-
- $skipmember = new XoopsFormRadio(_AM_XCAPTCHA_SKIPMEMBER, 'skipmember', $this->config['skipmember'] );
- $skipmember->addOption(1, _AM_XCAPTCHA_ENABLE);
- $skipmember->addOption(0, _AM_XCAPTCHA_DISABLE);
- $captcha_form->addElement($skipmember, false);
-
- $captcha_form->addElement(new XoopsFormText(_AM_XCAPTCHA_MAXATTEMPTS, 'maxattempts', 2, 2, $this->config['maxattempts'] ), true);
-
-
- $captcha_form->addElement(new XoopsFormHidden('type', 'config' ));
-
- $button_tray = new XoopsFormElementTray('', '');
- $button_tray->addElement(new XoopsFormHidden('op', 'save'));
- $button_tray->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
- $button_tray->addElement(new XoopsFormButton('', 'reset', _RESET, 'reset'));
- $captcha_form->addElement($button_tray);
-
- ob_start();
- $captcha_form->render();
- $ret = ob_get_contents();
- ob_end_clean();
-
- return $ret;
- }
-
public function VerifyData()
{
global $system;
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/plugins/image.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/plugins/image.php 2012-11-18 22:30:39 UTC (rev 10255)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/plugins/image.php 2012-11-18 22:32:49 UTC (rev 10256)
@@ -36,70 +36,6 @@
$this->__construct();
}
- public function getForm()
- {
- $captcha_form = new XoopsThemeForm('', 'xcaptchaform', 'index.php', 'post', true);
-
- $captcha_form->addElement(new XoopsFormText(_XCAPTCHA_NUM_CHARS, 'num_chars', 2, 2, $this->config['num_chars'] ), true);
-
- $captcha_form->addElement(new XoopsFormRadioYN(_XCAPTCHA_CASESENSITIVE, 'casesensitive', $this->config['casesensitive'], _YES, _NO));
-
- $fontmin_form = new XoopsFormSelect(_XCAPTCHA_FONTSIZE_MIN, 'fontsize_min', $this->config['fontsize_min']);
- for ($i = 10; $i <= 30; $i++) {
- $fontmin_form->addOption($i, $i);
- }
- $captcha_form->addElement($fontmin_form, false);
-
- $fontmax_form = new XoopsFormSelect(_XCAPTCHA_FONTSIZE_MAX, 'fontsize_max', $this->config['fontsize_max']);
- for ($i = 10; $i <= 30; $i++) {
- $fontmax_form->addOption($i, $i);
- }
- $captcha_form->addElement($fontmax_form, false);
-
- $backtype_form = new XoopsFormSelect(_XCAPTCHA_BACKGROUND_TYPE, 'background_type', $this->config['background_type'], $size = 7);
- $backtype_form->addOption(0, _XCAPTCHA_BACKGROUND_BAR);
- $backtype_form->addOption(1, _XCAPTCHA_BACKGROUND_CIRCLE);
- $backtype_form->addOption(2, _XCAPTCHA_BACKGROUND_LINE);
- $backtype_form->addOption(3, _XCAPTCHA_BACKGROUND_RECTANGLE);
- $backtype_form->addOption(4, _XCAPTCHA_BACKGROUND_ELLIPSE);
- $backtype_form->addOption(5, _XCAPTCHA_BACKGROUND_POLYGONE);
- $backtype_form->addOption(100, _XCAPTCHA_BACKGROUND_IMAGE);
- $captcha_form->addElement($backtype_form, false);
-
- $backnum_form = new XoopsFormSelect(_XCAPTCHA_BACKGROUND_NUM, 'background_num', $this->config['background_num']);
- for ($i = 10; $i <= 100; $i = $i+10) {
- $backnum_form->addOption($i, $i);
- }
- $captcha_form->addElement($backnum_form, false);
-
- $polygon_point = new XoopsFormSelect(_XCAPTCHA_POLYGON_POINT, 'polygon_point', $this->config['polygon_point']);
- for ($i = 3; $i <= 20; $i++) {
- $polygon_point->addOption($i, $i);
- }
- $captcha_form->addElement($polygon_point, false);
-
- $value = implode('|', $this->config['skip_characters']);
- $captcha_form->addElement(new XoopsFormTextarea(_XCAPTCHA_SKIP_CHARACTERS, 'skip_characters', $value, 5, 50 ), true);
-
- $captcha_form->addElement(new XoopsFormHidden('type', 'image' ));
-
- $button_tray = new XoopsFormElementTray('', '');
- $button_tray->addElement(new XoopsFormHidden('op', 'save'));
- $button_tray->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
- $button_tray->addElement(new XoopsFormButton('', 'reset', _RESET, 'reset'));
- $cancel_send = new XoopsFormButton('', 'cancel', _CANCEL, 'button');
- $cancel_send->setExtra("onclick='javascript:history.go(-1);'");
- $button_tray->addElement($cancel_send);
- $captcha_form->addElement($button_tray);
-
- ob_start();
- $captcha_form->render();
- $ret = ob_get_contents();
- ob_end_clean();
-
- return $ret;
- }
-
public function VerifyData()
{
global $system;
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/plugins/recaptcha.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/plugins/recaptcha.php 2012-11-18 22:30:39 UTC (rev 10255)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/plugins/recaptcha.php 2012-11-18 22:32:49 UTC (rev 10256)
@@ -36,40 +36,6 @@
$this->__construct();
}
- function getForm()
- {
- $captcha_form = new XoopsThemeForm('', 'xcaptchaform', 'index.php', 'post', true);
-
- $captcha_form->addElement(new XoopsFormTextarea(_XCAPTCHA_PRIVATE_KEY, 'private_key', $this->config['private_key'], 5, 50 ), true);
- $captcha_form->addElement(new XoopsFormTextarea(_XCAPTCHA_PUBLIC_KEY, 'public_key', $this->config['public_key'], 5, 50 ), true);
-
- $theme_form = new XoopsFormSelect(_XCAPTCHA_THEME, 'theme', $this->config['theme'], $size = 4);
- $theme_form->addOptionArray($this->getThemes() );
- $captcha_form->addElement($theme_form, false);
-
- $lang_form = new XoopsFormSelect(_XCAPTCHA_LANG, 'lang', $this->config['lang'], $size = 4);
- $lang_form->addOptionArray($this->getLanguages() );
- $captcha_form->addElement($lang_form, false);
-
- $captcha_form->addElement(new XoopsFormHidden('type', 'recaptcha' ));
-
- $button_tray = new XoopsFormElementTray('', '');
- $button_tray->addElement(new XoopsFormHidden('op', 'save'));
- $button_tray->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
- $button_tray->addElement(new XoopsFormButton('', 'reset', _RESET, 'reset'));
- $cancel_send = new XoopsFormButton('', 'cancel', _CANCEL, 'button');
- $cancel_send->setExtra("onclick='javascript:history.go(-1);'");
- $button_tray->addElement($cancel_send);
- $captcha_form->addElement($button_tray);
-
- ob_start();
- $captcha_form->render();
- $ret = ob_get_contents();
- ob_end_clean();
-
- return $ret;
- }
-
function VerifyData()
{
global $xoopsConfig;
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/plugins/text.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/plugins/text.php 2012-11-18 22:30:39 UTC (rev 10255)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/plugins/text.php 2012-11-18 22:32:49 UTC (rev 10256)
@@ -36,31 +36,6 @@
$this->__construct();
}
- function getForm()
- {
- $captcha_form = new XoopsThemeForm('', 'xcaptchaform', 'index.php', 'post', true);
-
- $captcha_form->addElement(new XoopsFormText(_XCAPTCHA_NUM_CHARS, 'num_chars', 2, 2, $this->config['num_chars'] ), true);
-
- $captcha_form->addElement(new XoopsFormHidden('type', 'text' ));
-
- $button_tray = new XoopsFormElementTray('', '');
- $button_tray->addElement(new XoopsFormHidden('op', 'save'));
- $button_tray->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
- $button_tray->addElement(new XoopsFormButton('', 'reset', _RESET, 'reset'));
- $cancel_send = new XoopsFormButton('', 'cancel', _CANCEL, 'button');
- $cancel_send->setExtra("onclick='javascript:history.go(-1);'");
- $button_tray->addElement($cancel_send);
- $captcha_form->addElement($button_tray);
-
- ob_start();
- $captcha_form->render();
- $ret = ob_get_contents();
- ob_end_clean();
-
- return $ret;
- }
-
function VerifyData()
{
global $system;
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/xoops_version.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/xoops_version.php 2012-11-18 22:30:39 UTC (rev 10255)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/xoops_version.php 2012-11-18 22:32:49 UTC (rev 10256)
@@ -30,6 +30,7 @@
$modversion['image'] = 'images/xcaptcha_logo.png';
$modversion['dirname'] = 'xcaptcha';
+
//about
$modversion['release_date'] = '2012/10/01';
$modversion['module_website_url'] = 'dugris.xoofoo.org';
|
|
From: <du...@us...> - 2012-11-18 22:30:42
|
Revision: 10255
http://sourceforge.net/p/xoops/svn/10255
Author: dugris
Date: 2012-11-18 22:30:39 +0000 (Sun, 18 Nov 2012)
Log Message:
-----------
Fiw form, install, update
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/admin/index.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/class/xlanguage.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/xoops_version.php
Added Paths:
-----------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/class/form/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/class/form/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/class/form/language.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/install/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/install/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/install/install.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/install/update.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/admin/index.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/admin/index.php 2012-11-15 06:59:03 UTC (rev 10254)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/admin/index.php 2012-11-18 22:30:39 UTC (rev 10255)
@@ -44,16 +44,18 @@
case 'add':
$lang = $xlanguage_handler->create();
- $admin_page->addInfoBox(_MI_XLANGUAGE_ADD_LANG);
- $admin_page->addInfoBoxLine($lang->getForm());
+ $form = $xoops->getModuleForm($lang, 'language', 'xlanguage');
+ $admin_page->addInfoBox(_MI_XLANGUAGE_MODIFY);
+ $admin_page->addInfoBoxLine( $form->render() );
break;
case 'edit':
$xlanguage_id = $system->CleanVars($_REQUEST, 'xlanguage_id', 0, 'int');
if( isset($xlanguage_id) && $xlanguage_id > 0 ){
if ($lang = $xlanguage_handler->get($xlanguage_id) ) {
+ $form = $xoops->getModuleForm($lang, 'language', |
|
From: <ir...@us...> - 2012-11-15 06:59:10
|
Revision: 10254
http://sourceforge.net/p/xoops/svn/10254
Author: irmtfan
Date: 2012-11-15 06:59:03 +0000 (Thu, 15 Nov 2012)
Log Message:
-----------
feature add: add pdf and print permissions.
FAQ add: access denied in admin => permission.
Modified Paths:
--------------
XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt
XoopsModules/newbb/branches/irmtfan/newbb/class/permission.forum.php
XoopsModules/newbb/branches/irmtfan/newbb/class/post.php
XoopsModules/newbb/branches/irmtfan/newbb/docs/lang_diff.txt
XoopsModules/newbb/branches/irmtfan/newbb/docs/readme.txt
XoopsModules/newbb/branches/irmtfan/newbb/include/module.php
XoopsModules/newbb/branches/irmtfan/newbb/language/english/admin.php
XoopsModules/newbb/branches/irmtfan/newbb/language/english/main.php
XoopsModules/newbb/branches/irmtfan/newbb/language/persian/admin.php
XoopsModules/newbb/branches/irmtfan/newbb/language/persian/main.php
XoopsModules/newbb/branches/irmtfan/newbb/makepdf.php
XoopsModules/newbb/branches/irmtfan/newbb/print.php
Modified: XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt 2012-11-12 07:26:28 UTC (rev 10253)
+++ XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt 2012-11-15 06:59:03 UTC (rev 10254)
@@ -1,3 +1,13 @@
+date 2012-11-14
+===================================
+1- feature add: add pdf and print permissions. fix html and signature permission in new install.
+Important Note: you must set permissions for each group and each forum in newbb -> admin -> set permissions otherwise only newbb admins have permissions.
+in newbb/class/post.php, newbb/class/permission.forum.php, newbb/makepdf.php, newbb/print.php,
+ newbb/language/LANG/main.php, newbb/language/LANG/admin.php, newbb/docs/lang_diff.txt
+
+2- FAQ add: after submit in newbb => admin => permissions it said "Sorry, you don't have the permission to access this area"
+in newbb/docs/readme.txt
+
date |
|
From: <ir...@us...> - 2012-11-12 07:26:35
|
Revision: 10253
http://sourceforge.net/p/xoops/svn/10253
Author: irmtfan
Date: 2012-11-12 07:26:28 +0000 (Mon, 12 Nov 2012)
Log Message:
-----------
bug fix: in full div templates: replacing tr/td to span was incorrectly done
bug fix: add selecthtml=0 to the next search
Modified Paths:
--------------
XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt
XoopsModules/newbb/branches/irmtfan/newbb/search.php
XoopsModules/newbb/branches/irmtfan/newbb/templates_fulldiv_opacity/newbb_edit_post.html
Modified: XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt 2012-11-09 13:27:35 UTC (rev 10252)
+++ XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt 2012-11-12 07:26:28 UTC (rev 10253)
@@ -1,3 +1,11 @@
+date 2012-11-12
+===================================
+1- bug fix: in full div templates set: in smarty replace: replacing tr/td to span was incorrectly done
+in newbb/templates_fulldiv_opacity/newbb_edit_post.html
+
+2- bug fix: in newbb/search.php: add selecthtml=0 to the next search link
+in newbb/search.php
+
date 2012-11-08
===================================
1- bug fix: in viewforum.php?forum=XXX : change sort fields u.uname => t.topic_poster | t.topic_time => t.topic_id | "t.topic_ratings"=>_MD_RATINGS, | p.post_time => t.topic_last_post_id
Modified: XoopsModules/newbb/branches/irmtfan/newbb/search.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/search.php 2012-11-09 13:27:35 UTC (rev 10252)
+++ XoopsModules/newbb/branches/irmtfan/newbb/search.php 2012-11-12 07:26:28 UTC (rev 10253)
@@ -219,7 +219,7 @@
if (count($next_search)>0) {
$items = array();
foreach ($next_search as $para => $val) {
- if (!empty($val)) $items[] = "{$para}={$val}";// irmtfan add { and }
+ if (!empty($val) || $para == "selecthtml") $items[] = "{$para}={$val}";// irmtfan add { and } - add $para when selecthtml = 0 (no strip)
}
if (count($items)>0) $paras = implode("&",$items);
unset($next_search);
Modified: XoopsModules/newbb/branches/irmtfan/newbb/templates_fulldiv_opacity/newbb_edit_post.html
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/templates_fulldiv_opacity/newbb_edit_post.html 2012-11-09 13:27:35 UTC (rev 10252)
+++ XoopsModules/newbb/branches/irmtfan/newbb/templates_fulldiv_opacity/newbb_edit_post.html 2012-11-12 07:26:28 UTC (rev 10253)
@@ -53,7 +53,7 @@
<div class="xoops-form-element-help"><{$element.description}></div>
<{/if}>
</div>
- <div class="_col_end odd"><{$element.body|replace:'tr':'span'|replace:'td':'span'}></div>
+ <div class="_col_end odd"><{$element.body|replace:'<tr':'<span'|replace:'<td':'<span'|replace:'</tr':'</span'|replace:'</td':'</span'}></div>
<div class="clear"></div>
<{/if}>
<{/foreach}>
|
|
From: <txm...@us...> - 2012-11-11 13:16:28
|
Revision: 10199
http://xoops.svn.sourceforge.net/xoops/?rev=10199&view=rev
Author: txmodxoops
Date: 2012-11-11 13:16:21 +0000 (Sun, 11 Nov 2012)
Log Message:
-----------
Added mobile.css
Added Paths:
-----------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/mobile.css
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/mobile.css
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/mobile.css (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/mobile.css 2012-11-11 13:16:21 UTC (rev 10199)
@@ -0,0 +1,92 @@
+.text-align-center {
+ text-align: center;
+}
+.text-align-right {
+ text-align: right;
+}
+
+/** CSS for non-standard jQuery Mobile styles or Codiqa components **/
+.split-wrapper {
+ width: 100%;
+ min-height: 200px;
+ clear: both;
+}
+@media all and (min-width: 650px) {
+ .content-secondary {
+ text-align: left;
+ float: left;
+ width: 45%;
+ background: none;
+ padding: 1.5em 6% 3em 0;
+ margin: 0;
+ }
+ .content-secondary {
+ background: none;
+ border-top: none;
+ }
+ .content-primary {
+ width: 45%;
+ float: right;
+ margin-right: 1%;
+ padding-right: 1%;
+ }
+ .content-primary ul:first-child {
+ margin-top: 0;
+ }
+ .content-secondary ul.ui-listview, .content-secondary ul.ui-listview-inset {
+ margin: 0;
+ }
+ .content-secondary ul.ui-listview .ui-li-divider, .content-secondary ul.ui-listview .ui-li {
+ border-radius: 0px;
+ }
+ .content-secondary ul.ui-listview .ui-li {
+ border-left: 0;
+ border-right: 0;
+ }
+ .content-secondary h2 {
+ position: absolute;
+ left: -9999px;
+ }
+ .content-secondary .ui-li-divider {
+ padding-top: 1em;
+ padding-bottom: 1em;
+ }
+ .content-secondary {
+ margin: 0;
+ padding: 0;
+ }
+
+}
+@media all and (min-width: 750px){
+ .content-secondary {
+ width: 34%;
+ }
+ .content-primary {
+ width: 60%;
+ padding-right: 1%;
+ }
+}
+
+@media all and (min-width: 1200px){
+ .content-secondary {
+ width: 30%;
+ padding-right:6%;
+ margin: 0px 0 20px 5%;
+ }
+ .content-secondary ul {
+ margin: 0;
+ }
+ .content-secondary {
+ margin: 0;
+ padding: 0;
+ }
+ .content-primary {
+ width: 50%;
+ margin-right: 5%;
+ padding-right: 3%;
+ }
+ .content-primary {
+ width: 60%;
+ }
+}
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <du...@us...> - 2012-11-09 13:27:37
|
Revision: 10252
http://sourceforge.net/p/xoops/svn/10252
Author: dugris
Date: 2012-11-09 13:27:35 +0000 (Fri, 09 Nov 2012)
Log Message:
-----------
fix : renderNavigation
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php 2012-11-09 13:19:32 UTC (rev 10251)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php 2012-11-09 13:27:35 UTC (rev 10252)
@@ -346,11 +346,14 @@
{
$xoops = Xoops::getInstance();
- $path = XOOPS_URL . "/media/xoops/images/icons/32/";
$this->_obj->loadAdminMenu();
foreach (array_keys($this->_obj->adminmenu) as $i) {
if ($this->_obj->adminmenu[$i]['link'] == "admin/" . $menu) {
- $this->_obj->adminmenu[$i]['icon'] = $path . $this->_obj->adminmenu[$i]['icon'];
+ if ( file_exists($xoops->path("/media/xoops/images/icons/32/" . $this->_obj->adminmenu[$i]['icon']) ) ) {
+ $this->_obj->adminmenu[$i]['icon'] = $xoops->url("/media/xoops/images/icons/32/" . $this->_obj->adminmenu[$i]['icon']);
+ } else {
+ $this->_obj->adminmenu[$i]['icon'] = $xoops->url("/modules/" . $xoops->module->dirname() . "/icons/32/" . $this->_obj->adminmenu[$i]['icon']);
+ }
$xoops->tpl->assign('xo_sys_navigation', $this->_obj->adminmenu[$i]);
if ($xoops->tpl_name == '') {
$xoops->tpl->display($this->getTplPath('nav'));
|
|
From: <du...@us...> - 2012-11-09 13:19:36
|
Revision: 10251
http://sourceforge.net/p/xoops/svn/10251
Author: dugris
Date: 2012-11-09 13:19:32 +0000 (Fri, 09 Nov 2012)
Log Message:
-----------
fix : module renderindex
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/module.css
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php 2012-11-08 08:17:07 UTC (rev 10250)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php 2012-11-09 13:19:32 UTC (rev 10251)
@@ -258,16 +258,17 @@
$xoops = Xoops::getInstance();
$this->_obj->loadAdminMenu();
foreach (array_keys($this->_obj->adminmenu) as $i) {
-// if ($this->_obj->adminmenu[$i]['link'] != 'admin/index.php') {
- //$this->_obj->adminmenu[$i]['icon'] = XOOPS_URL . "/modules/" . $this->_obj->getVar('dirname') . "/" . $this->_obj->adminmenu[$i]['icon'];
- $this->_obj->adminmenu[$i]['icon'] = XOOPS_URL . "/media/xoops/images/icons/32/" . $this->_obj->adminmenu[$i]['icon'];
- $xoops->tpl->append('xo_admin_index_menu', $this->_obj->adminmenu[$i]);
-// }
+ if ( file_exists($xoops->path("/media/xoops/images/icons/32/" . $this->_obj->adminmenu[$i]['icon']) ) ) {
+ $this->_obj->adminmenu[$i]['icon'] = $xoops->url("/media/xoops/images/icons/32/" . $this->_obj->adminmenu[$i]['icon']);
+ } else {
+ $this->_obj->adminmenu[$i]['icon'] = $xoops->url("/modules/" . $xoops->module->dirname() . "/icons/32/" . $this->_obj->adminmenu[$i]['icon']);
+ }
+ $xoops->tpl->append('xo_admin_index_menu', $this->_obj->adminmenu[$i]);
}
if ($this->_obj->getInfo('help')) {
$help = array();
$help['link'] = '../system/help.php?mid=' . $this->_obj->getVar('mid', 's') . "&" . $this->_obj->getInfo('help');
- $help['icon'] = XOOPS_URL . "/media/xoops/images/icons/32/help.png";
+ $help['icon'] = $xoops->url("/media/xoops/images/icons/32/help.png");
$help['title'] = _AM_SYSTEM_HELP;
$xoops->tpl->append('xo_admin_index_menu', $help);
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/module.css
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/module.css 2012-11-08 08:17:07 UTC (rev 10250)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/module.css 2012-11-09 13:19:32 UTC (rev 10251)
@@ -147,7 +147,7 @@
font-family: arial,helvetica,sans-serif;
margin: 3px 3px 5px;
overflow: hidden;
- width: 250px;
+ width: 244px;
}
.xo-module-list .system {
background: none repeat scroll 0 0 #faeaea;
|
|
From: <ir...@us...> - 2012-11-08 08:17:10
|
Revision: 10250
http://sourceforge.net/p/xoops/svn/10250
Author: irmtfan
Date: 2012-11-08 08:17:07 +0000 (Thu, 08 Nov 2012)
Log Message:
-----------
bug fix: in viewforum.php?forum=XXX : change sort fields
Modified Paths:
--------------
XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt
XoopsModules/newbb/branches/irmtfan/newbb/viewforum.php
Modified: XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt 2012-11-07 16:18:31 UTC (rev 10249)
+++ XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt 2012-11-08 08:17:07 UTC (rev 10250)
@@ -1,3 +1,8 @@
+date 2012-11-08
+===================================
+1- bug fix: in viewforum.php?forum=XXX : change sort fields u.uname => t.topic_poster | t.topic_time => t.topic_id | "t.topic_ratings"=>_MD_RATINGS, | p.post_time => t.topic_last_post_id
+in newbb/viewforum.php
+
date 2012-11-07
===================================
1- bug fix: in XOOPSCORE/search.php $xoopsModuleConfig and $xoopsModule is not set
Modified: XoopsModules/newbb/branches/irmtfan/newbb/viewforum.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/viewforum.php 2012-11-07 16:18:31 UTC (rev 10249)
+++ XoopsModules/newbb/branches/irmtfan/newbb/viewforum.php 2012-11-08 08:17:07 UTC (rev 10250)
@@ -142,8 +142,8 @@
$xoopsTpl->assign('forum_name', $forum_obj->getVar('forum_name'));
$xoopsTpl->assign('forum_moderators', $forum_obj->disp_forumModerators());
-
-$sel_sort_array = array("t.topic_title"=>_MD_TOPICTITLE, "u.uname"=>_MD_TOPICPOSTER, "t.topic_time"=>_MD_TOPICTIME, "t.topic_replies"=>_MD_NUMBERREPLIES, "t.topic_views"=>_MD_VIEWS, "p.post_time"=>_MD_LASTPOSTTIME);
+// irmtfan - add and edit: u.uname => t.topic_poster | t.topic_time => t.topic_id | "t.topic_ratings"=>_MD_RATINGS, | p.post_time => t.topic_last_post_id
+$sel_sort_array = array("t.topic_title"=>_MD_TOPICTITLE, "t.topic_poster"=>_MD_TOPICPOSTER, "t.topic_id"=>_MD_TOPICTIME, "t.topic_replies"=>_MD_NUMBERREPLIES, "t.topic_views"=>_MD_VIEWS, "t.topic_ratings"=>_MD_RATINGS, "t.topic_last_post_id"=>_MD_LASTPOSTTIME);
if ( !isset($_GET['sort']) || !in_array($_GET['sort'], array_keys($sel_sort_array)) ) {
$sort = "t.topic_last_post_id";
} else {
@@ -175,13 +175,14 @@
unset($query_sort["sort"], $query_sort["order"]);
$page_query_sort = implode("&", array_values($query_sort));
unset($query_sort);
+// irmtfan - edit: u.uname => t.topic_poster | t.topic_time => t.topic_id | p.post_time => t.topic_last_post_id
$xoopsTpl->assign('h_topic_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_sort}&sort=t.topic_title&order=". (($sort == "t.topic_title" && $order == "DESC") ? "ASC" : "DESC"));
$xoopsTpl->assign('h_reply_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_sort}&sort=t.topic_replies&order=". (($sort == "t.topic_replies" && $order == "DESC") ? "ASC" : "DESC"));
-$xoopsTpl->assign('h_poster_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_sort}&sort=u.uname&order=". (($sort == "u.uname" && $order == "DESC") ? "ASC" : "DESC"));
+$xoopsTpl->assign('h_poster_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_sort}&sort=t.topic_poster&order=". (($sort == "t.topic_poster" && $order == "DESC") ? "ASC" : "DESC"));
$xoopsTpl->assign('h_views_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_sort}&sort=t.topic_views&order=". (($sort == "t.topic_views" && $order == "DESC") ? "ASC" : "DESC"));
$xoopsTpl->assign('h_rating_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_sort}&sort=t.topic_ratings&order=". (($sort == "t.topic_ratings" && $order == "DESC") ? "ASC" : "DESC"));
-$xoopsTpl->assign('h_date_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_sort}&sort=p.post_time&order=". (($sort == "p.post_time" && $order == "DESC") ? "ASC" : "DESC"));
-$xoopsTpl->assign('h_publish_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_sort}&sort=t.topic_time&order=". (($sort == "t.topic_time" && $order == "DESC") ? "ASC" : "DESC"));
+$xoopsTpl->assign('h_date_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_sort}&sort=t.topic_last_post_id&order=". (($sort == "t.topic_last_post_id" && $order == "DESC") ? "ASC" : "DESC"));
+$xoopsTpl->assign('h_publish_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_sort}&sort=t.topic_id&order=". (($sort == "t.topic_id" && $order == "DESC") ? "ASC" : "DESC"));
$xoopsTpl->assign('forum_since', $since); // For $since in search.php
// irmtfan - if no since it should be 0
|
8 messages has been excluded from this view by a project administrator.
