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) |
|
From: <dj...@us...> - 2012-02-15 00:45:48
|
Revision: 8974
http://xoops.svn.sourceforge.net/xoops/?rev=8974&view=rev
Author: djculex
Date: 2012-02-15 00:45:42 +0000 (Wed, 15 Feb 2012)
Log Message:
-----------
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/js/smallworld.js
Modified: XoopsModules/smallworld/trunk/smallworld/js/smallworld.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2012-02-15 00:39:40 UTC (rev 8973)
+++ XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2012-02-15 00:45:42 UTC (rev 8974)
@@ -284,10 +284,10 @@
// Function to reset gender, relationshipstatus,politics an religion select:Selected in forms after send and in pagerefresh
xoops_smallworld(function() {
- if (smallworld_PageName == 'register.php' && smallworld_PageName == 'editprofile.php') {
+ if (smallworld_PageName == 'register.php' || smallworld_PageName == 'editprofile.php') {
var sw_data;
xoops_smallworld.ajax({
- url: smallworld_url+"include/getSelects.php"+ Math.random(),
+ url: smallworld_url+"include/getSelects.php?"+ Math.random(),
cache: false,
dataType: "json",
success: function(sw_data) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-02-15 00:39:46
|
Revision: 8973
http://xoops.svn.sourceforge.net/xoops/?rev=8973&view=rev
Author: djculex
Date: 2012-02-15 00:39:40 +0000 (Wed, 15 Feb 2012)
Log Message:
-----------
- Bugfix: Aply function to only run getSelects.php on register.php and editprofile.php.
- Bugfix: removed anoying pop up [object, object] error
- Change: adjusted jSon returned from checks
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/Get_Count.php
XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt
XoopsModules/smallworld/trunk/smallworld/include/getSelects.php
XoopsModules/smallworld/trunk/smallworld/js/smallworld.js
Modified: XoopsModules/smallworld/trunk/smallworld/Get_Count.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/Get_Count.php 2012-02-14 17:35:36 UTC (rev 8972)
+++ XoopsModules/smallworld/trunk/smallworld/Get_Count.php 2012-02-15 00:39:40 UTC (rev 8973)
@@ -28,9 +28,9 @@
$_COOKIE[session_name()] = session_id();
if ($xoopsUser) {
if($_GET['SmallworldGetUserMsgCount']) {
- $counts = smallworld_getCountFriendMessagesEtc ();
+ $counts = smallworld_getCountFriendMessagesEtc();
header('Content-type: application/json');
- echo "{\"NewUserMsgCount\":$counts}";
+ echo "{\"NewUserMsgCount\":\"$counts\"}";
}
}
?>
\ No newline at end of file
Modified: XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt 2012-02-14 17:35:36 UTC (rev 8972)
+++ XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt 2012-02-15 00:39:40 UTC (rev 8973)
@@ -30,6 +30,12 @@
- Change: Minor css adjustments
- land_diff: see docs/lang_diff.txt for 2 changes in lang/js/variables.js
+14. February
+- Bugfix: Aply function to only run getSelects.php on register and editprofile.php.
+- Bugfix: removed anoying pop up [object, object] error
+- Change: adjusted jSon returned from checks
+
+
------------------------------
Changelog v.1.10 RC
------------------------------
Modified: XoopsModules/smallworld/trunk/smallworld/include/getSelects.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/include/getSelects.php 2012-02-14 17:35:36 UTC (rev 8972)
+++ XoopsModules/smallworld/trunk/smallworld/include/getSelects.php 2012-02-15 00:39:40 UTC (rev 8973)
@@ -25,7 +25,7 @@
include_once(XOOPS_ROOT_PATH."/modules/smallworld/class/class_collector.php");
global $xoopsUser, $xoopsModule,$xoopsLogger;
$xoopsLogger->activated = false;
- if (is_object($xoopsUser)) {
+ if ($xoopsUser) {
$db = new SmallWorldDB;
$id = $xoopsUser->getVar('uid');
$relat = $db->getVar($id,'relationship');
@@ -33,7 +33,7 @@
$gender = $db->getVar($id,'gender');
$politic = $db->getVar($id,'politic');
$religion = $db->getVar($id,'religion');
- header('Content-type: "application/json"');
- echo "{\"relat\": \"$relat \", \"partner\": \"$partner \", \"gender\": \"$gender \", \"politic\": \"$politic \", \"religion\": \"$religion \"}";
+ header('Content-type: "application/json"');
+ echo "{\"relat\":\"$relat \", \"partner\":\"$partner \", \"gender\":\"$gender \", \"politic\":\"$politic \", \"religion\":\"$religion \"}";
}
?>
\ No newline at end of file
Modified: XoopsModules/smallworld/trunk/smallworld/js/smallworld.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2012-02-14 17:35:36 UTC (rev 8972)
+++ XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2012-02-15 00:39:40 UTC (rev 8973)
@@ -15,6 +15,10 @@
//Attach function for avatar
attachAvatarOpen ();
+ // Get page url and page title (index.php)
+ var smallworld_pageUrl = window.location.pathname;
+ var smallworld_PageName = smallworld_pageUrl.substring(smallworld_pageUrl.lastIndexOf('/') + 1);
+
// GET pop for statistics
xoops_smallworld('#smallworld_statistics_lnk').live('click',function() {
if (xoops_smallworld('#smallworld_statistics_lnk').length) { // implies *not* zero
@@ -33,7 +37,7 @@
href:"#smallworldStatsDiv"
});
};
- });
+ });
// Attach colorbox.js to selector in register.php and edit_profile.php
// If other page / no presence of #smallworld_regform1 then exit function and continue
@@ -280,28 +284,31 @@
// Function to reset gender, relationshipstatus,politics an religion select:Selected in forms after send and in pagerefresh
xoops_smallworld(function() {
+ if (smallworld_PageName == 'register.php' && smallworld_PageName == 'editprofile.php') {
var sw_data;
- xoops_smallworld.ajax({
- url: smallworld_url+"include/getSelects.php",
- cache: false,
- dataType: "json",
- success: function(sw_data) {
- response = jQuery.parseJSON(sw_data);
- xoops_smallworld("select[name=gender] option[value="+sw_data.gender+"]").attr("selected", true);
- xoops_smallworld("select[name=relationship] option[value="+sw_data.relat+"]").attr("selected", true);
- if (sw_data.relat == 2) {
- xoops_smallworld("#partner").hide();
- xoops_smallworld("p.partner").hide();
- }
- if (sw_data.relat != 2) {
- xoops_smallworld("#partner").show();
- xoops_smallworld("p.partner").show();
- }
- xoops_smallworld("select[name=politic] option[value="+sw_data.politic+"]").attr("selected", true);
- xoops_smallworld("select[name=religion] option[value="+sw_data.religion+"]").attr("selected", true);
- },
- error: function(xhr, status, thrown) {alert(xhr+" "+status+" "+thrown);}
+ xoops_smallworld.ajax({
+ url: smallworld_url+"include/getSelects.php"+ Math.random(),
+ cache: false,
+ dataType: "json",
+ success: function(sw_data) {
+ xoops_smallworld("select[name=gender] option[value="+sw_data.gender+"]").attr("selected", true);
+ xoops_smallworld("select[name=relationship] option[value="+sw_data.relat+"]").attr("selected", true);
+ if (sw_data.relat == 2) {
+ xoops_smallworld("#partner").hide();
+ xoops_smallworld("p.partner").hide();
+ }
+ if (sw_data.relat != 2) {
+ xoops_smallworld("#partner").show();
+ xoops_smallworld("p.partner").show();
+ }
+ xoops_smallworld("select[name=politic] option[value="+sw_data.politic+"]").attr("selected", true);
+ xoops_smallworld("select[name=religion] option[value="+sw_data.religion+"]").attr("selected", true);
+ },
+ error: function(xhr, status, thrown) {
+ alert(xhr+" "+status+" "+thrown);
+ }
});
+ }
});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wis...@us...> - 2012-02-14 17:35:45
|
Revision: 8972
http://xoops.svn.sourceforge.net/xoops/?rev=8972&view=rev
Author: wishcraft
Date: 2012-02-14 17:35:36 +0000 (Tue, 14 Feb 2012)
Log Message:
-----------
* Duplicate Meta Entries Fix (Abridged on Trabis Forum Solution) - class/theme.php
* exit(0); missing preloader call before calling in - class/xoops.php
* Better Statistic Model for Persistence Handler - class/model/stats.php
* Date problem work around definition of XOBJ_DTYPE_DATE for passing date to date field type in MySQL, Postgres, MSSQL and other DB Platforms.
* Time problem work around definition of XOBJ_DTYPE_TIME for passing date to date field type in MySQL, Postgres, MSSQL and other DB Platforms.
* Timestamp problem work around definition of XOBJ_DTYPE_TIMESTAMP for passing date to date field type in MySQL, Postgres, MSSQL and other DB Platforms.
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/stats.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/write.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/theme.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/object.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/global.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/stats.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/stats.php 2012-02-14 16:32:37 UTC (rev 8971)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/stats.php 2012-02-14 17:35:36 UTC (rev 8972)
@@ -100,4 +100,326 @@
}
return $ret;
}
+
+ /**
+ * get sum of field matching a condition
+ *
+ * @param string $field field to base sum on to match in criteria if set
+ * @param CriteriaElement|null $criteria {@link CriteriaElement} to match
+ * @return array of counts
+ */
+ public function getSum($field, $criteria = NULL) {
+ if (empty($field)) {
+ return false;
+ }
+ $idxfield = '';
+ $groupby = false;
+ if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
+ if ($criteria->getGroupby() != '') {
+ $groupby = true;
+ $idxfield = $criteria->getGroupby() . ", ";
+ }
+ }
+ if ($groupby == false) {
+ $sql = "SELECT sum(`$field`) as result FROM `" . $this->table . "`";
+ } else {
+ $sql = "SELECT `$idxfield`, sum(`$field`) as result FROM `" . $this->table . "`";
+ }
+ if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
+ $sql .= ' ' . $criteria->renderWhere();
+ $sql .= $criteria->getGroupby();
+ }
+ $result = $this->handler->db->query($sql);
+ if (!$result) {
+ return 0;
+ }
+ if ($groupby == false) {
+ list ($sum) = $this->handler->db->fetchRow($result);
+ return $sum;
+ } else {
+ $ret = array();
+ while (list ($id, $sum) = $this->handler->db->fetchRow($result)) {
+ $ret[$id] = $sum;
+ }
+ return $ret;
+ }
+ }
+
+ /**
+ * get average of field matching a condition
+ *
+ * @param string $field field to base average on to match in criteria if set
+ * @param CriteriaElement|null $criteria {@link CriteriaElement} to match
+ * @return array of counts
+ */
+ function getAverage($field, $criteria = NULL) {
+ if (empty($field)) {
+ return false;
+ }
+ $idxfield = '';
+ $groupby = false;
+ if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
+ if ($criteria->getGroupby() != '') {
+ $groupby = true;
+ $idxfield = $criteria->getGroupby() . ", ";
+ }
+ }
+ if ($groupby==false) {
+ $sql = "SELECT avg(`$field`) as result FROM `" . $this->table . "`";
+ } else {
+ $sql = "SELECT `$idxfield`, avg(`$field`) as result FROM `" . $this->table . "`";
+ }
+ if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
+ $sql .= ' ' . $criteria->renderWhere();
+ $sql .= $criteria->getGroupby();
+ }
+ $result = $this->handler->db->query($sql);
+ if (!$result) {
+ return 0;
+ }
+ if ($groupby == false) {
+ list ($avg) = $this->handler->db->fetchRow($result);
+ return $avg;
+ } else {
+ $ret = array();
+ while (list ($id, $avg) = $this->handler->db->fetchRow($result)) {
+ $ret[$id] = $avg;
+ }
+ return $ret;
+ }
+ }
+
+ /**
+ * get maximum of field matching a condition
+ *
+ * @param string $field field to base maximum value on
+ * @param CriteriaElement|null $criteria {@link CriteriaElement} to match
+ * @return array of counts
+ */
+ function getMaximum($field, $criteria = NULL) {
+ if (empty($field)) {
+ return false;
+ }
+ $idxfield = '';
+ $groupby = false;
+ if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
+ if ($criteria->getGroupby() != '') {
+ $groupby = true;
+ $idxfield = $criteria->getGroupby() . ", ";
+ }
+ }
+ if ($groupby==false) {
+ $sql = "SELECT max(`$field`) as result FROM `" . $this->table . "`";
+ } else {
+ $sql = "SELECT `$idxfield`, max(`$field`) as result FROM `" . $this->table . "`";
+ }
+ if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
+ $sql .= ' ' . $criteria->renderWhere();
+ $sql .= $criteria->getGroupby();
+ }
+ $result = $this->handler->db->query($sql);
+ if (!$result) {
+ return 0;
+ }
+ if ($groupby == false) {
+ list ($max) = $this->handler->db->fetchRow($result);
+ return $max;
+ } else {
+ $ret = array();
+ while (list ($id, $max) = $this->handler->db->fetchRow($result)) {
+ $ret[$id] = $max;
+ }
+ return $ret;
+ }
+ }
+
+ /**
+ * get minimum of field matching a condition
+ *
+ * @param string $field field to base minimum value on
+ * @param CriteriaElement|null $criteria {@link CriteriaElement} to match
+ * @return array of counts
+ */
+ function getMinimum($field, $criteria = NULL) {
+ if (empty($field)) {
+ return false;
+ }
+ $idxfield = '';
+ $groupby = false;
+ if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
+ if ($criteria->getGroupby() != '') {
+ $groupby = true;
+ $idxfield = $criteria->getGroupby() . ", ";
+ }
+ }
+ if ($groupby==false) {
+ $sql = "SELECT min(`$field`) as result FROM `" . $this->table . "`";
+ } else {
+ $sql = "SELECT `$idxfield`, min(`$field`) as result FROM `" . $this->table . "`";
+ }
+ if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
+ $sql .= ' ' . $criteria->renderWhere();
+ $sql .= $criteria->getGroupby();
+ }
+ $result = $this->handler->db->query($sql);
+ if (!$result) {
+ return 0;
+ }
+ if ($groupby == false) {
+ list ($min) = $this->handler->db->fetchRow($result);
+ return $min;
+ } else {
+ $ret = array();
+ while (list ($id, $min) = $this->handler->db->fetchRow($result)) {
+ $ret[$id] = $min;
+ }
+ return $ret;
+ }
+ }
+
+ /**
+ * get standard deviation of field matching a condition
+ *
+ * @param string $field field to base standard deviation value on
+ * @param CriteriaElement|null $criteria {@link CriteriaElement} to match
+ * @return array of counts
+ */
+ function getDeviation($field, $criteria = NULL) {
+ if (empty($field)) {
+ return false;
+ }
+ $idxfield = '';
+ $groupby = false;
+ if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
+ if ($criteria->getGroupby() != '') {
+ $groupby = true;
+ $idxfield = $criteria->getGroupby() . ", ";
+ }
+ }
+ if ($groupby==false) {
+ $sql = "SELECT stddev(`$field`) as result FROM `" . $this->table . "`";
+ } else {
+ $sql = "SELECT `$idxfield`, stddev(`$field`) as result FROM `" . $this->table . "`";
+ }
+ if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
+ $sql .= ' ' . $criteria->renderWhere();
+ $sql .= $criteria->getGroupby();
+ }
+ $result = $this->handler->db->query($sql);
+ if (!$result) {
+ return 0;
+ }
+ if ($groupby == false) {
+ list ($stddev) = $this->handler->db->fetchRow($result);
+ return $stddev;
+ } else {
+ $ret = array();
+ while (list ($id, $stddev) = $this->handler->db->fetchRow($result)) {
+ $ret[$id] = $stddev;
+ }
+ return $ret;
+ }
+ }
+
+ /**
+ * get standard variance of field matching a condition
+ *
+ * @param string $field field to base standard variance value on
+ * @param CriteriaElement|null $criteria {@link CriteriaElement} to match
+ * @return array of counts
+ */
+ function getVariance($field, $criteria = NULL) {
+ if (empty($field)) {
+ return false;
+ }
+ $idxfield = '';
+ $groupby = false;
+ if ($criteria->getGroupby() != '') {
+ if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
+ $groupby = true;
+ $idxfield = $criteria->getGroupby() . ", ";
+ }
+ }
+ if ($groupby==false) {
+ $sql = "SELECT variance(`$field`) as result FROM `" . $this->table . "`";
+ } else {
+ $sql = "SELECT `$idxfield`, variance(`$field`) as result FROM `" . $this->table . "`";
+ }
+ if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
+ $sql .= ' ' . $criteria->renderWhere();
+ $sql .= $criteria->getGroupby();
+ }
+ $result = $this->handler->db->query($sql);
+ if (!$result) {
+ return 0;
+ }
+ if ($groupby == false) {
+ list ($variance) = $this->handler->db->fetchRow($result);
+ return $variance;
+ } else {
+ $ret = array();
+ while (list ($id, $variance) = $this->handler->db->fetchRow($result)) {
+ $ret[$id] = $variance;
+ }
+ return $ret;
+ }
+ }
+
+ /**
+ * get CriteriaElement Object based on a filter string
+ *
+ * @param string $filter string to base filter on of criteria element
+ * @return CriteriaElement|null $criteria {@link CriteriaElement}
+ */
+ function getFilterCriteria($filter) {
+ $parts = explode('|', $filter);
+ $criteria = new CriteriaCompo();
+ foreach($parts as $part) {
+ $var = explode(',', $part);
+ if (!empty($var[1])&&!is_numeric($var[0])) {
+ $object = $this->create();
+ if ( $object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTBOX ||
+ $object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTAREA) {
+ $criteria->add(new Criteria('`'.$var[0].'`', '%'.$var[1].'%', (isset($var[2])?$var[2]:'LIKE')));
+ } elseif ( $object->vars[$var[0]]['data_type']==XOBJ_DTYPE_INT ||
+ $object->vars[$var[0]]['data_type']==XOBJ_DTYPE_DECIMAL ||
+ $object->vars[$var[0]]['data_type']==XOBJ_DTYPE_FLOAT ) {
+ $criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));
+ } elseif ( $object->vars[$var[0]]['data_type']==XOBJ_DTYPE_STIME ||
+ $object->vars[$var[0]]['data_type']==XOBJ_DTYPE_MTIME ||
+ $object->vars[$var[0]]['data_type']==XOBJ_DTYPE_LTIME ) {
+ if (is_string($var[1])) {
+ $criteria->add(new Criteria('`'.$var[0].'`', strtotime($var[1]), (isset($var[2])?$var[2]:'=')));
+ } elseif (is_numeric($var[1])) {
+ $criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));
+ }
+ } elseif ( $object->vars[$var[0]]['data_type']==XOBJ_DTYPE_DATE ) {
+ if (is_numeric($var[1])&&!is_string($var[1])) {
+ $criteria->add(new Criteria('`'.$var[0].'`', date(_DBDATESTRING, $var[1]), (isset($var[2])?$var[2]:'=')));
+ } else {
+ $criteria->add(new Criteria('`'.$var[0].'`', date(_DBDATESTRING, strtotime($var[1])), (isset($var[2])?$var[2]:'=')));
+ }
+ } elseif ( $object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TIME ) {
+ if (is_numeric($var[1])&&!is_string($var[1])) {
+ $criteria->add(new Criteria('`'.$var[0].'`', date(_DBTIMESTRING, $var[1]), (isset($var[2])?$var[2]:'=')));
+ } else {
+ $criteria->add(new Criteria('`'.$var[0].'`', date(_DBTIMESTRING, strtotime($var[1])), (isset($var[2])?$var[2]:'=')));
+ }
+ } elseif ( $object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TIMESTAMP ) {
+ if (is_numeric($var[1])&&!is_string($var[1])) {
+ $criteria->add(new Criteria('`'.$var[0].'`', date(_DBTIMESTAMPSTRING, $var[1]), (isset($var[2])?$var[2]:'=')));
+ } else {
+ $criteria->add(new Criteria('`'.$var[0].'`', date(_DBTIMESTAMPSTRING, strtotime($var[1])), (isset($var[2])?$var[2]:'=')));
+ }
+ } elseif ( $object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ENUM ) {
+ $criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));
+ } elseif ( $object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ARRAY ) {
+ $criteria->add(new Criteria('`'.$var[0].'`', '%"'.$var[1].'";%', (isset($var[2])?$var[2]:'LIKE')));
+ }
+ } elseif (!empty($var[1])&&is_numeric($var[0])) {
+ $criteria->add(new Criteria("'".$var[0]."'", $var[1]));
+ }
+ }
+ return $criteria;
+ }
}
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/write.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/write.php 2012-02-14 16:32:37 UTC (rev 8971)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/write.php 2012-02-14 17:35:36 UTC (rev 8972)
@@ -58,7 +58,19 @@
}
$cleanv = $v['value'];
switch ($v["data_type"]) {
-
+
+ case XOBJ_DTYPE_TIMESTAMP:
+ $cleanv = !is_string($cleanv)&&is_numeric($cleanv) ? date(_DBTIMESTAMPSTRING, $cleanv) : date(_DBTIMESTAMPSTRING, strtotime($cleanv));
+ break;
+
+ case XOBJ_DTYPE_TIME:
+ $cleanv = !is_string($cleanv)&&is_numeric($cleanv) ? date(_DBTIMESTRING, $cleanv) : date(_DBTIMESTRING, strtotime($cleanv));
+ break;
+
+ case XOBJ_DTYPE_DATE:
+ $cleanv = !is_string($cleanv)&&is_numeric($cleanv) ? date(_DBDATESTRING, $cleanv) : date(_DBDATESTRING, strtotime($cleanv));
+ break;
+
case XOBJ_DTYPE_TXTBOX:
if ($v['required'] && $cleanv != '0' && $cleanv == '') {
$errors[] = sprintf(_XOBJ_ERR_REQUIRED, $k);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/theme.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/theme.php 2012-02-14 16:32:37 UTC (rev 8971)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/theme.php 2012-02-14 17:35:36 UTC (rev 8972)
@@ -581,40 +581,43 @@
/**
* *#@+
+ *
* @tasktype 20 Manipulating page meta-information
*/
/**
* Adds script code to the document head
+ *
* This methods allows the insertion of an external script file (if $src is provided), or
* of a script snippet. The file URI is parsed to take benefit of the theme resource
* overloading system.
+ *
* The $attributes parameter allows you to specify the attributes that will be added to the
* inserted <script> tag. If unspecified, the <var>type</var> attribute value will default to
* 'text/javascript'.
+ *
* <code>
* // Add an external script using a physical path
* $theme->addScript( 'www/script.js', null, '' );
* $theme->addScript( 'modules/newbb/script.js', null, '' );
* // Specify attributes for the <script> tag
- * $theme->addScript( 'mod_xoops_SiteManager#common.js', array( 'type' => 'application/x-javascript' ), '' );
+ * $theme->addScript( 'mod_xoops_SiteManager#common.js', array( 'type' => 'application/x-javascript' ), '', 'mod_xoops_Sitemanager' );
* // Insert a code snippet
- * $theme->addScript( null, array( 'type' => 'application/x-javascript' ), 'window.open("Hello world");' );
+ * $theme->addScript( null, array( 'type' => 'application/x-javascript' ), 'window.open("Hello world");', 'hello' );
* </code>
*
- * @param string $src path to an external script file
- * @param array $attributes hash of attributes to add to the <script> tag
- * @param string $content Code snippet to output within the <script> tag
- *
+ * @param string $src path to an external script file
+ * @param array $attributes hash of attributes to add to the <script> tag
+ * @param string $content Code snippet to output within the <script> tag
+ * @param string $name Element Name in array scripts are stored in.
* @return void
*/
- public function addScript($src = '', $attributes = array(), $content = '')
+ function addScript($src = '', $attributes = array(), $content = '', $name = '')
{
- $xoops = Xoops::getInstance();
if (empty($attributes)) {
$attributes = array();
}
if (!empty($src)) {
- $src = $xoops->url($this->resourcePath($src));
+ $src = $GLOBALS['xoops']->url($this->resourcePath($src));
$attributes['src'] = $src;
}
if (!empty($content)) {
@@ -623,26 +626,29 @@
if (!isset($attributes['type'])) {
$attributes['type'] = 'text/javascript';
}
- $this->addMeta('script', $src, $attributes);
+ if (empty($name)) {
+ $name = md5(serialize($attributes));
+ }
+ $this->addMeta('script', $name, $attributes);
}
+
/**
* Add StyleSheet or CSS code to the document head
*
- * @param string|null $src path to .css file
- * @param array|null $attributes name => value paired array of attributes such as title
- * @param string $content CSS code to output between the <style> tags (in case $src is empty)
- *
+ * @param string $src path to .css file
+ * @param array $attributes name => value paired array of attributes such as title
+ * @param string $content CSS code to output between the <style> tags (in case $src is empty)
+ * @param string $name Element Name in array stylesheets are stored in.
* @return void
*/
- public function addStylesheet($src = '', $attributes = array(), $content = '')
+ function addStylesheet($src = '', $attributes = array(), $content = '', $name = '')
{
- $xoops = Xoops::getInstance();
if (empty($attributes)) {
$attributes = array();
}
if (!empty($src)) {
- $src = $xoops->url($this->resourcePath($src));
+ $src = $GLOBALS['xoops']->url($this->resourcePath($src));
$attributes['href'] = $src;
}
if (!isset($attributes['type'])) {
@@ -651,17 +657,21 @@
if (!empty($content)) {
$attributes['_'] = $content;
}
- $this->addMeta('stylesheet', $src, $attributes);
+ if (empty($name)) {
+ $name = md5(serialize($attributes));
+ }
+ $this->addMeta('stylesheet', $name, $attributes);
}
/**
* Add a <link> to the header
*
- * @param string $rel Relationship from the current doc to the anchored one
- * @param string $href URI of the anchored document
- * @param array $attributes Additional attributes to add to the <link> element
+ * @param string $rel Relationship from the current doc to the anchored one
+ * @param string $href URI of the anchored document
+ * @param array $attributes Additional attributes to add to the <link> element
+ * @param string $name Element Name in array links are stored in.
*/
- public function addLink($rel, $href = '', $attributes = array())
+ function addLink($rel, $href = '', $attributes = array(), $name = '')
{
if (empty($attributes)) {
$attributes = array();
@@ -670,9 +680,12 @@
$attributes['href'] = $href;
}
$attributes['rel'] = $rel;
- $this->addMeta('link', '', $attributes);
+ if (empty($name)) {
+ $name = md5(serialize($attributes));
+ }
+ $this->addMeta('link', $name, $attributes);
}
-
+
/**
* Set a meta http-equiv value
*
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php 2012-02-14 16:32:37 UTC (rev 8971)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php 2012-02-14 17:35:36 UTC (rev 8972)
@@ -433,6 +433,7 @@
$this->preload->triggerEvent('core.header.checkcache');
if ($this->theme->checkCache()) {
+ $xoopsPreload->triggerEvent('core.header.cacheend');
exit();
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/object.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/object.php 2012-02-14 16:32:37 UTC (rev 8971)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/object.php 2012-02-14 17:35:36 UTC (rev 8972)
@@ -38,7 +38,9 @@
define('XOBJ_DTYPE_FLOAT', 13);
define('XOBJ_DTYPE_DECIMAL', 14);
define('XOBJ_DTYPE_ENUM', 15);
-
+define('XOBJ_DTYPE_DATE', 22);
+define('XOBJ_DTYPE_TIME', 23);
+define('XOBJ_DTYPE_TIMESTAMP', 24);
/**
* Base class for all objects in the Xoops kernel (and beyond)
*/
@@ -172,7 +174,31 @@
public function assignVar($key, $value)
{
if (isset($key) && isset($this->vars[$key])) {
- $this->vars[$key]['value'] = $value;
+ switch ($this->vars[$key]['data_type']) {
+ case XOBJ_DTYPE_DATE:
+ if (!is_string($value)&&is_numeric($value)) {
+ $this->vars[$key]['value'] =& date(_DBDATESTRING, $value);
+ } else {
+ $this->vars[$key]['value'] =& date(_DBDATESTRING, strtotime($value));
+ }
+ break;
+ case XOBJ_DTYPE_TIME:
+ if (!is_string($value)&&is_numeric($value)) {
+ $this->vars[$key]['value'] =& date(_DBTIMESTRING, $value);
+ } else {
+ $this->vars[$key]['value'] =& date(_DBTIMESTRING, strtotime($value));
+ }
+ break;
+ case XOBJ_DTYPE_TIMESTAMP:
+ if (!is_string($value)&&is_numeric($value)) {
+ $this->vars[$key]['value'] =& date(_DBTIMESTAMPSTRING, $value);
+ } else {
+ $this->vars[$key]['value'] =& date(_DBTIMESTAMPSTRING, strtotime($value));
+ }
+ break;
+ default:
+ $this->vars[$key]['value'] =& $value;
+ }
}
}
@@ -321,6 +347,126 @@
$ret = $this->vars[$key]['value'];
$ts = MyTextSanitizer::getInstance();
switch ($this->vars[$key]['data_type']) {
+ case XOBJ_DTYPE_DATE:
+ switch (strtolower($format)) {
+ case 's':
+ case 'show':
+ if (is_string($ret)&&!is_numeric($ret)) {
+ return date(_DBDATESTRING, strtotime($ret));
+ } else {
+ return date(_DBDATESTRING, $ret);
+ }
+ break 1;
+ case 'e':
+ case 'edit':
+ if (is_string($ret)&&!is_numeric($ret)) {
+ return htmlspecialchars(date(_DBDATESTRING, strtotime($ret)), ENT_QUOTES);
+ } else {
+ return htmlspecialchars(date(_DBDATESTRING, $ret), ENT_QUOTES);
+ }
+ break 1;
+ case 'p':
+ case 'preview':
+ if (is_string($ret)&&!is_numeric($ret)) {
+ return $ts->stripSlashesGPC(date(_DBDATESTRING, strtotime($ret)));
+ } else {
+ return $ts->stripSlashesGPC(date(_DBDATESTRING, $ret));
+ }
+ break 1;
+ case 'f':
+ case 'formpreview':
+ if (is_string($ret)&&!is_numeric($ret)) {
+ return htmlspecialchars($ts->stripSlashesGPC(date(_DBDATESTRING, strtotime($ret))), ENT_QUOTES);
+ } else {
+ return htmlspecialchars($ts->stripSlashesGPC(date(_DBDATESTRING, $ret)), ENT_QUOTES);
+ }
+ break 1;
+ case 'n':
+ case 'none':
+ default:
+ break 1;
+ }
+ break;
+ case XOBJ_DTYPE_TIME:
+ switch (strtolower($format)) {
+ case 's':
+ case 'show':
+ if (is_string($ret)&&!is_numeric($ret)) {
+ return date(_DBTIMESTRING, strtotime($ret));
+ } else {
+ return date(_DBTIMESTRING, $ret);
+ }
+ break 1;
+ case 'e':
+ case 'edit':
+ if (is_string($ret)&&!is_numeric($ret)) {
+ return htmlspecialchars(date(_DBTIMESTRING, strtotime($ret)), ENT_QUOTES);
+ } else {
+ return htmlspecialchars(date(_DBTIMESTRING, $ret), ENT_QUOTES);
+ }
+ break 1;
+ case 'p':
+ case 'preview':
+ if (is_string($ret)&&!is_numeric($ret)) {
+ return $ts->stripSlashesGPC(date(_DBTIMESTRING, strtotime($ret)));
+ } else {
+ return $ts->stripSlashesGPC(date(_DBTIMESTRING, $ret));
+ }
+ break 1;
+ case 'f':
+ case 'formpreview':
+ if (is_string($ret)&&!is_numeric($ret)) {
+ return htmlspecialchars($ts->stripSlashesGPC(date(_DBTIMESTRING, strtotime($ret))), ENT_QUOTES);
+ } else {
+ return htmlspecialchars($ts->stripSlashesGPC(date(_DBTIMESTRING, $ret)), ENT_QUOTES);
+ }
+ break 1;
+ case 'n':
+ case 'none':
+ default:
+ break 1;
+ }
+ break;
+ case XOBJ_DTYPE_TIMSTAMP:
+ switch (strtolower($format)) {
+ case 's':
+ case 'show':
+ if (is_string($ret)&&!is_numeric($ret)) {
+ return date(_DBTIMESTAMPSTRING, strtotime($ret));
+ } else {
+ return date(_DBTIMESTAMPSTRING, $ret);
+ }
+ break 1;
+ case 'e':
+ case 'edit':
+ if (is_string($ret)&&!is_numeric($ret)) {
+ return htmlspecialchars(date(_DBTIMESTAMPSTRING, strtotime($ret)), ENT_QUOTES);
+ } else {
+ return htmlspecialchars(date(_DBTIMESTAMPSTRING, $ret), ENT_QUOTES);
+ }
+ break 1;
+ case 'p':
+ case 'preview':
+ if (is_string($ret)&&!is_numeric($ret)) {
+ return $ts->stripSlashesGPC(date(_DBTIMESTAMPSTRING, strtotime($ret)));
+ } else {
+ return $ts->stripSlashesGPC(date(_DBTIMESTAMPSTRING, $ret));
+ }
+ break 1;
+ case 'f':
+ case 'formpreview':
+ if (is_string($ret)&&!is_numeric($ret)) {
+ return htmlspecialchars($ts->stripSlashesGPC(date(_DBTIMESTAMPSTRING, strtotime($ret))), ENT_QUOTES);
+ } else {
+ return htmlspecialchars($ts->stripSlashesGPC(date(_DBTIMESTAMPSTRING, $ret)), ENT_QUOTES);
+ }
+ break 1;
+ case 'n':
+ case 'none':
+ default:
+ break 1;
+ }
+ break;
case XOBJ_DTYPE_TXTBOX:
switch (strtolower($format)) {
case 's':
@@ -461,6 +607,15 @@
} else {
$cleanv = is_string($cleanv) ? trim($cleanv) : $cleanv;
switch ($v['data_type']) {
+ case XOBJ_DTYPE_TIMESTAMP:
+ $cleanv = !is_string($cleanv)&&is_numeric($cleanv) ? date(_DBTIMESTAMPSTRING, $cleanv) : date(_DBTIMESTAMPSTRING, strtotime($cleanv));
+ break;
+ case XOBJ_DTYPE_TIME:
+ $cleanv = !is_string($cleanv)&&is_numeric($cleanv) ? date(_DBTIMESTRING, $cleanv) : date(_DBTIMESTRING, strtotime($cleanv));
+ break;
+ case XOBJ_DTYPE_DATE:
+ $cleanv = !is_string($cleanv)&&is_numeric($cleanv) ? date(_DBDATESTRING, $cleanv) : date(_DBDATESTRING, strtotime($cleanv));
+ break;
case XOBJ_DTYPE_TXTBOX:
if ($v['required'] && $cleanv != '0' && $cleanv == '') {
$this->setErrors(sprintf(_XOBJ_ERR_REQUIRED, $k));
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/global.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/global.php 2012-02-14 16:32:37 UTC (rev 8971)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/global.php 2012-02-14 17:35:36 UTC (rev 8972)
@@ -213,4 +213,10 @@
**/
define('_RESET', 'Reset');
define('_RE', 'Re:');
+/**
+ * Additions to 2.5.5
+**/
+define('_DBDATESTRING', 'Y-m-d');
+define('_DBTIMESTRING', 'H:i:s');
+define('_DBTIMESTAMPSTRING', 'Y-m-d H:i:s');
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wis...@us...> - 2012-02-14 16:32:44
|
Revision: 8971
http://xoops.svn.sourceforge.net/xoops/?rev=8971&view=rev
Author: wishcraft
Date: 2012-02-14 16:32:37 +0000 (Tue, 14 Feb 2012)
Log Message:
-----------
* Date problem work around definition of XOBJ_DTYPE_DATE for passing date to date field type in MySQL, Postgres, MSSQL and other DB Platforms.
Modified Paths:
--------------
XoopsCore/trunk/htdocs/class/model/write.php
XoopsCore/trunk/htdocs/kernel/object.php
XoopsCore/trunk/htdocs/language/english/global.php
Modified: XoopsCore/trunk/htdocs/class/model/write.php
===================================================================
--- XoopsCore/trunk/htdocs/class/model/write.php 2012-02-14 15:52:01 UTC (rev 8970)
+++ XoopsCore/trunk/htdocs/class/model/write.php 2012-02-14 16:32:37 UTC (rev 8971)
@@ -53,6 +53,15 @@
}
$cleanv = $v['value'];
switch ($v["data_type"]) {
+ case XOBJ_DTYPE_TIMESTAMP:
+ $cleanv = !is_string($cleanv)&&is_numeric($cleanv) ? date(_DBTIMESTAMPSTRING, $cleanv) : date(_DBTIMESTAMPSTRING, strtotime($cleanv));
+ break;
+ case XOBJ_DTYPE_TIME:
+ $cleanv = !is_string($cleanv)&&is_numeric($cleanv) ? date(_DBTIMESTRING, $cleanv) : date(_DBTIMESTRING, strtotime($cleanv));
+ break;
+ case XOBJ_DTYPE_DATE:
+ $cleanv = !is_string($cleanv)&&is_numeric($cleanv) ? date(_DBDATESTRING, $cleanv) : date(_DBDATESTRING, strtotime($cleanv));
+ break;
case XOBJ_DTYPE_UNICODE_TXTBOX:
if ($v['required'] && $cleanv != '0' && $cleanv == '') {
$errors[] = sprintf(_XOBJ_ERR_REQUIRED, $k);
Modified: XoopsCore/trunk/htdocs/kernel/object.php
===================================================================
--- XoopsCore/trunk/htdocs/kernel/object.php 2012-02-14 15:52:01 UTC (rev 8970)
+++ XoopsCore/trunk/htdocs/kernel/object.php 2012-02-14 16:32:37 UTC (rev 8971)
@@ -48,7 +48,11 @@
define('XOBJ_DTYPE_UNICODE_EMAIL', 19);
define('XOBJ_DTYPE_UNICODE_ARRAY', 20);
define('XOBJ_DTYPE_UNICODE_OTHER', 21);
-
+// Addition for 2.5.5
+define('XOBJ_DTYPE_DATE', 22);
+// Addition for 2.6.0
+//define('XOBJ_DTYPE_TIME', 23);
+//define('XOBJ_DTYPE_TIMESTAMP', 24);
/**
* Base class for all objects in the Xoops kernel (and beyond)
*/
@@ -197,6 +201,27 @@
case XOBJ_DTYPE_UNICODE_TXTAREA:
$this->vars[$key]['value'] =& xoops_convert_decode($value);
break;
+ case XOBJ_DTYPE_DATE:
+ if (!is_string($value)&&is_numeric($value)) {
+ $this->vars[$key]['value'] =& date(_DBDATESTRING, $value);
+ } else {
+ $this->vars[$key]['value'] =& date(_DBDATESTRING, strtotime($value));
+ }
+ break;
+ case XOBJ_DTYPE_TIME:
+ if (!is_string($value)&&is_numeric($value)) {
+ $this->vars[$key]['value'] =& date(_DBTIMESTRING, $value);
+ } else {
+ $this->vars[$key]['value'] =& date(_DBTIMESTRING, strtotime($value));
+ }
+ break;
+ case XOBJ_DTYPE_TIMESTAMP:
+ if (!is_string($value)&&is_numeric($value)) {
+ $this->vars[$key]['value'] =& date(_DBTIMESTAMPSTRING, $value);
+ } else {
+ $this->vars[$key]['value'] =& date(_DBTIMESTAMPSTRING, strtotime($value));
+ }
+ break;
// YOU SHOULD NOT USE THE ABOVE TYPES, THEY WILL BE REMOVED
default:
$this->vars[$key]['value'] =& $value;
@@ -463,6 +488,123 @@
break 1;
}
break;
+ case XOBJ_DTYPE_DATE:
+ switch (strtolower($format)) {
+ case 's':
+ case 'show':
+ if (is_string($ret)&&!is_numeric($ret)) {
+ return date(_DBDATESTRING, strtotime($ret));
+ } else {
+ return date(_DBDATESTRING, $ret);
+ }
+ break 1;
+ case 'e':
+ case 'edit':
+ if (is_string($ret)&&!is_numeric($ret)) {
+ return htmlspecialchars(date(_DBDATESTRING, strtotime($ret)), ENT_QUOTES);
+ } else {
+ return htmlspecialchars(date(_DBDATESTRING, $ret), ENT_QUOTES);
+ }
+ break 1;
+ case 'p':
+ case 'preview':
+ if (is_string($ret)&&!is_numeric($ret)) {
+ return $ts->stripSlashesGPC(date(_DBDATESTRING, strtotime($ret)));
+ } else {
+ return $ts->stripSlashesGPC(date(_DBDATESTRING, $ret));
+ }
+ break 1;
+ case 'f':
+ case 'formpreview':
+ if (is_string($ret)&&!is_numeric($ret)) {
+ return htmlspecialchars($ts->stripSlashesGPC(date(_DBDATESTRING, strtotime($ret))), ENT_QUOTES);
+ } else {
+ return htmlspecialchars($ts->stripSlashesGPC(date(_DBDATESTRING, $ret)), ENT_QUOTES);
+ }
+ break 1;
+ case 'n':
+ case 'none':
+ default:
+ break 1;
+ }
+ case XOBJ_DTYPE_TIME:
+ switch (strtolower($format)) {
+ case 's':
+ case 'show':
+ if (is_string($ret)&&!is_numeric($ret)) {
+ return date(_DBTIMESTRING, strtotime($ret));
+ } else {
+ return date(_DBTIMESTRING, $ret);
+ }
+ break 1;
+ case 'e':
+ case 'edit':
+ if (is_string($ret)&&!is_numeric($ret)) {
+ return htmlspecialchars(date(_DBTIMESTRING, strtotime($ret)), ENT_QUOTES);
+ } else {
+ return htmlspecialchars(date(_DBTIMESTRING, $ret), ENT_QUOTES);
+ }
+ break 1;
+ case 'p':
+ case 'preview':
+ if (is_string($ret)&&!is_numeric($ret)) {
+ return $ts->stripSlashesGPC(date(_DBTIMESTRING, strtotime($ret)));
+ } else {
+ return $ts->stripSlashesGPC(date(_DBTIMESTRING, $ret));
+ }
+ break 1;
+ case 'f':
+ case 'formpreview':
+ if (is_string($ret)&&!is_numeric($ret)) {
+ return htmlspecialchars($ts->stripSlashesGPC(date(_DBTIMESTRING, strtotime($ret))), ENT_QUOTES);
+ } else {
+ return htmlspecialchars($ts->stripSlashesGPC(date(_DBTIMESTRING, $ret)), ENT_QUOTES);
+ }
+ break 1;
+ case 'n':
+ case 'none':
+ default:
+ break 1;
+ }
+ case XOBJ_DTYPE_TIMSTAMP:
+ switch (strtolower($format)) {
+ case 's':
+ case 'show':
+ if (is_string($ret)&&!is_numeric($ret)) {
+ return date(_DBTIMESTAMPSTRING, strtotime($ret));
+ } else {
+ return date(_DBTIMESTAMPSTRING, $ret);
+ }
+ break 1;
+ case 'e':
+ case 'edit':
+ if (is_string($ret)&&!is_numeric($ret)) {
+ return htmlspecialchars(date(_DBTIMESTAMPSTRING, strtotime($ret)), ENT_QUOTES);
+ } else {
+ return htmlspecialchars(date(_DBTIMESTAMPSTRING, $ret), ENT_QUOTES);
+ }
+ break 1;
+ case 'p':
+ case 'preview':
+ if (is_string($ret)&&!is_numeric($ret)) {
+ return $ts->stripSlashesGPC(date(_DBTIMESTAMPSTRING, strtotime($ret)));
+ } else {
+ return $ts->stripSlashesGPC(date(_DBTIMESTAMPSTRING, $ret));
+ }
+ break 1;
+ case 'f':
+ case 'formpreview':
+ if (is_string($ret)&&!is_numeric($ret)) {
+ return htmlspecialchars($ts->stripSlashesGPC(date(_DBTIMESTAMPSTRING, strtotime($ret))), ENT_QUOTES);
+ } else {
+ return htmlspecialchars($ts->stripSlashesGPC(date(_DBTIMESTAMPSTRING, $ret)), ENT_QUOTES);
+ }
+ break 1;
+ case 'n':
+ case 'none':
+ default:
+ break 1;
+ }
default:
if ($this->vars[$key]['options'] != '' && $ret != '') {
switch (strtolower($format)) {
@@ -512,6 +654,15 @@
} else {
$cleanv = is_string($cleanv) ? trim($cleanv) : $cleanv;
switch ($v['data_type']) {
+ case XOBJ_DTYPE_TIMESTAMP:
+ $cleanv = !is_string($cleanv)&&is_numeric($cleanv) ? date(_DBTIMESTAMPSTRING, $cleanv) : date(_DBTIMESTAMPSTRING, strtotime($cleanv));
+ break;
+ case XOBJ_DTYPE_TIME:
+ $cleanv = !is_string($cleanv)&&is_numeric($cleanv) ? date(_DBTIMESTRING, $cleanv) : date(_DBTIMESTRING, strtotime($cleanv));
+ break;
+ case XOBJ_DTYPE_DATE:
+ $cleanv = !is_string($cleanv)&&is_numeric($cleanv) ? date(_DBDATESTRING, $cleanv) : date(_DBDATESTRING, strtotime($cleanv));
+ break;
case XOBJ_DTYPE_TXTBOX:
if ($v['required'] && $cleanv != '0' && $cleanv == '') {
$this->setErrors(sprintf(_XOBJ_ERR_REQUIRED, $k));
Modified: XoopsCore/trunk/htdocs/language/english/global.php
===================================================================
--- XoopsCore/trunk/htdocs/language/english/global.php 2012-02-14 15:52:01 UTC (rev 8970)
+++ XoopsCore/trunk/htdocs/language/english/global.php 2012-02-14 16:32:37 UTC (rev 8971)
@@ -213,4 +213,11 @@
**/
define('_RESET', 'Reset');
define('_RE', 'Re:');
+/**
+ * Additions to 2.5.5
+**/
+define('_DBDATESTRING', 'Y-m-d');
+define('_DBTIMESTRING', 'H:i:s');
+define('_DBTIMESTAMPSTRING', 'Y-m-d H:i:s');
+
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wis...@us...> - 2012-02-14 15:52:08
|
Revision: 8970
http://xoops.svn.sourceforge.net/xoops/?rev=8970&view=rev
Author: wishcraft
Date: 2012-02-14 15:52:01 +0000 (Tue, 14 Feb 2012)
Log Message:
-----------
* Duplicate Meta Entries Fix (Abridged on Trabis Forum Solution) - class/theme.php
* exit(0); missing preloader call before calling in - header.php
Modified Paths:
--------------
XoopsCore/trunk/htdocs/class/theme.php
XoopsCore/trunk/htdocs/header.php
Modified: XoopsCore/trunk/htdocs/class/theme.php
===================================================================
--- XoopsCore/trunk/htdocs/class/theme.php 2012-02-14 03:56:16 UTC (rev 8969)
+++ XoopsCore/trunk/htdocs/class/theme.php 2012-02-14 15:52:01 UTC (rev 8970)
@@ -551,17 +551,18 @@
* $theme->addScript( 'www/script.js', null, '' );
* $theme->addScript( 'modules/newbb/script.js', null, '' );
* // Specify attributes for the <script> tag
- * $theme->addScript( 'mod_xoops_SiteManager#common.js', array( 'type' => 'application/x-javascript' ), '' );
+ * $theme->addScript( 'mod_xoops_SiteManager#common.js', array( 'type' => 'application/x-javascript' ), '', 'mod_xoops_Sitemanager' );
* // Insert a code snippet
- * $theme->addScript( null, array( 'type' => 'application/x-javascript' ), 'window.open("Hello world");' );
+ * $theme->addScript( null, array( 'type' => 'application/x-javascript' ), 'window.open("Hello world");', 'hello' );
* </code>
*
* @param string $src path to an external script file
* @param array $attributes hash of attributes to add to the <script> tag
* @param string $content Code snippet to output within the <script> tag
+ * @param string $name Element Name in array scripts are stored in.
* @return void
*/
- function addScript($src = '', $attributes = array(), $content = '')
+ function addScript($src = '', $attributes = array(), $content = '', $name = '')
{
if (empty($attributes)) {
$attributes = array();
@@ -576,7 +577,10 @@
if (!isset($attributes['type'])) {
$attributes['type'] = 'text/javascript';
}
- $this->addMeta('script', $src, $attributes);
+ if (empty($name)) {
+ $name = md5(serialize($attributes));
+ }
+ $this->addMeta('script', $name, $attributes);
}
@@ -586,9 +590,10 @@
* @param string $src path to .css file
* @param array $attributes name => value paired array of attributes such as title
* @param string $content CSS code to output between the <style> tags (in case $src is empty)
+ * @param string $name Element Name in array stylesheets are stored in.
* @return void
*/
- function addStylesheet($src = '', $attributes = array(), $content = '')
+ function addStylesheet($src = '', $attributes = array(), $content = '', $name = '')
{
if (empty($attributes)) {
$attributes = array();
@@ -603,7 +608,10 @@
if (!empty($content)) {
$attributes['_'] = $content;
}
- $this->addMeta('stylesheet', $src, $attributes);
+ if (empty($name)) {
+ $name = md5(serialize($attributes));
+ }
+ $this->addMeta('stylesheet', $name, $attributes);
}
/**
@@ -612,8 +620,9 @@
* @param string $rel Relationship from the current doc to the anchored one
* @param string $href URI of the anchored document
* @param array $attributes Additional attributes to add to the <link> element
+ * @param string $name Element Name in array links are stored in.
*/
- function addLink($rel, $href = '', $attributes = array())
+ function addLink($rel, $href = '', $attributes = array(), $name = '')
{
if (empty($attributes)) {
$attributes = array();
@@ -622,7 +631,10 @@
$attributes['href'] = $href;
}
$attributes['rel'] = $rel;
- $this->addMeta('link', '', $attributes);
+ if (empty($name)) {
+ $name = md5(serialize($attributes));
+ }
+ $this->addMeta('link', $name, $attributes);
}
/**
Modified: XoopsCore/trunk/htdocs/header.php
===================================================================
--- XoopsCore/trunk/htdocs/header.php 2012-02-14 03:56:16 UTC (rev 8969)
+++ XoopsCore/trunk/htdocs/header.php 2012-02-14 15:52:01 UTC (rev 8970)
@@ -90,6 +90,7 @@
$xoopsPreload->triggerEvent('core.header.checkcache');
if ($xoTheme->checkCache()) {
+ $xoopsPreload->triggerEvent('core.header.cacheend');
exit();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-02-14 03:56:23
|
Revision: 8969
http://xoops.svn.sourceforge.net/xoops/?rev=8969&view=rev
Author: djculex
Date: 2012-02-14 03:56:16 +0000 (Tue, 14 Feb 2012)
Log Message:
-----------
Modified Paths:
--------------
XoopsModules/xim/releases/1.02/modules/xim/index.php
XoopsModules/xim/releases/1.02/modules/xim/js/chat.js
Modified: XoopsModules/xim/releases/1.02/modules/xim/index.php
===================================================================
--- XoopsModules/xim/releases/1.02/modules/xim/index.php 2012-02-14 03:55:13 UTC (rev 8968)
+++ XoopsModules/xim/releases/1.02/modules/xim/index.php 2012-02-14 03:56:16 UTC (rev 8969)
@@ -25,7 +25,7 @@
include_once("../../mainfile.php");
$xoopsOption['template_main'] = 'xim_index.html';
-include_once("class/buddy.php");
+//include_once("class/buddy.php");
include_once(XOOPS_ROOT_PATH."/header.php");
global $xoopsUser, $xoTheme;;
// Content here
Modified: XoopsModules/xim/releases/1.02/modules/xim/js/chat.js
===================================================================
--- XoopsModules/xim/releases/1.02/modules/xim/js/chat.js 2012-02-14 03:55:13 UTC (rev 8968)
+++ XoopsModules/xim/releases/1.02/modules/xim/js/chat.js 2012-02-14 03:56:16 UTC (rev 8969)
@@ -415,7 +415,7 @@
break;
}
// fix strange ie bug <li><span>Family Members</span></li>
- xoops_im("#userlist").append('<li><a href="javascript:void(0)" onclick="javascript:chatWith(\''+user.id+'\',\''+user.n+'\');" title=""><img class="image" src="'+user.a+'" alt="">'+user.n+'<img class="status" src="'+userstatus+'" alt=""></a>');
+ xoops_im("#userlist").append('<li><a href="javascript:void(0)" onclick="javascript:chatWith(\''+user.id+'\',\''+user.n+'\');" title=""><img class="image" src="'+user.a+'" alt="">'+user.n+'<img class="status" src="'+userstatus+'" alt=""></a></li>');
}
});
}});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-02-14 03:55:19
|
Revision: 8968
http://xoops.svn.sourceforge.net/xoops/?rev=8968&view=rev
Author: djculex
Date: 2012-02-14 03:55:13 +0000 (Tue, 14 Feb 2012)
Log Message:
-----------
- include (class/buddy.php) in index.php..clas not existing
- Missing closing </li> in chat.js (hopefully this is reason for json error)
Modified Paths:
--------------
XoopsModules/xim/trunk/modules/xim/index.php
XoopsModules/xim/trunk/modules/xim/js/chat.js
Modified: XoopsModules/xim/trunk/modules/xim/index.php
===================================================================
--- XoopsModules/xim/trunk/modules/xim/index.php 2012-02-13 21:32:04 UTC (rev 8967)
+++ XoopsModules/xim/trunk/modules/xim/index.php 2012-02-14 03:55:13 UTC (rev 8968)
@@ -25,7 +25,7 @@
include_once("../../mainfile.php");
$xoopsOption['template_main'] = 'xim_index.html';
-include_once("class/buddy.php");
+//include_once("class/buddy.php");
include_once(XOOPS_ROOT_PATH."/header.php");
global $xoopsUser, $xoTheme;;
// Content here
Modified: XoopsModules/xim/trunk/modules/xim/js/chat.js
===================================================================
--- XoopsModules/xim/trunk/modules/xim/js/chat.js 2012-02-13 21:32:04 UTC (rev 8967)
+++ XoopsModules/xim/trunk/modules/xim/js/chat.js 2012-02-14 03:55:13 UTC (rev 8968)
@@ -415,7 +415,7 @@
break;
}
// fix strange ie bug <li><span>Family Members</span></li>
- xoops_im("#userlist").append('<li><a href="javascript:void(0)" onclick="javascript:chatWith(\''+user.id+'\',\''+user.n+'\');" title=""><img class="image" src="'+user.a+'" alt="">'+user.n+'<img class="status" src="'+userstatus+'" alt=""></a>');
+ xoops_im("#userlist").append('<li><a href="javascript:void(0)" onclick="javascript:chatWith(\''+user.id+'\',\''+user.n+'\');" title=""><img class="image" src="'+user.a+'" alt="">'+user.n+'<img class="status" src="'+userstatus+'" alt=""></a></li>');
}
});
}});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ye...@us...> - 2012-02-13 21:32:10
|
Revision: 8967
http://xoops.svn.sourceforge.net/xoops/?rev=8967&view=rev
Author: yerres2
Date: 2012-02-13 21:32:04 +0000 (Mon, 13 Feb 2012)
Log Message:
-----------
postponed
Removed Paths:
-------------
XoopsModules/tagcloud/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-02-13 21:24:51
|
Revision: 8966
http://xoops.svn.sourceforge.net/xoops/?rev=8966&view=rev
Author: djculex
Date: 2012-02-13 21:24:44 +0000 (Mon, 13 Feb 2012)
Log Message:
-----------
- Bugfix: Textarea in updates did not resize while writing.
- Bugfix: Dom set max-width to ".update"
- Change: Center search field, and use imageResize function on avatars
- Change: Minor css adjustments
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/css/smallworld.css
XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt
XoopsModules/smallworld/trunk/smallworld/js/smallworld.js
XoopsModules/smallworld/trunk/smallworld/search.php
XoopsModules/smallworld/trunk/smallworld/templates/smallworld_index.html
Modified: XoopsModules/smallworld/trunk/smallworld/css/smallworld.css
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/css/smallworld.css 2012-02-13 20:23:41 UTC (rev 8965)
+++ XoopsModules/smallworld/trunk/smallworld/css/smallworld.css 2012-02-13 21:24:44 UTC (rev 8966)
@@ -556,7 +556,7 @@
}
#smallworld_searchform {
- margin: 25px 33% 0 33%;
+ margin: 25px 20% 0 20%;
position: relative;
}
@@ -684,10 +684,10 @@
border-style: dotted;
border-width: thin;
display: block;
- height: 5px;
- margin: 0 5%;
- padding: 5px 0 5%;
- width: 96%;
+ height: 15px;
+ margin: 0 15px;
+ padding: 5px;
+ width: 95%;
}
.smallworld_CommentShowMore:link {
@@ -882,12 +882,13 @@
.smallworld_commentupdate {
background-color: #F2F2F2;
+ margin: 0 15px;
padding: 5px;
- width: 100%;
+ width: 95%;
}
.smallworld_comment {
- width:98%;
+ width:180px;
height:35px;
font-size:11px;
}
Modified: XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt 2012-02-13 20:23:41 UTC (rev 8965)
+++ XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt 2012-02-13 21:24:44 UTC (rev 8966)
@@ -15,15 +15,19 @@
- Bugfix: Gender was missing in select multi for form items
- Bugfix: Remove error in json reply
-12. Fevruary 2012
+12. February 2012
- Bugfix: Keep imagegallery in colorbox even if imageData.index is null
13. February
+- NEW: If number if comments >2 then show 2 comments and show "show more" / "Show less" container
- Bugfix: Removed php 5.30 function to convert dateformat and replaced with simpler function
+- Bugfix: Textarea in updates did not resize while writing.
+- Bugfix: Dom set max-width to ".update"
- Change: Removed php 5.30 function to calculate difference between dates in Years.
- change: Smallworld decreased min-php to >= 5.20
-- NEW: If number if comments >2 then show 2 comments and show "show more" / "Show less" container
- Change: Replace a split() -> explode() function to remove depreseated info
+- Change: Center search field, and use imageResize function on avatars
+- Change: Minor css adjustments
- land_diff: see docs/lang_diff.txt for 2 changes in lang/js/variables.js
------------------------------
Modified: XoopsModules/smallworld/trunk/smallworld/js/smallworld.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2012-02-13 20:23:41 UTC (rev 8965)
+++ XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2012-02-13 21:24:44 UTC (rev 8966)
@@ -212,9 +212,10 @@
// Make Textareas elastic
xoops_smallworld(function() {
xoops_smallworld('.favourites, .smallworld_comment, #smallworld_update, #smallworld_update_profile').elastic();
+ xoops_smallworld('.smallworld_comment').css('max-width', xoops_smallworld('.smallworld_stcommentbody').outerWidth() - 90 + 'px');
+ xoops_smallworld('#smallworld_update').css('max-width', xoops_smallworld('#smallworld_wall_container').outerWidth() - 30 + 'px');
});
-
// Toggle the form 'partner' if choosen status is married, in relationship, complicated
xoops_smallworld(function() {
if (xoops_smallworld("#relationship").val == '2') {
@@ -268,7 +269,7 @@
var htmlString = xoops_smallworld(this).html().replace(/</g, '<');
htmlString = htmlString.replace(/>/g, '>');
xoops_smallworld(this).html(htmlString);
- xoops_smallworld('.ui-autocomplete.ui-menu').width(233);
+ xoops_smallworld('.ui-autocomplete.ui-menu').width(275);
});
},
select: function(event,ui){
Modified: XoopsModules/smallworld/trunk/smallworld/search.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/search.php 2012-02-13 20:23:41 UTC (rev 8965)
+++ XoopsModules/smallworld/trunk/smallworld/search.php 2012-02-13 21:24:44 UTC (rev 8966)
@@ -35,18 +35,23 @@
while ($row=$xoopsDB->fetchArray($result)) {
$user = new xoopsUser($row['userid']);
if ($row['userimage'] != 'Not specifiyed') {
- $image = '<img src="'.XOOPS_URL.'/uploads/'.$row['userimage'].'" height="30px" />';
+ $imageLink = XOOPS_URL.'/uploads/'.trim($row['userimage']);
+ $imageSize = smallworld_getImageSize(30, 30, $imageLink);
+ $imageHw = smallworld_imageResize($imageSize[0], $imageSize[1], 30);
+ $image = '<img src="'.XOOPS_URL.'/uploads/'.$row['userimage'].'" '.$imageHw.'/>';
} else {
if ($row['gender'] == 1) {
- $image = "<img src='".XOOPS_URL."/modules/smallworld/images/ano_woman.png'"." height='30px' /></img>";
+ $image = "<img src='".XOOPS_URL."/modules/smallworld/images/ano_woman.png'"." height='30px' width='30px'/></img>";
}
if ($row['gender'] == 2) {
- $image = "<img src='".XOOPS_URL."/modules/smallworld/images/ano_man.png'"." height='30px' /></img>";
+ $image = "<img src='".XOOPS_URL."/modules/smallworld/images/ano_man.png'"." height='30px' width='30px'/></img>";
}
if ($row['gender'] == 0) {
- $image = "<img src='".XOOPS_URL."/modules/smallworld/images/genderless.png'"." height='30px' /></img>";
+ $image = "<img src='".XOOPS_URL."/modules/smallworld/images/genderless.png'"." height='30px' width='30px'/></img>";
}
}
+
+ $imageHw = smallworld_imageResize($imageSize[0], $imageSize[1], 30);
$data[] = array(
'label' => $image.' '.'<span class="searchusername">'.$row['realname']." (".$row['username'].")</span>",
'value' => $user->uname()
Modified: XoopsModules/smallworld/trunk/smallworld/templates/smallworld_index.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/templates/smallworld_index.html 2012-02-13 20:23:41 UTC (rev 8965)
+++ XoopsModules/smallworld/trunk/smallworld/templates/smallworld_index.html 2012-02-13 21:24:44 UTC (rev 8966)
@@ -59,7 +59,7 @@
<br>
<br>
- <input id="smallworld_searchform" size="35" type="text" value="<{$smarty.const._SMALLWORLD_SEARCHMEMBER}>"/>
+ <center><input id="smallworld_searchform" size="35" type="text" value="<{$smarty.const._SMALLWORLD_SEARCHMEMBER}>"/></center>
<br>
<br>
<div id="smallworld_wall_container">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ye...@us...> - 2012-02-13 20:23:48
|
Revision: 8965
http://xoops.svn.sourceforge.net/xoops/?rev=8965&view=rev
Author: yerres2
Date: 2012-02-13 20:23:41 +0000 (Mon, 13 Feb 2012)
Log Message:
-----------
adding 1.2rc version
Modified Paths:
--------------
XoopsModules/newsslider/trunk/newsslider/admin/admin_header.php
XoopsModules/newsslider/trunk/newsslider/admin/index.php
XoopsModules/newsslider/trunk/newsslider/blocks/news_bxslider.php
XoopsModules/newsslider/trunk/newsslider/blocks/news_feature.php
XoopsModules/newsslider/trunk/newsslider/blocks/news_glider.php
XoopsModules/newsslider/trunk/newsslider/blocks/news_s3slider.php
XoopsModules/newsslider/trunk/newsslider/blocks/news_scrolling.php
XoopsModules/newsslider/trunk/newsslider/changelog.txt
XoopsModules/newsslider/trunk/newsslider/language/english/blocks.php
XoopsModules/newsslider/trunk/newsslider/language/german/blocks.php
XoopsModules/newsslider/trunk/newsslider/readme.txt
XoopsModules/newsslider/trunk/newsslider/style.css
XoopsModules/newsslider/trunk/newsslider/templates/blocks/news_bxslider.html
XoopsModules/newsslider/trunk/newsslider/templates/blocks/news_feature.html
XoopsModules/newsslider/trunk/newsslider/templates/blocks/news_s3slider.html
XoopsModules/newsslider/trunk/newsslider/templates/blocks/news_scrolling.html
XoopsModules/newsslider/trunk/newsslider/xoops_version.php
Modified: XoopsModules/newsslider/trunk/newsslider/admin/admin_header.php
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/admin/admin_header.php 2012-02-13 19:57:06 UTC (rev 8964)
+++ XoopsModules/newsslider/trunk/newsslider/admin/admin_header.php 2012-02-13 20:23:41 UTC (rev 8965)
@@ -11,6 +11,7 @@
include '../../../include/cp_header.php';
global $xoopsModule,$xoopsConfig;
+
include_once XOOPS_ROOT_PATH."/modules/".$xoopsModule->dirname()."/admin/functions.php";
$myts =& MyTextSanitizer::getInstance();
Modified: XoopsModules/newsslider/trunk/newsslider/admin/index.php
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/admin/index.php 2012-02-13 19:57:06 UTC (rev 8964)
+++ XoopsModules/newsslider/trunk/newsslider/admin/index.php 2012-02-13 20:23:41 UTC (rev 8965)
@@ -14,5 +14,5 @@
echo "<P>"._AM_NWS_INTRO."</P><br/>";
xoops_cp_footer();
-exit();
+
?>
\ No newline at end of file
Modified: XoopsModules/newsslider/trunk/newsslider/blocks/news_bxslider.php
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/blocks/news_bxslider.php 2012-02-13 19:57:06 UTC (rev 8964)
+++ XoopsModules/newsslider/trunk/newsslider/blocks/news_bxslider.php 2012-02-13 20:23:41 UTC (rev 8965)
@@ -56,10 +56,10 @@
}
if ($options[22] == 0) {
- $stories = $tmpstory->getRandomNews($options[0],0,$restricted,0,1, $options[7]);
+ $stories = $tmpstory->getAllPublished($options[0],0,$restricted,0,1, $options[7]);
} else {
$topics = array_slice($options, 22);
- $stories = $tmpstory->getRandomNews($options[0],0,$restricted,$topics, 1, $options[7]);
+ $stories = $tmpstory->getAllPublished($options[0],0,$restricted,0,1, $options[7]);
}
unset($tmpstory);
if(count($stories)==0) return '';
@@ -113,6 +113,8 @@
$block['stories'][] = $news;
}
$block['lang_read_more']= _MB_NWS_READMORE;
+ global $xoTheme;
+ $xoTheme -> addStylesheet( 'modules/newsslider/bx_styles.css' );
return $block;
}
Modified: XoopsModules/newsslider/trunk/newsslider/blocks/news_feature.php
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/blocks/news_feature.php 2012-02-13 19:57:06 UTC (rev 8964)
+++ XoopsModules/newsslider/trunk/newsslider/blocks/news_feature.php 2012-02-13 20:23:41 UTC (rev 8965)
@@ -47,13 +47,11 @@
if ($options[13] == 0) {
if ($options[0] > 5) { $options[0] = 4; }
- $stories = $tmpstory->getRandomNews($options[0],0,$restricted,0,1, $options[4]);
- //$stories = $tmpstory->getAllPublished($options[0],0,$restricted,0,1, $options[4]);
+ $stories = $tmpstory->getAllPublished($options[0], 0, $restricted, 0, true, $options[4]);
} else {
$topics = array_slice($options, 13);
if ($options[0] > 5) { $options[0] = 4; }
- $stories = $tmpstory->getRandomNews($options[0],0,$restricted,$topics, 1, $options[4]);
- //$stories = $tmpstory->getAllPublished($options[0],0,$restricted,$topics,1, $options[4]);
+ $stories = $tmpstory->getAllPublished($options[0], 0, $restricted, $topics, true, $options[4]);
}
unset($tmpstory);
@@ -111,7 +109,19 @@
}
$block['stories'][] = $news;
}
+
$block['lang_read_more']= _MB_NWS_READMORE;
+ global $xoTheme;
+ $xoTheme -> addStylesheet( 'modules/newsslider/style.css' );
+ /*$jquery = ($options[8]==1) ? 1:0;
+ if ( $jquery ) {
+ if (file_exists(XOOPS_ROOT_PATH . '/modules/newsslider/js/jquery.min.js')) {
+ if(isset($xoTheme) && is_object($xoTheme)) {
+ $xoTheme -> addScript('/modules/newsslider/js/jquery.min.js', array( 'type' => 'text/javascript' ) );
+ $xoTheme -> addScript('/modules/newsslider/js/jquery-ui.min.js', array( 'type' => 'text/javascript' ) );
+ }
+ }
+ }*/
return $block;
}
Modified: XoopsModules/newsslider/trunk/newsslider/blocks/news_glider.php
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/blocks/news_glider.php 2012-02-13 19:57:06 UTC (rev 8964)
+++ XoopsModules/newsslider/trunk/newsslider/blocks/news_glider.php 2012-02-13 20:23:41 UTC (rev 8965)
@@ -56,10 +56,10 @@
}
if ($options[23] == 0) {
- $stories = $tmpstory->getRandomNews($options[0],0,$restricted,0,1, $options[13]);
+ $stories = $tmpstory->getAllPublished($options[0],0,$restricted,0,1, $options[13]);
} else {
$topics = array_slice($options, 23);
- $stories = $tmpstory->getRandomNews($options[0],0,$restricted,$topics, 1, $options[13]);
+ $stories = $tmpstory->getAllPublished($options[0],0,$restricted,0,1, $options[13]);
}
unset($tmpstory);
if(count($stories)==0) return '';
Modified: XoopsModules/newsslider/trunk/newsslider/blocks/news_s3slider.php
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/blocks/news_s3slider.php 2012-02-13 19:57:06 UTC (rev 8964)
+++ XoopsModules/newsslider/trunk/newsslider/blocks/news_s3slider.php 2012-02-13 20:23:41 UTC (rev 8965)
@@ -46,10 +46,10 @@
}
if ($options[13] == 0) {
- $stories = $tmpstory->getRandomNews($options[0],0,$restricted,0,1, $options[4]);
+ $stories = $tmpstory->getAllPublished($options[0],0,$restricted,0,1, $options[4]);
} else {
$topics = array_slice($options, 13);
- $stories = $tmpstory->getRandomNews($options[0],0,$restricted,$topics, 1, $options[4]);
+ $stories = $tmpstory->getAllPublished($options[0],0,$restricted,0,1, $options[4]);
}
unset($tmpstory);
@@ -103,6 +103,16 @@
$block['stories'][] = $news;
}
$block['lang_read_more']= _MB_NWS_READMORE;
+ global $xoTheme;
+ $xoTheme -> addStylesheet( 'modules/newsslider/s3_style.css' );
+ /*$jquery = ($options[8]==1) ? 1:0;
+ if ( $jquery ) {
+ if (file_exists(XOOPS_ROOT_PATH . '/modules/newsslider/js/jquery.min.js')) {
+ if(isset($xoTheme) && is_object($xoTheme)) {
+ $xoTheme -> addScript('/modules/newsslider/js/jquery.min.js', array( 'type' => 'text/javascript' ) );
+ $xoTheme -> addScript('/modules/newsslider/js/s3Slider.js', array( 'type' => 'text/javascript' ) );
+ }}
+ }*/
return $block;
}
Modified: XoopsModules/newsslider/trunk/newsslider/blocks/news_scrolling.php
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/blocks/news_scrolling.php 2012-02-13 19:57:06 UTC (rev 8964)
+++ XoopsModules/newsslider/trunk/newsslider/blocks/news_scrolling.php 2012-02-13 20:23:41 UTC (rev 8965)
@@ -10,7 +10,6 @@
*/
if( ! defined( 'XOOPS_ROOT_PATH' ) ) die( 'XOOPS root path not defined' ) ;
-
function b_scrolling_news_show( $options ) {
global $xoopsDB, $xoopsUser;
$myts = & MyTextSanitizer :: getInstance();
@@ -50,10 +49,10 @@
}
if ($options[16] == 0) {
- $stories = $tmpstory->getRandomNews($options[0],0,$restricted,0,1, $options[7]);
+ $stories = $tmpstory->getAllPublished($options[0],0,$restricted,0,1, $options[7]);
} else {
$topics = array_slice($options, 16);
- $stories = $tmpstory->getRandomNews($options[0],0,$restricted,$topics, 1, $options[7]);
+ $stories = $tmpstory->getAllPublished($options[0],0,$restricted,0,1, $options[7]);
}
unset($tmpstory);
if(count($stories)==0) return '';
@@ -77,15 +76,17 @@
if ($options[10] > 0) {
$html = $story->nohtml() == 1 ? 0 : 1;
//$html = $options[11] == 1 ? 0 : 1;
+ $clearhtml = $options[8] == 1 ? 0 : 1;
$smiley = $options[12] == 1 ? 0 : 1;
$xcode = $options[13] == 1 ? 0 : 1;
$image = $options[14] == 1 ? 0 : 1;
$br = $options[15] == 1 ? 0 : 1;
//--- for News versions prior to 1.60
- //$news['teaser'] = xoops_substr($myts->displayTarea(strip_tags($story->hometext)), 0, $options[10]+3);
- //--- for news version 1.60+
- $news['teaser'] = news_truncate_tagsafe(strip_tags($myts->displayTarea($story->hometext, $html, $smiley, $xcode, $image, $br ), $options[10]+3));
-
+ if ($module->getVar('version') <= 160) {
+ $news['teaser'] = xoops_substr($myts->displayTarea(strip_tags($story->hometext)), 0, $options[10]+3);
+ } else {
+ $news['teaser'] = news_truncate_tagsafe(strip_tags($myts->displayTarea($story->hometext, $html, $smiley, $xcode, $image, $br ), $options[10]+3));
+ }
if($infotips>0) {
$news['infotips'] = ' title="'.news_make_infotips($story->hometext()).'"';
} else {
@@ -150,7 +151,6 @@
//---
$form .= "<tr><td class='even'>"._MB_NWS_CHARS."</td><td class='odd'><input type='text' name='options[9]' value='".$options[9]."'/></td></tr>";
$form .= "<tr><td class='even'>"._MB_NWS_TEASER." </td><td class='odd'><input type='text' name='options[10]' value='".$options[10]."' /></td></tr>";
-
//---
$form .= "<tr><td class='even'> </td> <td class='odd'> </td></tr>";
//---
Modified: XoopsModules/newsslider/trunk/newsslider/changelog.txt
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/changelog.txt 2012-02-13 19:57:06 UTC (rev 8964)
+++ XoopsModules/newsslider/trunk/newsslider/changelog.txt 2012-02-13 20:23:41 UTC (rev 8965)
@@ -1,5 +1,14 @@
-version 1.2 beta rev II
+version 1.2 rc
===========
+- fixed issue with random news
+- fixed some style and template related issues
+
+version 1.2 beta rev II
+===========
+- fixed a variety of Bugs
+
+version 1.2 beta rev I
+===========
- Added S3slider
- Added bxSlider
Modified: XoopsModules/newsslider/trunk/newsslider/language/english/blocks.php
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/language/english/blocks.php 2012-02-13 19:57:06 UTC (rev 8964)
+++ XoopsModules/newsslider/trunk/newsslider/language/english/blocks.php 2012-02-13 20:23:41 UTC (rev 8965)
@@ -74,4 +74,7 @@
define("_MB_NWS_JUSTIFY", "Justify");
define("_MB_NWS_TOPICT", "Show Topics?");
define("_MB_NWS_CAPTIONS", "Show image captions?");
+// RC
+define("_MB_NWS_JQUERY", "Load jQuery ?<div style=\" font-size: smaller; align='left'\">If jQuery is already being loaded in the theme, you can disable it here.</div>");
+define("_MB_NWS_STRIPTAGS", "Clear HTML tags ?<div style=\" font-size: smaller; align='left'\">Check here whether HTML-tags shall be cleared out of the text.</div>");
?>
\ No newline at end of file
Modified: XoopsModules/newsslider/trunk/newsslider/language/german/blocks.php
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/language/german/blocks.php 2012-02-13 19:57:06 UTC (rev 8964)
+++ XoopsModules/newsslider/trunk/newsslider/language/german/blocks.php 2012-02-13 20:23:41 UTC (rev 8965)
@@ -74,4 +74,6 @@
define("_MB_NWS_JUSTIFY", "Blocksatz");
define("_MB_NWS_TOPICT", "Themen anzeigen?");
define("_MB_NWS_CAPTIONS", "Bild Untertitel anzeigen?");
+// RC
+define("_MB_NWS_JQUERY", "jQuery im Block Laden?<div style=\" font-size: smaller; align='left'\">Falls jQuery bereits im Theme geladen wird, braucht es nicht im Block geladen zu werden.</div>");
?>
\ No newline at end of file
Modified: XoopsModules/newsslider/trunk/newsslider/readme.txt
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/readme.txt 2012-02-13 19:57:06 UTC (rev 8964)
+++ XoopsModules/newsslider/trunk/newsslider/readme.txt 2012-02-13 20:23:41 UTC (rev 8965)
@@ -26,7 +26,6 @@
Five featured Images, named from image1.jpg to image5.jpg, have following dimensions: 410 x 300px.
.bxSlider (beta!)
Images are named in the same manner and are located in the same directory as for Featured Content Slider. They can be of any size.
-(edit:modified template because of incompability)
Credits and Thanks
@@ -36,7 +35,9 @@
Featured Content Slider : Web Developer Plus : http://webdeveloperplus.com/jquery/featured-content-slider-using-jquery-ui/
S3Slider : http://www.serie3.info/s3slider/
jQuery bxSlider v3.0 : http://bxslider.com/
-News Module : Hervet http://xoops.org/
+News Module : Herve http://xoops.org/
+Maitsco : http://www.maitsco.com/english
+jlmZone : http://www.jlmzone.com/modules/news/
BETA VERSION
Modified: XoopsModules/newsslider/trunk/newsslider/style.css
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/style.css 2012-02-13 19:57:06 UTC (rev 8964)
+++ XoopsModules/newsslider/trunk/newsslider/style.css 2012-02-13 20:23:41 UTC (rev 8965)
@@ -33,6 +33,7 @@
height:60px;
color:#333; background:#fff;
line-height:14px;
+ list-style:none;
}
#featured li.ui-tabs-nav-item a:hover{
background:#f2f2f2;
Modified: XoopsModules/newsslider/trunk/newsslider/templates/blocks/news_bxslider.html
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/templates/blocks/news_bxslider.html 2012-02-13 19:57:06 UTC (rev 8964)
+++ XoopsModules/newsslider/trunk/newsslider/templates/blocks/news_bxslider.html 2012-02-13 20:23:41 UTC (rev 8965)
@@ -1,8 +1,6 @@
-
<script type="text/javascript" src="<{$xoops_url}>/modules/newsslider/js/jquery.min.js"></script>
<script type="text/javascript" src="<{$xoops_url}>/modules/newsslider/js/jquery.bxSlider.min.js"></script>
<{if $block.easing}><script type="text/javascript" src="<{$xoops_url}>/modules/newsslider/js/jquery.easing.1.3.js"></script><{/if}>
-<link rel="stylesheet" href="<{$xoops_url}>/modules/newsslider/bx_styles.css" type="text/css" />
<{*
$block.mode == 0 - horizontal
$block.mode == 1 - vertical
Modified: XoopsModules/newsslider/trunk/newsslider/templates/blocks/news_feature.html
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/templates/blocks/news_feature.html 2012-02-13 19:57:06 UTC (rev 8964)
+++ XoopsModules/newsslider/trunk/newsslider/templates/blocks/news_feature.html 2012-02-13 20:23:41 UTC (rev 8965)
@@ -1,6 +1,5 @@
<script type="text/javascript" src="<{$xoops_url}>/modules/newsslider/js/jquery.min.js"></script>
<script type="text/javascript" src="<{$xoops_url}>/modules/newsslider/js/jquery-ui.min.js"></script>
-<link rel="stylesheet" href="<{$xoops_url}>/modules/newsslider/style.css" type="text/css" />
<script type="text/javascript">
$(document).ready(function(){
$("#featured").tabs({fx:{opacity: "toggle"}}).tabs("rotate", <{$block.speed}>000, true);
@@ -17,7 +16,7 @@
<div id="featured" >
<ul class="ui-tabs-nav">
-<{foreach item=news from=$block.stories}>
+<{foreach item=news from=$block.stories}>
<li class="ui-tabs-nav-item <{if $news.no == 0}>ui-tabs-selected<{/if}>" id="nav-fragment-<{$news.no}>"><a href="#fragment-<{$news.no}>"><img src="<{$xoops_url}>/modules/newsslider/images/<{$news.thumb}>" alt="<{$news.topic_title}> - <{$news.title}>" /><span><{$news.title}><br/> <{if $block.includedate}><span id="date"><{$news.date}></span><br /><{/if}></span><{if $block.author}><span id="date"><{$news.author}></span><{/if}></span></a></li>
<{/foreach}>
</ul>
@@ -26,7 +25,7 @@
<!-- <{$news.no}>. Content -->
<div id="fragment-<{$news.no}>" class="ui-tabs-panel<{if $news.no != 0}> ui-tabs-hide<{/if}>" style="">
<img src="<{$xoops_url}>/modules/newsslider/images/<{$news.picture}>" alt="<{$news.topic_title}> - <{$news.title}>" />
- <div class="info" >
+ <div class="info">
<h2><a href="<{$xoops_url}>/modules/news/article.php?storyid=<{$news.id}>" />
<{$news.title}></a></h2>
<p><{$news.teaser}> <a href="<{$xoops_url}>/modules/news/article.php?storyid=<{$news.id}>" ><{$smarty.const._MB_NWS_READMORE}></a></p>
Modified: XoopsModules/newsslider/trunk/newsslider/templates/blocks/news_s3slider.html
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/templates/blocks/news_s3slider.html 2012-02-13 19:57:06 UTC (rev 8964)
+++ XoopsModules/newsslider/trunk/newsslider/templates/blocks/news_s3slider.html 2012-02-13 20:23:41 UTC (rev 8965)
@@ -1,6 +1,5 @@
<script type="text/javascript" src="<{$xoops_url}>/modules/newsslider/js/jquery.min.js"></script>
<script type="text/javascript" src="<{$xoops_url}>/modules/newsslider/js/s3Slider.js"></script>
-<link rel="stylesheet" href="<{$xoops_url}>/modules/newsslider/s3_style.css" type="text/css" />
<script type="text/javascript">
$(document).ready(function() {
$('#slider').s3Slider({
Modified: XoopsModules/newsslider/trunk/newsslider/templates/blocks/news_scrolling.html
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/templates/blocks/news_scrolling.html 2012-02-13 19:57:06 UTC (rev 8964)
+++ XoopsModules/newsslider/trunk/newsslider/templates/blocks/news_scrolling.html 2012-02-13 20:23:41 UTC (rev 8965)
@@ -4,7 +4,7 @@
direction='<{$block.direction}>'
style='width:100%;height:160px;'
bgcolor='<{$block.bgcolor}>'
- scrollamount='<{$block.speed}>'
+ scrollamount='5'
scrolldelay='<{$block.speed}>'
<{if $block.alternate}>
behavior='alternate'
Modified: XoopsModules/newsslider/trunk/newsslider/xoops_version.php
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/xoops_version.php 2012-02-13 19:57:06 UTC (rev 8964)
+++ XoopsModules/newsslider/trunk/newsslider/xoops_version.php 2012-02-13 20:23:41 UTC (rev 8965)
@@ -38,8 +38,8 @@
$modversion['license'] = "GPL see LICENSE";
$modversion["license_file"] = XOOPS_URL."/modules/newsslider/gpl.txt";
-$modversion["release"] = "2012-01-30";
-$modversion["module_status"] = "beta";
+$modversion["release"] = "2012-02-13";
+$modversion["module_status"] = "RC";
// Sql
// Admin things
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ye...@us...> - 2012-02-13 19:57:16
|
Revision: 8964
http://xoops.svn.sourceforge.net/xoops/?rev=8964&view=rev
Author: yerres2
Date: 2012-02-13 19:57:06 +0000 (Mon, 13 Feb 2012)
Log Message:
-----------
Adding Tagcloud
Added Paths:
-----------
XoopsModules/tagcloud/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ye...@us...> - 2012-02-13 19:52:21
|
Revision: 8963
http://xoops.svn.sourceforge.net/xoops/?rev=8963&view=rev
Author: yerres2
Date: 2012-02-13 19:52:09 +0000 (Mon, 13 Feb 2012)
Log Message:
-----------
added missing jquery files
Added Paths:
-----------
XoopsModules/newsslider/trunk/newsslider/js/jquery-1.1.3.pack.js
XoopsModules/newsslider/trunk/newsslider/js/jquery.min.js
Added: XoopsModules/newsslider/trunk/newsslider/js/jquery-1.1.3.pack.js
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/js/jquery-1.1.3.pack.js (rev 0)
+++ XoopsModules/newsslider/trunk/newsslider/js/jquery-1.1.3.pack.js 2012-02-13 19:52:09 UTC (rev 8963)
@@ -0,0 +1,11 @@
+/*
+ * jQuery 1.1.3 - New Wave Javascript
+ *
+ * Copyright (c) 2007 John Resig (jquery.com)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * $Date: 2007-07-01 08:54:38 -0400 (Sun, 01 Jul 2007) $
+ * $Rev: 2200 $
+ */
+eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('7(1e 12.6=="J"){12.J=12.J;u 6=q(a,c){7(12==9||!9.3Z)v 17 6(a,c);v 9.3Z(a,c)};7(1e $!="J")6.1I$=$;u $=6;6.11=6.8r={3Z:q(a,c){a=a||P;7(6.14(a))v 17 6(P)[6.11.1D?"1D":"1X"](a);7(1e a=="1v"){u m=/^[^<]*(<(.|\\s)+>)[^>]*$/.1Q(a);7(m)a=6.2Y([m[1]]);B v 17 6(c).1H(a)}v 9.4A(a.18==23&&a||(a.3B||a.C&&a!=12&&!a.1r&&a[0]!=J&&a[0].1r)&&6.2K(a)||[a])},3B:"1.1.3",7Y:q(){v 9.C},C:0,1L:q(a){v a==J?6.2K(9):9[a]},1W:q(a){u b=6(a);b.5l=9;v b},4A:q(a){9.C=0;[].R.O(9,a);v 9},F:q(a,b){v 6.F(9,a,b)},2m:q(a){u b=-1;9.F(q(i){7(9==a)b=i});v b},1b:q(f,d,e){u c=f;7(f.18==31)7(d==J)v 9.C&&6[e||"1b"](9[0],f)||J;B{c={};c[f]=d}v 9.F(q(a){E(u b T c)6.1b(e?9.Y:9,b,6.4D(9,c[b],e,a,b))})},1c:q(b,a){v 9.1b(b,a,"2q")},2R:q(e){7(1e e=="1v")v 9.2V().3m(P.67(e));u t="";6.F(e||9,q(){6.F(9.2S,q(){7(9.1r!=8)t+=9.1r!=1?9.5R:6.11.2R([9])})});v t},8c:q(){u a,1Z=1g;v 9.F(q(){7(!a)a=6.2Y(1Z,9.2N);u b=a[0].3r(K);9.L.2J(b,9);1q(b.1a)b=b.1a;b.4h(9)})},3m:q(){v 9.2F(1g,K,1,q(a){9.4h(a)})},5s:q(){v 9.2F(1g,K,-1,q(a){9.2J(a,9.1a)})},5p:q(){v 9.2F(1g,M,1,q(a){9.L.2J(a,9)})},5n:q(){v 9.2F(1g,M,-1,q(a){9.L.2J(a,9.1U)})},2E:q(){v 9.5l||6([])},1H:q(t){u b=6.3h(9,q(a){v 6.1H(t,a)});v 9.1W(/[^+>] [^+>]/.16(t)||t.I("..")>-1?6.5c(b):b)},7z:q(e){u d=9.1A(9.1H("*"));d.F(q(){9.1I$19={};E(u a T 9.$19)9.1I$19[a]=6.1f({},9.$19[a])}).3C();u r=9.1W(6.3h(9,q(a){v a.3r(e!=J?e:K)}));d.F(q(){u b=9.1I$19;E(u a T b)E(u c T b[a])6.S.1A(9,a,b[a][c],b[a][c].W);9.1I$19=H});v r},1j:q(t){v 9.1W(6.14(t)&&6.2x(9,q(b,a){v t.O(b,[a])})||6.2w(t,9))},4V:q(t){v 9.1W(t.18==31&&6.2w(t,9,K)||6.2x(9,q(a){v(t.18==23||t.3B)?6.2s(a,t)<0:a!=t}))},1A:q(t){v 9.1W(6.1R(9.1L(),t.18==31?6(t).1L():t.C!=J&&(!t.Q||t.Q=="71")?t:[t]))},33:q(a){v a?6.2w(a,9).C>0:M},6T:q(a){v a==J?(9.C?9[0].2t:H):9.1b("2t",a)},3K:q(a){v a==J?(9.C?9[0].26:H):9.2V().3m(a)},2F:q(f,d,g,e){u c=9.C>1,a;v 9.F(q(){7(!a){a=6.2Y(f,9.2N);7(g<0)a.6G()}u b=9;7(d&&6.Q(9,"1s")&&6.Q(a[0],"3k"))b=9.3V("1x")[0]||9.4h(P.55("1x"));6.F(a,q(){e.O(b,[c?9.3r(K):9])})})}};6.1f=6.11.1f=q(){u c=1g[0],a=1;7(1g.C==1){c=9;a=0}u b;1q((b=1g[a++])!=H)E(u i T b)c[i]=b[i];v c};6.1f({6o:q(){7(6.1I$)$=6.1I$;v 6},14:q(a){v!!a&&1e a!="1v"&&!a.Q&&a.18!=23&&/q/i.16(a+"")},43:q(a){v a.4x&&a.2N&&!a.2N.4w},Q:q(b,a){v b.Q&&b.Q.1S()==a.1S()},F:q(a,b,c){7(a.C==J)E(u i T a)b.O(a[i],c||[i,a[i]]);B E(u i=0,4v=a.C;i<4v;i++)7(b.O(a[i],c||[i,a[i]])===M)1E;v a},4D:q(c,b,d,e,a){7(6.14(b))b=b.3D(c,[e]);u f=/z-?2m|5Y-?8p|1d|5U|8i-?1u/i;v b&&b.18==3x&&d=="2q"&&!f.16(a)?b+"4p":b},V:{1A:q(b,c){6.F(c.2Q(/\\s+/),q(i,a){7(!6.V.3v(b.V,a))b.V+=(b.V?" ":"")+a})},1B:q(b,c){b.V=c!=J?6.2x(b.V.2Q(/\\s+/),q(a){v!6.V.3v(c,a)}).5K(" "):""},3v:q(t,c){v 6.2s(c,(t.V||t).3s().2Q(/\\s+/))>-1}},4n:q(e,o,f){E(u i T o){e.Y["2M"+i]=e.Y[i];e.Y[i]=o[i]}f.O(e,[]);E(u i T o)e.Y[i]=e.Y["2M"+i]},1c:q(e,p){7(p=="1u"||p=="28"){u b={},3q,3p,d=["85","83","82","80"];6.F(d,q(){b["7X"+9]=0;b["7W"+9+"7V"]=0});6.4n(e,b,q(){7(6(e).33(\':4g\')){3q=e.7S;3p=e.7Q}B{e=6(e.3r(K)).1H(":4c").5r("2D").2E().1c({49:"1y",3i:"7N",15:"2j",7M:"0",7K:"0"}).5j(e.L)[0];u a=6.1c(e.L,"3i")||"3n";7(a=="3n")e.L.Y.3i="7I";3q=e.7G;3p=e.7F;7(a=="3n")e.L.Y.3i="3n";e.L.3t(e)}});v p=="1u"?3q:3p}v 6.2q(e,p)},2q:q(e,a,d){u g;7(a=="1d"&&6.N.1h){g=6.1b(e.Y,"1d");v g==""?"1":g}7(a.3w(/3u/i))a=6.1T;7(!d&&e.Y[a])g=e.Y[a];B 7(P.3d&&P.3d.40){7(a.3w(/3u/i))a="3u";a=a.1o(/([A-Z])/g,"-$1").2T();u b=P.3d.40(e,H);7(b)g=b.52(a);B 7(a=="15")g="1G";B 6.4n(e,{15:"2j"},q(){u c=P.3d.40(9,"");g=c&&c.52(a)||""})}B 7(e.3U){u f=a.1o(/\\-(\\w)/g,q(m,c){v c.1S()});g=e.3U[a]||e.3U[f]}v g},2Y:q(a,c){u r=[];c=c||P;6.F(a,q(i,b){7(!b)v;7(b.18==3x)b=b.3s();7(1e b=="1v"){u s=6.2p(b).2T(),1z=c.55("1z"),1K=[];u a=!s.I("<2z")&&[1,"<2y>","</2y>"]||!s.I("<7i")&&[1,"<4Y>","</4Y>"]||(!s.I("<7e")||!s.I("<1x")||!s.I("<7d")||!s.I("<7a"))&&[1,"<1s>","</1s>"]||!s.I("<3k")&&[2,"<1s><1x>","</1x></1s>"]||(!s.I("<77")||!s.I("<76"))&&[3,"<1s><1x><3k>","</3k></1x></1s>"]||!s.I("<75")&&[2,"<1s><4U>","</4U></1s>"]||[0,"",""];1z.26=a[1]+b+a[2];1q(a[0]--)1z=1z.1a;7(6.N.1h){7(!s.I("<1s")&&s.I("<1x")<0)1K=1z.1a&&1z.1a.2S;B 7(a[1]=="<1s>"&&s.I("<1x")<0)1K=1z.2S;E(u n=1K.C-1;n>=0;--n)7(6.Q(1K[n],"1x")&&!1K[n].2S.C)1K[n].L.3t(1K[n])}b=6.2K(1z.2S)}7(0===b.C&&(!6.Q(b,"35")&&!6.Q(b,"2y")))v;7(b[0]==J||6.Q(b,"35")||b.73)r.R(b);B r=6.1R(r,b)});v r},1b:q(c,d,a){u e=6.43(c)?{}:6.3J;7(e[d]){7(a!=J)c[e[d]]=a;v c[e[d]]}B 7(a==J&&6.N.1h&&6.Q(c,"35")&&(d=="72"||d=="70"))v c.6X(d).5R;B 7(c.4x){7(d=="1d"&&6.N.1h){7(a!=J){c.5U=1;c.1j=(c.1j||"").1o(/4J\\([^)]*\\)/,"")+(34(a).3s()=="6S"?"":"4J(1d="+a*4Q+")")}v c.1j?(34(c.1j.3w(/1d=([^)]*)/)[1])/4Q).3s():""}7(a!=J)c.6Q(d,a);7(6.N.1h&&/4I|2r/.16(d)&&!6.43(c))v c.2Z(d,2);v c.2Z(d)}B{d=d.1o(/-([a-z])/6M,q(z,b){v b.1S()});7(a!=J)c[d]=a;v c[d]}},2p:q(t){v t.1o(/^\\s+|\\s+$/g,"")},2K:q(a){u r=[];7(1e a!="6K")E(u i=0,25=a.C;i<25;i++)r.R(a[i]);B r=a.4X(0);v r},2s:q(b,a){E(u i=0,25=a.C;i<25;i++)7(a[i]==b)v i;v-1},1R:q(a,b){E(u i=0;b[i];i++)a.R(b[i]);v a},5c:q(a){u r=[],3F=6.1m++;E(u i=0,4C=a.C;i<4C;i++)7(3F!=a[i].1m){a[i].1m=3F;r.R(a[i])}v r},1m:0,2x:q(c,b,d){7(1e b=="1v")b=17 3S("a","i","v "+b);u a=[];E(u i=0,30=c.C;i<30;i++)7(!d&&b(c[i],i)||d&&!b(c[i],i))a.R(c[i]);v a},3h:q(c,b){7(1e b=="1v")b=17 3S("a","v "+b);u d=[];E(u i=0,30=c.C;i<30;i++){u a=b(c[i],i);7(a!==H&&a!=J){7(a.18!=23)a=[a];d=d.6x(a)}}v d}});17 q(){u b=6w.6v.2T();6.N={6u:b.3w(/.+(?:6t|6r|6p|6n)[\\/: ]([\\d.]+)/)[1],2g:/5g/.16(b),2k:/2k/.16(b),1h:/1h/.16(b)&&!/2k/.16(b),3g:/3g/.16(b)&&!/(6i|5g)/.16(b)};6.6h=!6.N.1h||P.6g=="6d";6.1T=6.N.1h?"1T":"5t",6.3J={"E":"69","68":"V","3u":6.1T,5t:6.1T,1T:6.1T,26:"26",V:"V",2t:"2t",2B:"2B",2D:"2D",66:"64",2H:"2H",62:"5Z"}};6.F({5E:"a.L",4r:"6.4r(a)",8o:"6.21(a,2,\'1U\')",8n:"6.21(a,2,\'4t\')",8k:"6.4q(a.L.1a,a)",8h:"6.4q(a.1a)"},q(i,n){6.11[i]=q(a){u b=6.3h(9,n);7(a&&1e a=="1v")b=6.2w(a,b);v 9.1W(b)}});6.F({5j:"3m",8g:"5s",2J:"5p",8f:"5n"},q(i,n){6.11[i]=q(){u a=1g;v 9.F(q(){E(u j=0,25=a.C;j<25;j++)6(a[j])[n](9)})}});6.F({5r:q(a){6.1b(9,a,"");9.8e(a)},8d:q(c){6.V.1A(9,c)},8b:q(c){6.V.1B(9,c)},8a:q(c){6.V[6.V.3v(9,c)?"1B":"1A"](9,c)},1B:q(a){7(!a||6.1j(a,[9]).r.C)9.L.3t(9)},2V:q(){1q(9.1a)9.3t(9.1a)}},q(i,n){6.11[i]=q(){v 9.F(n,1g)}});6.F(["5Q","5P","5M","5L"],q(i,n){6.11[n]=q(a,b){v 9.1j(":"+n+"("+a+")",b)}});6.F(["1u","28"],q(i,n){6.11[n]=q(h){v h==J?(9.C?6.1c(9[0],n):H):9.1c(n,h.18==31?h:h+"4p")}});6.1f({4o:{"":"m[2]==\'*\'||6.Q(a,m[2])","#":"a.2Z(\'24\')==m[2]",":":{5P:"i<m[3]-0",5M:"i>m[3]-0",21:"m[3]-0==i",5Q:"m[3]-0==i",2P:"i==0",2O:"i==r.C-1",5J:"i%2==0",5G:"i%2","2P-2X":"a.L.3V(\'*\')[0]==a","2O-2X":"6.21(a.L.5F,1,\'4t\')==a","88-2X":"!6.21(a.L.5F,2,\'4t\')",5E:"a.1a",2V:"!a.1a",5L:"(a.5D||a.87||\'\').I(m[3])>=0",4g:\'"1y"!=a.G&&6.1c(a,"15")!="1G"&&6.1c(a,"49")!="1y"\',1y:\'"1y"==a.G||6.1c(a,"15")=="1G"||6.1c(a,"49")=="1y"\',86:"!a.2B",2B:"a.2B",2D:"a.2D",2H:"a.2H||6.1b(a,\'2H\')",2R:"\'2R\'==a.G",4c:"\'4c\'==a.G",5C:"\'5C\'==a.G",4m:"\'4m\'==a.G",5B:"\'5B\'==a.G",4l:"\'4l\'==a.G",5A:"\'5A\'==a.G",5z:"\'5z\'==a.G",1J:\'"1J"==a.G||6.Q(a,"1J")\',5y:"/5y|2y|84|1J/i.16(a.Q)"},"[":"6.1H(m[2],a).C"},5x:[/^\\[ *(@)([\\w-]+) *([!*$^~=]*) *(\'?"?)(.*?)\\4 *\\]/,/^(\\[)\\s*(.*?(\\[.*?\\])?[^[]*?)\\s*\\]/,/^(:)([\\w-]+)\\("?\'?(.*?(\\(.*?\\))?[^(]*?)"?\'?\\)/,17 3o("^([:.#]*)("+(6.2I="(?:[\\\\w\\81-\\7Z*1I-]|\\\\\\\\.)")+"+)")],2w:q(a,c,b){u d,1O=[];1q(a&&a!=d){d=a;u f=6.1j(a,c,b);a=f.t.1o(/^\\s*,\\s*/,"");1O=b?c=f.r:6.1R(1O,f.r)}v 1O},1H:q(t,l){7(1e t!="1v")v[t];7(l&&!l.1r)l=H;l=l||P;7(!t.I("//")){l=l.4i;t=t.2G(2,t.C)}B 7(!t.I("/")&&!l.2N){l=l.4i;t=t.2G(1,t.C);7(t.I("/")>=1)t=t.2G(t.I("/"),t.C)}u b=[l],2a=[],2O;1q(t&&2O!=t){u r=[];2O=t;t=6.2p(t).1o(/^\\/\\//,"");u k=M;u g=17 3o("^[/>]\\\\s*("+6.2I+"+)");u m=g.1Q(t);7(m){u o=m[1].1S();E(u i=0;b[i];i++)E(u c=b[i].1a;c;c=c.1U)7(c.1r==1&&(o=="*"||c.Q==o.1S()))r.R(c);b=r;t=t.1o(g,"");7(t.I(" ")==0)7T;k=K}B{g=/^((\\/?\\.\\.)|([>\\/+~]))\\s*([a-z]*)/i;7((m=g.1Q(t))!=H){r=[];u o=m[4],1m=6.1m++;m=m[1];E(u j=0,2b=b.C;j<2b;j++)7(m.I("..")<0){u n=m=="~"||m=="+"?b[j].1U:b[j].1a;E(;n;n=n.1U)7(n.1r==1){7(m=="~"&&n.1m==1m)1E;7(!o||n.Q==o.1S()){7(m=="~")n.1m=1m;r.R(n)}7(m=="+")1E}}B r.R(b[j].L);b=r;t=6.2p(t.1o(g,""));k=K}}7(t&&!k){7(!t.I(",")){7(l==b[0])b.4f();2a=6.1R(2a,b);r=b=[l];t=" "+t.2G(1,t.C)}B{u h=17 3o("^("+6.2I+"+)(#)("+6.2I+"+)");u m=h.1Q(t);7(m){m=[0,m[2],m[3],m[1]]}B{h=17 3o("^([#.]?)("+6.2I+"*)");m=h.1Q(t)}m[2]=m[2].1o(/\\\\/g,"");u f=b[b.C-1];7(m[1]=="#"&&f&&f.4e){u p=f.4e(m[2]);7((6.N.1h||6.N.2k)&&p&&1e p.24=="1v"&&p.24!=m[2])p=6(\'[@24="\'+m[2]+\'"]\',f)[0];b=r=p&&(!m[3]||6.Q(p,m[3]))?[p]:[]}B{E(u i=0;b[i];i++){u a=m[1]!=""||m[0]==""?"*":m[2];7(a=="*"&&b[i].Q.2T()=="7R")a="2C";r=6.1R(r,b[i].3V(a))}7(m[1]==".")r=6.4d(r,m[2]);7(m[1]=="#"){u e=[];E(u i=0;r[i];i++)7(r[i].2Z("24")==m[2]){e=[r[i]];1E}r=e}b=r}t=t.1o(h,"")}}7(t){u d=6.1j(t,r);b=r=d.r;t=6.2p(d.t)}}7(t)b=[];7(b&&l==b[0])b.4f();2a=6.1R(2a,b);v 2a},4d:q(r,m,a){m=" "+m+" ";u b=[];E(u i=0;r[i];i++){u c=(" "+r[i].V+" ").I(m)>=0;7(!a&&c||a&&!c)b.R(r[i])}v b},1j:q(t,r,h){u d;1q(t&&t!=d){d=t;u p=6.5x,m;E(u i=0;p[i];i++){m=p[i].1Q(t);7(m){t=t.7P(m[0].C);m[2]=m[2].1o(/\\\\/g,"");1E}}7(!m)1E;7(m[1]==":"&&m[2]=="4V")r=6.1j(m[3],r,K).r;B 7(m[1]==".")r=6.4d(r,m[2],h);B 7(m[1]=="@"){u g=[],G=m[3];E(u i=0,2b=r.C;i<2b;i++){u a=r[i],z=a[6.3J[m[2]]||m[2]];7(z==H||/4I|2r/.16(m[2]))z=6.1b(a,m[2]);7((G==""&&!!z||G=="="&&z==m[5]||G=="!="&&z!=m[5]||G=="^="&&z&&!z.I(m[5])||G=="$="&&z.2G(z.C-m[5].C)==m[5]||(G=="*="||G=="~=")&&z.I(m[5])>=0)^h)g.R(a)}r=g}B 7(m[1]==":"&&m[2]=="21-2X"){u e=6.1m++,g=[],16=/(\\d*)n\\+?(\\d*)/.1Q(m[3]=="5J"&&"2n"||m[3]=="5G"&&"2n+1"||!/\\D/.16(m[3])&&"n+"+m[3]||m[3]),2P=(16[1]||1)-0,d=16[2]-0;E(u i=0,2b=r.C;i<2b;i++){u j=r[i],L=j.L;7(e!=L.1m){u c=1;E(u n=L.1a;n;n=n.1U)7(n.1r==1)n.4b=c++;L.1m=e}u b=M;7(2P==1){7(d==0||j.4b==d)b=K}B 7((j.4b+d)%2P==0)b=K;7(b^h)g.R(j)}r=g}B{u f=6.4o[m[1]];7(1e f!="1v")f=6.4o[m[1]][m[2]];4a("f = q(a,i){v "+f+"}");r=6.2x(r,f,h)}}v{r:r,t:t}},4r:q(c){u b=[];u a=c.L;1q(a&&a!=P){b.R(a);a=a.L}v b},21:q(a,e,c,b){e=e||1;u d=0;E(;a;a=a[c])7(a.1r==1&&++d==e)1E;v a},4q:q(n,a){u r=[];E(;n;n=n.1U){7(n.1r==1&&(!a||n!=a))r.R(n)}v r}});6.S={1A:q(d,e,c,b){7(6.N.1h&&d.3l!=J)d=12;7(!c.1M)c.1M=9.1M++;7(b!=J){u f=c;c=q(){v f.O(9,1g)};c.W=b;c.1M=f.1M}7(!d.$19)d.$19={};7(!d.$1p)d.$1p=q(){u a;7(1e 6=="J"||6.S.48)v a;a=6.S.1p.O(d,1g);v a};u g=d.$19[e];7(!g){g=d.$19[e]={};7(d.47)d.47(e,d.$1p,M);B d.7O("5m"+e,d.$1p)}g[c.1M]=c;7(!9.U[e])9.U[e]=[];7(6.2s(d,9.U[e])==-1)9.U[e].R(d)},1M:1,U:{},1B:q(b,c,a){u d=b.$19,1V,2m;7(d){7(c&&c.G){a=c.46;c=c.G}7(!c){E(c T d)9.1B(b,c)}B 7(d[c]){7(a)3j d[c][a.1M];B E(a T b.$19[c])3j d[c][a];E(1V T d[c])1E;7(!1V){7(b.45)b.45(c,b.$1p,M);B b.7L("5m"+c,b.$1p);1V=H;3j d[c];1q(9.U[c]&&((2m=6.2s(b,9.U[c]))>=0))3j 9.U[c][2m]}}E(1V T d)1E;7(!1V)b.$1p=b.$19=H}},1t:q(c,b,d){b=6.2K(b||[]);7(!d)6.F(9.U[c]||[],q(){6.S.1t(c,b,9)});B{u a,1V,11=6.14(d[c]||H);b.5k(9.44({G:c,1N:d}));7(6.14(d.$1p)&&(a=d.$1p.O(d,b))!==M)9.48=K;7(11&&a!==M&&!6.Q(d,\'a\'))d[c]();9.48=M}},1p:q(b){u a;b=6.S.44(b||12.S||{});u c=9.$19&&9.$19[b.G],1Z=[].4X.3D(1g,1);1Z.5k(b);E(u j T c){1Z[0].46=c[j];1Z[0].W=c[j].W;7(c[j].O(9,1Z)===M){b.2d();b.2L();a=M}}7(6.N.1h)b.1N=b.2d=b.2L=b.46=b.W=H;v a},44:q(c){u a=c;c=6.1f({},a);c.2d=q(){7(a.2d)v a.2d();a.7J=M};c.2L=q(){7(a.2L)v a.2L();a.7H=K};7(!c.1N&&c.5i)c.1N=c.5i;7(6.N.2g&&c.1N.1r==3)c.1N=a.1N.L;7(!c.42&&c.4k)c.42=c.4k==c.1N?c.7E:c.4k;7(c.5h==H&&c.5f!=H){u e=P.4i,b=P.4w;c.5h=c.5f+(e&&e.5I||b.5I);c.7D=c.7C+(e&&e.5b||b.5b)}7(!c.3f&&(c.5a||c.5O))c.3f=c.5a||c.5O;7(!c.59&&c.58)c.59=c.58;7(!c.3f&&c.1J)c.3f=(c.1J&1?1:(c.1J&2?3:(c.1J&4?2:0)));v c}};6.11.1f({3e:q(c,a,b){v c=="3z"?9.41(c,a,b):9.F(q(){6.S.1A(9,c,b||a,b&&a)})},41:q(d,b,c){v 9.F(q(){6.S.1A(9,d,q(a){6(9).3C(a);v(c||b).O(9,1g)},c&&b)})},3C:q(a,b){v 9.F(q(){6.S.1B(9,a,b)})},1t:q(a,b){v 9.F(q(){6.S.1t(a,b,9)})},1P:q(){u a=1g;v 9.57(q(e){9.3O=0==9.3O?1:0;e.2d();v a[9.3O].O(9,[e])||M})},7y:q(f,g){q 3Y(e){u p=e.42;1q(p&&p!=9)2c{p=p.L}2h(e){p=9};7(p==9)v M;v(e.G=="3X"?f:g).O(9,[e])}v 9.3X(3Y).54(3Y)},1D:q(f){7(6.3c)f.O(P,[6]);B 6.2o.R(q(){v f.O(9,[6])});v 9}});6.1f({3c:M,2o:[],1D:q(){7(!6.3c){6.3c=K;7(6.2o){6.F(6.2o,q(){9.O(P)});6.2o=H}7(6.N.3g||6.N.2k)P.45("53",6.1D,M);7(!12.7x.C)6(12).1X(q(){6("#3W").1B()})}}});17 q(){6.F(("7w,7v,1X,7u,7t,3z,57,7s,"+"7r,7q,7p,3X,54,7o,2y,"+"4l,7n,7m,7l,29").2Q(","),q(i,o){6.11[o]=q(f){v f?9.3e(o,f):9.1t(o)}});7(6.N.3g||6.N.2k)P.47("53",6.1D,M);B 7(6.N.1h){P.7k("<7j"+"7h 24=3W 7g=K "+"2r=//:><\\/3a>");u a=P.4e("3W");7(a)a.7f=q(){7(9.39!="1n")v;6.1D()};a=H}B 7(6.N.2g)6.3R=3l(q(){7(P.39=="7c"||P.39=="1n"){3P(6.3R);6.3R=H;6.1D()}},10);6.S.1A(12,"1X",6.1D)};7(6.N.1h)6(12).41("3z",q(){u a=6.S.U;E(u b T a){u c=a[b],i=c.C;7(i&&b!=\'3z\')79 c[i-1]&&6.S.1B(c[i-1],b);1q(--i)}});6.11.1f({78:q(c,b,a){9.1X(c,b,a,1)},1X:q(g,d,c,e){7(6.14(g))v 9.3e("1X",g);c=c||q(){};u f="3M";7(d)7(6.14(d)){c=d;d=H}B{d=6.2C(d);f="4W"}u h=9;6.37({1C:g,G:f,W:d,2v:e,1n:q(a,b){7(b=="27"||!e&&b=="4T")h.1b("26",a.36).3L().F(c,[a.36,b,a]);B c.O(h,[a.36,b,a])}});v 9},74:q(){v 6.2C(9)},3L:q(){v 9.1H("3a").F(q(){7(9.2r)6.4S(9.2r);B 6.3H(9.2R||9.5D||9.26||"")}).2E()}});6.F("4R,4E,4P,4O,4N,4F".2Q(","),q(i,o){6.11[o]=q(f){v 9.3e(o,f)}});6.1f({1L:q(e,c,a,d,b){7(6.14(c)){a=c;c=H}v 6.37({G:"3M",1C:e,W:c,27:a,3I:d,2v:b})},6Y:q(d,b,a,c){v 6.1L(d,b,a,c,1)},4S:q(b,a){v 6.1L(b,H,a,"3a")},6W:q(c,b,a){v 6.1L(c,b,a,"4L")},6V:q(d,b,a,c){7(6.14(b)){a=b;b={}}v 6.37({G:"4W",1C:d,W:b,27:a,3I:c})},6U:q(a){6.32.20=a},6Z:q(a){6.1f(6.32,a)},32:{U:K,G:"3M",20:0,4K:"6R/x-6P-35-6O",4M:K,2W:K,W:H},38:{},37:q(s){s=6.1f({},6.32,s);7(s.W){7(s.4M&&1e s.W!="1v")s.W=6.2C(s.W);7(s.G.2T()=="1L"){s.1C+=((s.1C.I("?")>-1)?"&":"?")+s.W;s.W=H}}7(s.U&&!6.3G++)6.S.1t("4R");u f=M;u h=12.4H?17 4H("6N.6L"):17 4G();h.7b(s.G,s.1C,s.2W);7(s.W)h.3N("6J-6I",s.4K);7(s.2v)h.3N("6H-3Q-6F",6.38[s.1C]||"6E, 6D 6C 6B 3T:3T:3T 6A");h.3N("X-6z-6y","4G");7(s.5e)s.5e(h);7(s.U)6.S.1t("4F",[h,s]);u g=q(d){7(h&&(h.39==4||d=="20")){f=K;7(i){3P(i);i=H}u c;2c{c=6.56(h)&&d!="20"?s.2v&&6.4B(h,s.1C)?"4T":"27":"29";7(c!="29"){u b;2c{b=h.3E("50-3Q")}2h(e){}7(s.2v&&b)6.38[s.1C]=b;u a=6.4Z(h,s.3I);7(s.27)s.27(a,c);7(s.U)6.S.1t("4N",[h,s])}B 6.3b(s,h,c)}2h(e){c="29";6.3b(s,h,c,e)}7(s.U)6.S.1t("4P",[h,s]);7(s.U&&!--6.3G)6.S.1t("4E");7(s.1n)s.1n(h,c);7(s.2W)h=H}};u i=3l(g,13);7(s.20>0)51(q(){7(h){h.6s();7(!f)g("20")}},s.20);2c{h.6q(s.W)}2h(e){6.3b(s,h,H,e)}7(!s.2W)g();v h},3b:q(s,a,b,e){7(s.29)s.29(a,b,e);7(s.U)6.S.1t("4O",[a,s,e])},3G:0,56:q(r){2c{v!r.1Y&&7A.7B=="4m:"||(r.1Y>=5d&&r.1Y<6m)||r.1Y==5q||6.N.2g&&r.1Y==J}2h(e){}v M},4B:q(a,c){2c{u b=a.3E("50-3Q");v a.1Y==5q||b==6.38[c]||6.N.2g&&a.1Y==J}2h(e){}v M},4Z:q(r,b){u c=r.3E("6l-G");u a=!b&&c&&c.I("4z")>=0;a=b=="4z"||a?r.6k:r.36;7(b=="3a")6.3H(a);7(b=="4L")a=4a("("+a+")");7(b=="3K")6("<1z>").3K(a).3L();v a},2C:q(a){u s=[];7(a.18==23||a.3B)6.F(a,q(){s.R(2e(9.6j)+"="+2e(9.2t))});B E(u j T a)7(a[j]&&a[j].18==23)6.F(a[j],q(){s.R(2e(j)+"="+2e(9))});B s.R(2e(j)+"="+2e(a[j]));v s.5K("&")},3H:q(a){7(12.4y)12.4y(a);B 7(6.N.2g)12.51(a,0);B 4a.3D(12,a)}});6.11.1f({1k:q(b,a){v b?9.1w({1u:"1k",28:"1k",1d:"1k"},b,a):9.1j(":1y").F(q(){9.Y.15=9.2f?9.2f:"";7(6.1c(9,"15")=="1G")9.Y.15="2j"}).2E()},1i:q(b,a){v b?9.1w({1u:"1i",28:"1i",1d:"1i"},b,a):9.1j(":4g").F(q(){9.2f=9.2f||6.1c(9,"15");7(9.2f=="1G")9.2f="2j";9.Y.15="1G"}).2E()},5o:6.11.1P,1P:q(a,b){v 6.14(a)&&6.14(b)?9.5o(a,b):a?9.1w({1u:"1P",28:"1P",1d:"1P"},a,b):9.F(q(){6(9)[6(9).33(":1y")?"1k":"1i"]()})},6f:q(b,a){v 9.1w({1u:"1k"},b,a)},6e:q(b,a){v 9.1w({1u:"1i"},b,a)},6c:q(b,a){v 9.1w({1u:"1P"},b,a)},6b:q(b,a){v 9.1w({1d:"1k"},b,a)},6a:q(b,a){v 9.1w({1d:"1i"},b,a)},7U:q(c,a,b){v 9.1w({1d:a},c,b)},1w:q(d,h,f,g){v 9.1l(q(){u c=6(9).33(":1y"),2z=6.5v(h,f,g),5u=9;E(u p T d)7(d[p]=="1i"&&c||d[p]=="1k"&&!c)v 6.14(2z.1n)&&2z.1n.O(9);9.2i=6.1f({},d);6.F(d,q(a,b){u e=17 6.2A(5u,2z,a);7(b.18==3x)e.2U(e.1O(),b);B e[b=="1P"?c?"1k":"1i":b](d)})})},1l:q(a,b){7(!b){b=a;a="2A"}v 9.F(q(){7(!9.1l)9.1l={};7(!9.1l[a])9.1l[a]=[];9.1l[a].R(b);7(9.1l[a].C==1)b.O(9)})}});6.1f({5v:q(b,a,c){u d=b&&b.18==65?b:{1n:c||!c&&a||6.14(b)&&b,1F:b,2u:c&&a||a&&a.18!=3S&&a||(6.2u.4j?"4j":"5w")};d.1F=(d.1F&&d.1F.18==3x?d.1F:{63:61,60:5d}[d.1F])||89;d.2M=d.1n;d.1n=q(){6.5N(9,"2A");7(6.14(d.2M))d.2M.O(9)};v d},2u:{5w:q(p,n,b,a){v b+a*p},4j:q(p,n,b,a){v((-5H.5X(p*5H.5W)/2)+0.5)*a+b}},1l:{},5N:q(b,a){a=a||"2A";7(b.1l&&b.1l[a]){b.1l[a].4f();u f=b.1l[a][0];7(f)f.O(b)}},3y:[],2A:q(h,e,j){u z=9;u y=h.Y;7(j=="1u"||j=="28"){u f=6.1c(h,"15");u g=y.4u;y.4u="1y"}z.a=q(){7(e.3A)e.3A.O(h,[z.2l]);7(j=="1d")6.1b(y,"1d",z.2l);B{y[j]=8m(z.2l)+"4p";y.15="2j"}};z.5V=q(){v 34(6.1c(h,j))};z.1O=q(){u r=34(6.2q(h,j));v r&&r>-8l?r:z.5V()};z.2U=q(c,b){z.4s=(17 5T()).5S();z.2l=c;z.a();6.3y.R(q(){v z.3A(c,b)});7(6.3y.C==1){u d=3l(q(){u a=6.3y;E(u i=0;i<a.C;i++)7(!a[i]())a.8j(i--,1);7(!a.C)3P(d)},13)}};z.1k=q(){7(!h.22)h.22={};h.22[j]=6.1b(h.Y,j);e.1k=K;z.2U(0,9.1O());7(j!="1d")y[j]="8q";6(h).1k()};z.1i=q(){7(!h.22)h.22={};h.22[j]=6.1b(h.Y,j);e.1i=K;z.2U(9.1O(),0)};z.3A=q(a,c){u t=(17 5T()).5S();7(t>e.1F+z.4s){z.2l=c;z.a();7(h.2i)h.2i[j]=K;u b=K;E(u i T h.2i)7(h.2i[i]!==K)b=M;7(b){7(f!=H){y.4u=g;y.15=f;7(6.1c(h,"15")=="1G")y.15="2j"}7(e.1i)y.15="1G";7(e.1i||e.1k)E(u p T h.2i)6.1b(y,p,h.22[p])}7(b&&6.14(e.1n))e.1n.O(h);v M}B{u n=t-9.4s;u p=n/e.1F;z.2l=6.2u[e.2u](p,n,a,(c-a),e.1F);z.a()}v K}}})}',62,524,'||||||jQuery|if||this|||||||||||||||||function||||var|return||||||else|length||for|each|type|null|indexOf|undefined|true|parentNode|false|browser|apply|document|nodeName|push|event|in|global|className|data||style|||fn|window||isFunction|display|test|new|constructor|events|firstChild|attr|css|opacity|typeof|extend|arguments|msie|hide|filter|show|queue|mergeNum|complete|replace|handle|while|nodeType|table|trigger|height|string|animate|tbody|hidden|div|add|remove|url|ready|break|duration|none|find|_|button|tb|get|guid|target|cur|toggle|exec|merge|toUpperCase|styleFloat|nextSibling|ret|pushStack|load|status|args|timeout|nth|orig|Array|id|al|innerHTML|success|width|error|done|rl|try|preventDefault|encodeURIComponent|oldblock|safari|catch|curAnim|block|opera|now|index||readyList|trim|curCSS|src|inArray|value|easing|ifModified|multiFilter|grep|select|opt|fx|disabled|param|checked|end|domManip|substr|selected|chars|insertBefore|makeArray|stopPropagation|old|ownerDocument|last|first|split|text|childNodes|toLowerCase|custom|empty|async|child|clean|getAttribute|el|String|ajaxSettings|is|parseFloat|form|responseText|ajax|lastModified|readyState|script|handleError|isReady|defaultView|bind|which|mozilla|map|position|delete|tr|setInterval|append|static|RegExp|oWidth|oHeight|cloneNode|toString|removeChild|float|has|match|Number|timers|unload|step|jquery|unbind|call|getResponseHeader|num|active|globalEval|dataType|props|html|evalScripts|GET|setRequestHeader|lastToggle|clearInterval|Modified|safariTimer|Function|00|currentStyle|getElementsByTagName|__ie_init|mouseover|handleHover|init|getComputedStyle|one|relatedTarget|isXMLDoc|fix|removeEventListener|handler|addEventListener|triggered|visibility|eval|nodeIndex|radio|classFilter|getElementById|shift|visible|appendChild|documentElement|swing|fromElement|submit|file|swap|expr|px|sibling|parents|startTime|previousSibling|overflow|ol|body|tagName|execScript|xml|setArray|httpNotModified|fl|prop|ajaxStop|ajaxSend|XMLHttpRequest|ActiveXObject|href|alpha|contentType|json|processData|ajaxSuccess|ajaxError|ajaxComplete|100|ajaxStart|getScript|notmodified|colgroup|not|POST|slice|fieldset|httpData|Last|setTimeout|getPropertyValue|DOMContentLoaded|mouseout|createElement|httpSuccess|click|ctrlKey|metaKey|charCode|scrollTop|unique|200|beforeSend|clientX|webkit|pageX|srcElement|appendTo|unshift|prevObject|on|after|_toggle|before|304|removeAttr|prepend|cssFloat|self|speed|linear|parse|input|reset|image|password|checkbox|textContent|parent|lastChild|odd|Math|scrollLeft|even|join|contains|gt|dequeue|keyCode|lt|eq|nodeValue|getTime|Date|zoom|max|PI|cos|font|maxLength|fast|600|maxlength|slow|readOnly|Object|readonly|createTextNode|class|htmlFor|fadeOut|fadeIn|slideToggle|CSS1Compat|slideUp|slideDown|compatMode|boxModel|compatible|name|responseXML|content|300|ie|noConflict|ra|send|it|abort|rv|version|userAgent|navigator|concat|With|Requested|GMT|1970|Jan|01|Thu|Since|reverse|If|Type|Content|array|XMLHTTP|ig|Microsoft|urlencoded|www|setAttribute|application|NaN|val|ajaxTimeout|post|getJSON|getAttributeNode|getIfModified|ajaxSetup|method|FORM|action|options|serialize|col|th|td|loadIfModified|do|colg|open|loaded|tfoot|thead|onreadystatechange|defer|ipt|leg|scr|write|keyup|keypress|keydown|change|mousemove|mouseup|mousedown|dblclick|scroll|resize|focus|blur|frames|hover|clone|location|protocol|clientY|pageY|toElement|clientWidth|clientHeight|cancelBubble|relative|returnValue|left|detachEvent|right|absolute|attachEvent|substring|offsetWidth|object|offsetHeight|continue|fadeTo|Width|border|padding|size|uFFFF|Left|u0128|Right|Bottom|textarea|Top|enabled|innerText|only|400|toggleClass|removeClass|wrap|addClass|removeAttribute|insertAfter|prependTo|children|line|splice|siblings|10000|parseInt|prev|next|weight|1px|prototype'.split('|'),0,{}))
\ No newline at end of file
Added: XoopsModules/newsslider/trunk/newsslider/js/jquery.min.js
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/js/jquery.min.js (rev 0)
+++ XoopsModules/newsslider/trunk/newsslider/js/jquery.min.js 2012-02-13 19:52:09 UTC (rev 8963)
@@ -0,0 +1,19 @@
+/*
+ * jQuery JavaScript Library v1.3.2
+ * http://jquery.com/
+ *
+ * Copyright (c) 2009 John Resig
+ * Dual licensed under the MIT and GPL licenses.
+ * http://docs.jquery.com/License
+ *
+ * Date: 2009-02-19 17:34:21 -0500 (Thu, 19 Feb 2009)
+ * Revision: 6246
+ */
+(function(){var l=this,g,y=l.jQuery,p=l.$,o=l.jQuery=l.$=function(E,F){return new o.fn.init(E,F)},D=/^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/,f=/^.[^:#\[\.,]*$/;o.fn=o.prototype={init:function(E,H){E=E||document;if(E.nodeType){this[0]=E;this.length=1;this.context=E;return this}if(typeof E==="string"){var G=D.exec(E);if(G&&(G[1]||!H)){if(G[1]){E=o.clean([G[1]],H)}else{var I=document.getElementById(G[3]);if(I&&I.id!=G[3]){return o().find(E)}var F=o(I||[]);F.context=document;F.selector=E;return F}}else{return o(H).find(E)}}else{if(o.isFunction(E)){return o(document).ready(E)}}if(E.selector&&E.context){this.selector=E.selector;this.context=E.context}return this.setArray(o.isArray(E)?E:o.makeArray(E))},selector:"",jquery:"1.3.2",size:function(){return this.length},get:function(E){return E===g?Array.prototype.slice.call(this):this[E]},pushStack:function(F,H,E){var G=o(F);G.prevObject=this;G.context=this.context;if(H==="find"){G.selector=this.selector+(this.selector?" ":"")+E}else{if(H){G.selector=this.selector+"."+H+"("+E+")"}}return G},setArray:function(E){this.length=0;Array.prototype.push.apply(this,E);return this},each:function(F,E){return o.each(this,F,E)},index:function(E){return o.inArray(E&&E.jquery?E[0]:E,this)},attr:function(F,H,G){var E=F;if(typeof F==="string"){if(H===g){return this[0]&&o[G||"attr"](this[0],F)}else{E={};E[F]=H}}return this.each(function(I){for(F in E){o.attr(G?this.style:this,F,o.prop(this,E[F],G,I,F))}})},css:function(E,F){if((E=="width"||E=="height")&&parseFloat(F)<0){F=g}return this.attr(E,F,"curCSS")},text:function(F){if(typeof F!=="object"&&F!=null){return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(F))}var E="";o.each(F||this,function(){o.each(this.childNodes,function(){if(this.nodeType!=8){E+=this.nodeType!=1?this.nodeValue:o.fn.text([this])}})});return E},wrapAll:function(E){if(this[0]){var F=o(E,this[0].ownerDocument).clone();if(this[0].parentNode){F.insertBefore(this[0])}F.map(function(){var G=this;while(G.firstChild){G=G.firstChild}return G}).append(this)}return this},wrapInner:function(E){return this.each(function(){o(this).contents().wrapAll(E)})},wrap:function(E){return this.each(function(){o(this).wrapAll(E)})},append:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.appendChild(E)}})},prepend:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.insertBefore(E,this.firstChild)}})},before:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this)})},after:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this.nextSibling)})},end:function(){return this.prevObject||o([])},push:[].push,sort:[].sort,splice:[].splice,find:function(E){if(this.length===1){var F=this.pushStack([],"find",E);F.length=0;o.find(E,this[0],F);return F}else{return this.pushStack(o.unique(o.map(this,function(G){return o.find(E,G)})),"find",E)}},clone:function(G){var E=this.map(function(){if(!o.support.noCloneEvent&&!o.isXMLDoc(this)){var I=this.outerHTML;if(!I){var J=this.ownerDocument.createElement("div");J.appendChild(this.cloneNode(true));I=J.innerHTML}return o.clean([I.replace(/ jQuery\d+="(?:\d+|null)"/g,"").replace(/^\s*/,"")])[0]}else{return this.cloneNode(true)}});if(G===true){var H=this.find("*").andSelf(),F=0;E.find("*").andSelf().each(function(){if(this.nodeName!==H[F].nodeName){return}var I=o.data(H[F],"events");for(var K in I){for(var J in I[K]){o.event.add(this,K,I[K][J],I[K][J].data)}}F++})}return E},filter:function(E){return this.pushStack(o.isFunction(E)&&o.grep(this,function(G,F){return E.call(G,F)})||o.multiFilter(E,o.grep(this,function(F){return F.nodeType===1})),"filter",E)},closest:function(E){var G=o.expr.match.POS.test(E)?o(E):null,F=0;return this.map(function(){var H=this;while(H&&H.ownerDocument){if(G?G.index(H)>-1:o(H).is(E)){o.data(H,"closest",F);return H}H=H.parentNode;F++}})},not:function(E){if(typeof E==="string"){if(f.test(E)){return this.pushStack(o.multiFilter(E,this,true),"not",E)}else{E=o.multiFilter(E,this)}}var F=E.length&&E[E.length-1]!==g&&!E.nodeType;return this.filter(function(){return F?o.inArray(this,E)<0:this!=E})},add:function(E){return this.pushStack(o.unique(o.merge(this.get(),typeof E==="string"?o(E):o.makeArray(E))))},is:function(E){return !!E&&o.multiFilter(E,this).length>0},hasClass:function(E){return !!E&&this.is("."+E)},val:function(K){if(K===g){var E=this[0];if(E){if(o.nodeName(E,"option")){return(E.attributes.value||{}).specified?E.value:E.text}if(o.nodeName(E,"select")){var I=E.selectedIndex,L=[],M=E.options,H=E.type=="select-one";if(I<0){return null}for(var F=H?I:0,J=H?I+1:M.length;F<J;F++){var G=M[F];if(G.selected){K=o(G).val();if(H){return K}L.push(K)}}return L}return(E.value||"").replace(/\r/g,"")}return g}if(typeof K==="number"){K+=""}return this.each(function(){if(this.nodeType!=1){return}if(o.isArray(K)&&/radio|checkbox/.test(this.type)){this.checked=(o.inArray(this.value,K)>=0||o.inArray(this.name,K)>=0)}else{if(o.nodeName(this,"select")){var N=o.makeArray(K);o("option",this).each(function(){this.selected=(o.inArray(this.value,N)>=0||o.inArray(this.text,N)>=0)});if(!N.length){this.selectedIndex=-1}}else{this.value=K}}})},html:function(E){return E===g?(this[0]?this[0].innerHTML.replace(/ jQuery\d+="(?:\d+|null)"/g,""):null):this.empty().append(E)},replaceWith:function(E){return this.after(E).remove()},eq:function(E){return this.slice(E,+E+1)},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments),"slice",Array.prototype.slice.call(arguments).join(","))},map:function(E){return this.pushStack(o.map(this,function(G,F){return E.call(G,F,G)}))},andSelf:function(){return this.add(this.prevObject)},domManip:function(J,M,L){if(this[0]){var I=(this[0].ownerDocument||this[0]).createDocumentFragment(),F=o.clean(J,(this[0].ownerDocument||this[0]),I),H=I.firstChild;if(H){for(var G=0,E=this.length;G<E;G++){L.call(K(this[G],H),this.length>1||G>0?I.cloneNode(true):I)}}if(F){o.each(F,z)}}return this;function K(N,O){return M&&o.nodeName(N,"table")&&o.nodeName(O,"tr")?(N.getElementsByTagName("tbody")[0]||N.appendChild(N.ownerDocument.createElement("tbody"))):N}}};o.fn.init.prototype=o.fn;function z(E,F){if(F.src){o.ajax({url:F.src,async:false,dataType:"script"})}else{o.globalEval(F.text||F.textContent||F.innerHTML||"")}if(F.parentNode){F.parentNode.removeChild(F)}}function e(){return +new Date}o.extend=o.fn.extend=function(){var J=arguments[0]||{},H=1,I=arguments.length,E=false,G;if(typeof J==="boolean"){E=J;J=arguments[1]||{};H=2}if(typeof J!=="object"&&!o.isFunction(J)){J={}}if(I==H){J=this;--H}for(;H<I;H++){if((G=arguments[H])!=null){for(var F in G){var K=J[F],L=G[F];if(J===L){continue}if(E&&L&&typeof L==="object"&&!L.nodeType){J[F]=o.extend(E,K||(L.length!=null?[]:{}),L)}else{if(L!==g){J[F]=L}}}}}return J};var b=/z-?index|font-?weight|opacity|zoom|line-?height/i,q=document.defaultView||{},s=Object.prototype.toString;o.extend({noConflict:function(E){l.$=p;if(E){l.jQuery=y}return o},isFunction:function(E){return s.call(E)==="[object Function]"},isArray:function(E){return s.call(E)==="[object Array]"},isXMLDoc:function(E){return E.nodeType===9&&E.documentElement.nodeName!=="HTML"||!!E.ownerDocument&&o.isXMLDoc(E.ownerDocument)},globalEval:function(G){if(G&&/\S/.test(G)){var F=document.getElementsByTagName("head")[0]||document.documentElement,E=document.createElement("script");E.type="text/javascript";if(o.support.scriptEval){E.appendChild(document.createTextNode(G))}else{E.text=G}F.insertBefore(E,F.firstChild);F.removeChild(E)}},nodeName:function(F,E){return F.nodeName&&F.nodeName.toUpperCase()==E.toUpperCase()},each:function(G,K,F){var E,H=0,I=G.length;if(F){if(I===g){for(E in G){if(K.apply(G[E],F)===false){break}}}else{for(;H<I;){if(K.apply(G[H++],F)===false){break}}}}else{if(I===g){for(E in G){if(K.call(G[E],E,G[E])===false){break}}}else{for(var J=G[0];H<I&&K.call(J,H,J)!==false;J=G[++H]){}}}return G},prop:function(H,I,G,F,E){if(o.isFunction(I)){I=I.call(H,F)}return typeof I==="number"&&G=="curCSS"&&!b.test(E)?I+"px":I},className:{add:function(E,F){o.each((F||"").split(/\s+/),function(G,H){if(E.nodeType==1&&!o.className.has(E.className,H)){E.className+=(E.className?" ":"")+H}})},remove:function(E,F){if(E.nodeType==1){E.className=F!==g?o.grep(E.className.split(/\s+/),function(G){return !o.className.has(F,G)}).join(" "):""}},has:function(F,E){return F&&o.inArray(E,(F.className||F).toString().split(/\s+/))>-1}},swap:function(H,G,I){var E={};for(var F in G){E[F]=H.style[F];H.style[F]=G[F]}I.call(H);for(var F in G){H.style[F]=E[F]}},css:function(H,F,J,E){if(F=="width"||F=="height"){var L,G={position:"absolute",visibility:"hidden",display:"block"},K=F=="width"?["Left","Right"]:["Top","Bottom"];function I(){L=F=="width"?H.offsetWidth:H.offsetHeight;if(E==="border"){return}o.each(K,function(){if(!E){L-=parseFloat(o.curCSS(H,"padding"+this,true))||0}if(E==="margin"){L+=parseFloat(o.curCSS(H,"margin"+this,true))||0}else{L-=parseFloat(o.curCSS(H,"border"+this+"Width",true))||0}})}if(H.offsetWidth!==0){I()}else{o.swap(H,G,I)}return Math.max(0,Math.round(L))}return o.curCSS(H,F,J)},curCSS:function(I,F,G){var L,E=I.style;if(F=="opacity"&&!o.support.opacity){L=o.attr(E,"opacity");return L==""?"1":L}if(F.match(/float/i)){F=w}if(!G&&E&&E[F]){L=E[F]}else{if(q.getComputedStyle){if(F.match(/float/i)){F="float"}F=F.replace(/([A-Z])/g,"-$1").toLowerCase();var M=q.getComputedStyle(I,null);if(M){L=M.getPropertyValue(F)}if(F=="opacity"&&L==""){L="1"}}else{if(I.currentStyle){var J=F.replace(/\-(\w)/g,function(N,O){return O.toUpperCase()});L=I.currentStyle[F]||I.currentStyle[J];if(!/^\d+(px)?$/i.test(L)&&/^\d/.test(L)){var H=E.left,K=I.runtimeStyle.left;I.runtimeStyle.left=I.currentStyle.left;E.left=L||0;L=E.pixelLeft+"px";E.left=H;I.runtimeStyle.left=K}}}}return L},clean:function(F,K,I){K=K||document;if(typeof K.createElement==="undefined"){K=K.ownerDocument||K[0]&&K[0].ownerDocument||document}if(!I&&F.length===1&&typeof F[0]==="string"){var H=/^<(\w+)\s*\/?>$/.exec(F[0]);if(H){return[K.createElement(H[1])]}}var G=[],E=[],L=K.createElement("div");o.each(F,function(P,S){if(typeof S==="number"){S+=""}if(!S){return}if(typeof S==="string"){S=S.replace(/(<(\w+)[^>]*?)\/>/g,function(U,V,T){return T.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?U:V+"></"+T+">"});var O=S.replace(/^\s+/,"").substring(0,10).toLowerCase();var Q=!O.indexOf("<opt")&&[1,"<select multiple='multiple'>","</select>"]||!O.indexOf("<leg")&&[1,"<fieldset>","</fieldset>"]||O.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"<table>","</table>"]||!O.indexOf("<tr")&&[2,"<table><tbody>","</tbody></table>"]||(!O.indexOf("<td")||!O.indexOf("<th"))&&[3,"<table><tbody><tr>","</tr></tbody></table>"]||!O.indexOf("<col")&&[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"]||!o.support.htmlSerialize&&[1,"div<div>","</div>"]||[0,"",""];L.innerHTML=Q[1]+S+Q[2];while(Q[0]--){L=L.lastChild}if(!o.support.tbody){var R=/<tbody/i.test(S),N=!O.indexOf("<table")&&!R?L.firstChild&&L.firstChild.childNodes:Q[1]=="<table>"&&!R?L.childNodes:[];for(var M=N.length-1;M>=0;--M){if(o.nodeName(N[M],"tbody")&&!N[M].childNodes.length){N[M].parentNode.removeChild(N[M])}}}if(!o.support.leadingWhitespace&&/^\s/.test(S)){L.insertBefore(K.createTextNode(S.match(/^\s*/)[0]),L.firstChild)}S=o.makeArray(L.childNodes)}if(S.nodeType){G.push(S)}else{G=o.merge(G,S)}});if(I){for(var J=0;G[J];J++){if(o.nodeName(G[J],"script")&&(!G[J].type||G[J].type.toLowerCase()==="text/javascript")){E.push(G[J].parentNode?G[J].parentNode.removeChild(G[J]):G[J])}else{if(G[J].nodeType===1){G.splice.apply(G,[J+1,0].concat(o.makeArray(G[J].getElementsByTagName("script"))))}I.appendChild(G[J])}}return E}return G},attr:function(J,G,K){if(!J||J.nodeType==3||J.nodeType==8){return g}var H=!o.isXMLDoc(J),L=K!==g;G=H&&o.props[G]||G;if(J.tagName){var F=/href|src|style/.test(G);if(G=="selected"&&J.parentNode){J.parentNode.selectedIndex}if(G in J&&H&&!F){if(L){if(G=="type"&&o.nodeName(J,"input")&&J.parentNode){throw"type property can't be changed"}J[G]=K}if(o.nodeName(J,"form")&&J.getAttributeNode(G)){return J.getAttributeNode(G).nodeValue}if(G=="tabIndex"){var I=J.getAttributeNode("tabIndex");return I&&I.specified?I.value:J.nodeName.match(/(button|input|object|select|textarea)/i)?0:J.nodeName.match(/^(a|area)$/i)&&J.href?0:g}return J[G]}if(!o.support.style&&H&&G=="style"){return o.attr(J.style,"cssText",K)}if(L){J.setAttribute(G,""+K)}var E=!o.support.hrefNormalized&&H&&F?J.getAttribute(G,2):J.getAttribute(G);return E===null?g:E}if(!o.support.opacity&&G=="opacity"){if(L){J.zoom=1;J.filter=(J.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(K)+""=="NaN"?"":"alpha(opacity="+K*100+")")}return J.filter&&J.filter.indexOf("opacity=")>=0?(parseFloat(J.filter.match(/opacity=([^)]*)/)[1])/100)+"":""}G=G.replace(/-([a-z])/ig,function(M,N){return N.toUpperCase()});if(L){J[G]=K}return J[G]},trim:function(E){return(E||"").replace(/^\s+|\s+$/g,"")},makeArray:function(G){var E=[];if(G!=null){var F=G.length;if(F==null||typeof G==="string"||o.isFunction(G)||G.setInterval){E[0]=G}else{while(F){E[--F]=G[F]}}}return E},inArray:function(G,H){for(var E=0,F=H.length;E<F;E++){if(H[E]===G){return E}}return -1},merge:function(H,E){var F=0,G,I=H.length;if(!o.support.getAll){while((G=E[F++])!=null){if(G.nodeType!=8){H[I++]=G}}}else{while((G=E[F++])!=null){H[I++]=G}}return H},unique:function(K){var F=[],E={};try{for(var G=0,H=K.length;G<H;G++){var J=o.data(K[G]);if(!E[J]){E[J]=true;F.push(K[G])}}}catch(I){F=K}return F},grep:function(F,J,E){var G=[];for(var H=0,I=F.length;H<I;H++){if(!E!=!J(F[H],H)){G.push(F[H])}}return G},map:function(E,J){var F=[];for(var G=0,H=E.length;G<H;G++){var I=J(E[G],G);if(I!=null){F[F.length]=I}}return F.concat.apply([],F)}});var C=navigator.userAgent.toLowerCase();o.browser={version:(C.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/)||[0,"0"])[1],safari:/webkit/.test(C),opera:/opera/.test(C),msie:/msie/.test(C)&&!/opera/.test(C),mozilla:/mozilla/.test(C)&&!/(compatible|webkit)/.test(C)};o.each({parent:function(E){return E.parentNode},parents:function(E){return o.dir(E,"parentNode")},next:function(E){return o.nth(E,2,"nextSibling")},prev:function(E){return o.nth(E,2,"previousSibling")},nextAll:function(E){return o.dir(E,"nextSibling")},prevAll:function(E){return o.dir(E,"previousSibling")},siblings:function(E){return o.sibling(E.parentNode.firstChild,E)},children:function(E){return o.sibling(E.firstChild)},contents:function(E){return o.nodeName(E,"iframe")?E.contentDocument||E.contentWindow.document:o.makeArray(E.childNodes)}},function(E,F){o.fn[E]=function(G){var H=o.map(this,F);if(G&&typeof G=="string"){H=o.multiFilter(G,H)}return this.pushStack(o.unique(H),E,G)}});o.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(E,F){o.fn[E]=function(G){var J=[],L=o(G);for(var K=0,H=L.length;K<H;K++){var I=(K>0?this.clone(true):this).get();o.fn[F].apply(o(L[K]),I);J=J.concat(I)}return this.pushStack(J,E,G)}});o.each({removeAttr:function(E){o.attr(this,E,"");if(this.nodeType==1){this.removeAttribute(E)}},addClass:function(E){o.className.add(this,E)},removeClass:function(E){o.className.remove(this,E)},toggleClass:function(F,E){if(typeof E!=="boolean"){E=!o.className.has(this,F)}o.className[E?"add":"remove"](this,F)},remove:function(E){if(!E||o.filter(E,[this]).length){o("*",this).add([this]).each(function(){o.event.remove(this);o.removeData(this)});if(this.parentNode){this.parentNode.removeChild(this)}}},empty:function(){o(this).children().remove();while(this.firstChild){this.removeChild(this.firstChild)}}},function(E,F){o.fn[E]=function(){return this.each(F,arguments)}});function j(E,F){return E[0]&&parseInt(o.curCSS(E[0],F,true),10)||0}var h="jQuery"+e(),v=0,A={};o.extend({cache:{},data:function(F,E,G){F=F==l?A:F;var H=F[h];if(!H){H=F[h]=++v}if(E&&!o.cache[H]){o.cache[H]={}}if(G!==g){o.cache[H][E]=G}return E?o.cache[H][E]:H},removeData:function(F,E){F=F==l?A:F;var H=F[h];if(E){if(o.cache[H]){delete o.cache[H][E];E="";for(E in o.cache[H]){break}if(!E){o.removeData(F)}}}else{try{delete F[h]}catch(G){if(F.removeAttribute){F.removeAttribute(h)}}delete o.cache[H]}},queue:function(F,E,H){if(F){E=(E||"fx")+"queue";var G=o.data(F,E);if(!G||o.isArray(H)){G=o.data(F,E,o.makeArray(H))}else{if(H){G.push(H)}}}return G},dequeue:function(H,G){var E=o.queue(H,G),F=E.shift();if(!G||G==="fx"){F=E[0]}if(F!==g){F.call(H)}}});o.fn.extend({data:function(E,G){var H=E.split(".");H[1]=H[1]?"."+H[1]:"";if(G===g){var F=this.triggerHandler("getData"+H[1]+"!",[H[0]]);if(F===g&&this.length){F=o.data(this[0],E)}return F===g&&H[1]?this.data(H[0]):F}else{return this.trigger("setData"+H[1]+"!",[H[0],G]).each(function(){o.data(this,E,G)})}},removeData:function(E){return this.each(function(){o.removeData(this,E)})},queue:function(E,F){if(typeof E!=="string"){F=E;E="fx"}if(F===g){return o.queue(this[0],E)}return this.each(function(){var G=o.queue(this,E,F);if(E=="fx"&&G.length==1){G[0].call(this)}})},dequeue:function(E){return this.each(function(){o.dequeue(this,E)})}});
+/*
+ * Sizzle CSS Selector Engine - v0.9.3
+ * Copyright 2009, The Dojo Foundation
+ * Released under the MIT, BSD, and GPL Licenses.
+ * More information: http://sizzlejs.com/
+ */
+(function(){var R=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?/g,L=0,H=Object.prototype.toString;var F=function(Y,U,ab,ac){ab=ab||[];U=U||document;if(U.nodeType!==1&&U.nodeType!==9){return[]}if(!Y||typeof Y!=="string"){return ab}var Z=[],W,af,ai,T,ad,V,X=true;R.lastIndex=0;while((W=R.exec(Y))!==null){Z.push(W[1]);if(W[2]){V=RegExp.rightContext;break}}if(Z.length>1&&M.exec(Y)){if(Z.length===2&&I.relative[Z[0]]){af=J(Z[0]+Z[1],U)}else{af=I.relative[Z[0]]?[U]:F(Z.shift(),U);while(Z.length){Y=Z.shift();if(I.relative[Y]){Y+=Z.shift()}af=J(Y,af)}}}else{var ae=ac?{expr:Z.pop(),set:E(ac)}:F.find(Z.pop(),Z.length===1&&U.parentNode?U.parentNode:U,Q(U));af=F.filter(ae.expr,ae.set);if(Z.length>0){ai=E(af)}else{X=false}while(Z.length){var ah=Z.pop(),ag=ah;if(!I.relative[ah]){ah=""}else{ag=Z.pop()}if(ag==null){ag=U}I.relative[ah](ai,ag,Q(U))}}if(!ai){ai=af}if(!ai){throw"Syntax error, unrecognized expression: "+(ah||Y)}if(H.call(ai)==="[object Array]"){if(!X){ab.push.apply(ab,ai)}else{if(U.nodeType===1){for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&(ai[aa]===true||ai[aa].nodeType===1&&K(U,ai[aa]))){ab.push(af[aa])}}}else{for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&ai[aa].nodeType===1){ab.push(af[aa])}}}}}else{E(ai,ab)}if(V){F(V,U,ab,ac);if(G){hasDuplicate=false;ab.sort(G);if(hasDuplicate){for(var aa=1;aa<ab.length;aa++){if(ab[aa]===ab[aa-1]){ab.splice(aa--,1)}}}}}return ab};F.matches=function(T,U){return F(T,null,null,U)};F.find=function(aa,T,ab){var Z,X;if(!aa){return[]}for(var W=0,V=I.order.length;W<V;W++){var Y=I.order[W],X;if((X=I.match[Y].exec(aa))){var U=RegExp.leftContext;if(U.substr(U.length-1)!=="\\"){X[1]=(X[1]||"").replace(/\\/g,"");Z=I.find[Y](X,T,ab);if(Z!=null){aa=aa.replace(I.match[Y],"");break}}}}if(!Z){Z=T.getElementsByTagName("*")}return{set:Z,expr:aa}};F.filter=function(ad,ac,ag,W){var V=ad,ai=[],aa=ac,Y,T,Z=ac&&ac[0]&&Q(ac[0]);while(ad&&ac.length){for(var ab in I.filter){if((Y=I.match[ab].exec(ad))!=null){var U=I.filter[ab],ah,af;T=false;if(aa==ai){ai=[]}if(I.preFilter[ab]){Y=I.preFilter[ab](Y,aa,ag,ai,W,Z);if(!Y){T=ah=true}else{if(Y===true){continue}}}if(Y){for(var X=0;(af=aa[X])!=null;X++){if(af){ah=U(af,Y,X,aa);var ae=W^!!ah;if(ag&&ah!=null){if(ae){T=true}else{aa[X]=false}}else{if(ae){ai.push(af);T=true}}}}}if(ah!==g){if(!ag){aa=ai}ad=ad.replace(I.match[ab],"");if(!T){return[]}break}}}if(ad==V){if(T==null){throw"Syntax error, unrecognized expression: "+ad}else{break}}V=ad}return aa};var I=F.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF_-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF_-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*_-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF_-]|\\.)+)(?:\((['"]*)((?:\([^\)]+\)|[^\2\(\)]*)+)\2\))?/},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(T){return T.getAttribute("href")}},relative:{"+":function(aa,T,Z){var X=typeof T==="string",ab=X&&!/\W/.test(T),Y=X&&!ab;if(ab&&!Z){T=T.toUpperCase()}for(var W=0,V=aa.length,U;W<V;W++){if((U=aa[W])){while((U=U.previousSibling)&&U.nodeType!==1){}aa[W]=Y||U&&U.nodeName===T?U||false:U===T}}if(Y){F.filter(T,aa,true)}},">":function(Z,U,aa){var X=typeof U==="string";if(X&&!/\W/.test(U)){U=aa?U:U.toUpperCase();for(var V=0,T=Z.length;V<T;V++){var Y=Z[V];if(Y){var W=Y.parentNode;Z[V]=W.nodeName===U?W:false}}}else{for(var V=0,T=Z.length;V<T;V++){var Y=Z[V];if(Y){Z[V]=X?Y.parentNode:Y.parentNode===U}}if(X){F.filter(U,Z,true)}}},"":function(W,U,Y){var V=L++,T=S;if(!U.match(/\W/)){var X=U=Y?U:U.toUpperCase();T=P}T("parentNode",U,V,W,X,Y)},"~":function(W,U,Y){var V=L++,T=S;if(typeof U==="string"&&!U.match(/\W/)){var X=U=Y?U:U.toUpperCase();T=P}T("previousSibling",U,V,W,X,Y)}},find:{ID:function(U,V,W){if(typeof V.getElementById!=="undefined"&&!W){var T=V.getElementById(U[1]);return T?[T]:[]}},NAME:function(V,Y,Z){if(typeof Y.getElementsByName!=="undefined"){var U=[],X=Y.getElementsByName(V[1]);for(var W=0,T=X.length;W<T;W++){if(X[W].getAttribute("name")===V[1]){U.push(X[W])}}return U.length===0?null:U}},TAG:function(T,U){return U.getElementsByTagName(T[1])}},preFilter:{CLASS:function(W,U,V,T,Z,aa){W=" "+W[1].replace(/\\/g,"")+" ";if(aa){return W}for(var X=0,Y;(Y=U[X])!=null;X++){if(Y){if(Z^(Y.className&&(" "+Y.className+" ").indexOf(W)>=0)){if(!V){T.push(Y)}}else{if(V){U[X]=false}}}}return false},ID:function(T){return T[1].replace(/\\/g,"")},TAG:function(U,T){for(var V=0;T[V]===false;V++){}return T[V]&&Q(T[V])?U[1]:U[1].toUpperCase()},CHILD:function(T){if(T[1]=="nth"){var U=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(T[2]=="even"&&"2n"||T[2]=="odd"&&"2n+1"||!/\D/.test(T[2])&&"0n+"+T[2]||T[2]);T[2]=(U[1]+(U[2]||1))-0;T[3]=U[3]-0}T[0]=L++;return T},ATTR:function(X,U,V,T,Y,Z){var W=X[1].replace(/\\/g,"");if(!Z&&I.attrMap[W]){X[1]=I.attrMap[W]}if(X[2]==="~="){X[4]=" "+X[4]+" "}return X},PSEUDO:function(X,U,V,T,Y){if(X[1]==="not"){if(X[3].match(R).length>1||/^\w/.test(X[3])){X[3]=F(X[3],null,null,U)}else{var W=F.filter(X[3],U,V,true^Y);if(!V){T.push.apply(T,W)}return false}}else{if(I.match.POS.test(X[0])||I.match.CHILD.test(X[0])){return true}}return X},POS:function(T){T.unshift(true);return T}},filters:{enabled:function(T){return T.disabled===false&&T.type!=="hidden"},disabled:function(T){return T.disabled===true},checked:function(T){return T.checked===true},selected:function(T){T.parentNode.selectedIndex;return T.selected===true},parent:function(T){return !!T.firstChild},empty:function(T){return !T.firstChild},has:function(V,U,T){return !!F(T[3],V).length},header:function(T){return/h\d/i.test(T.nodeName)},text:function(T){return"text"===T.type},radio:function(T){return"radio"===T.type},checkbox:function(T){return"checkbox"===T.type},file:function(T){return"file"===T.type},password:function(T){return"password"===T.type},submit:function(T){return"submit"===T.type},image:function(T){return"image"===T.type},reset:function(T){return"reset"===T.type},button:function(T){return"button"===T.type||T.nodeName.toUpperCase()==="BUTTON"},input:function(T){return/input|select|textarea|button/i.test(T.nodeName)}},setFilters:{first:function(U,T){return T===0},last:function(V,U,T,W){return U===W.length-1},even:function(U,T){return T%2===0},odd:function(U,T){return T%2===1},lt:function(V,U,T){return U<T[3]-0},gt:function(V,U,T){return U>T[3]-0},nth:function(V,U,T){return T[3]-0==U},eq:function(V,U,T){return T[3]-0==U}},filter:{PSEUDO:function(Z,V,W,aa){var U=V[1],X=I.filters[U];if(X){return X(Z,W,V,aa)}else{if(U==="contains"){return(Z.textContent||Z.innerText||"").indexOf(V[3])>=0}else{if(U==="not"){var Y=V[3];for(var W=0,T=Y.length;W<T;W++){if(Y[W]===Z){return false}}return true}}}},CHILD:function(T,W){var Z=W[1],U=T;switch(Z){case"only":case"first":while(U=U.previousSibling){if(U.nodeType===1){return false}}if(Z=="first"){return true}U=T;case"last":while(U=U.nextSibling){if(U.nodeType===1){return false}}return true;case"nth":var V=W[2],ac=W[3];if(V==1&&ac==0){return true}var Y=W[0],ab=T.parentNode;if(ab&&(ab.sizcache!==Y||!T.nodeIndex)){var X=0;for(U=ab.firstChild;U;U=U.nextSibling){if(U.nodeType===1){U.nodeIndex=++X}}ab.sizcache=Y}var aa=T.nodeIndex-ac;if(V==0){return aa==0}else{return(aa%V==0&&aa/V>=0)}}},ID:function(U,T){return U.nodeType===1&&U.getAttribute("id")===T},TAG:function(U,T){return(T==="*"&&U.nodeType===1)||U.nodeName===T},CLASS:function(U,T){return(" "+(U.className||U.getAttribute("class"))+" ").indexOf(T)>-1},ATTR:function(Y,W){var V=W[1],T=I.attrHandle[V]?I.attrHandle[V](Y):Y[V]!=null?Y[V]:Y.getAttribute(V),Z=T+"",X=W[2],U=W[4];return T==null?X==="!=":X==="="?Z===U:X==="*="?Z.indexOf(U)>=0:X==="~="?(" "+Z+" ").indexOf(U)>=0:!U?Z&&T!==false:X==="!="?Z!=U:X==="^="?Z.indexOf(U)===0:X==="$="?Z.substr(Z.length-U.length)===U:X==="|="?Z===U||Z.substr(0,U.length+1)===U+"-":false},POS:function(X,U,V,Y){var T=U[2],W=I.setFilters[T];if(W){return W(X,V,U,Y)}}}};var M=I.match.POS;for(var O in I.match){I.match[O]=RegExp(I.match[O].source+/(?![^\[]*\])(?![^\(]*\))/.source)}var E=function(U,T){U=Array.prototype.slice.call(U);if(T){T.push.apply(T,U);return T}return U};try{Array.prototype.slice.call(document.documentElement.childNodes)}catch(N){E=function(X,W){var U=W||[];if(H.call(X)==="[object Array]"){Array.prototype.push.apply(U,X)}else{if(typeof X.length==="number"){for(var V=0,T=X.length;V<T;V++){U.push(X[V])}}else{for(var V=0;X[V];V++){U.push(X[V])}}}return U}}var G;if(document.documentElement.compareDocumentPosition){G=function(U,T){var V=U.compareDocumentPosition(T)&4?-1:U===T?0:1;if(V===0){hasDuplicate=true}return V}}else{if("sourceIndex" in document.documentElement){G=function(U,T){var V=U.sourceIndex-T.sourceIndex;if(V===0){hasDuplicate=true}return V}}else{if(document.createRange){G=function(W,U){var V=W.ownerDocument.createRange(),T=U.ownerDocument.createRange();V.selectNode(W);V.collapse(true);T.selectNode(U);T.collapse(true);var X=V.compareBoundaryPoints(Range.START_TO_END,T);if(X===0){hasDuplicate=true}return X}}}}(function(){var U=document.createElement("form"),V="script"+(new Date).getTime();U.innerHTML="<input name='"+V+"'/>";var T=document.documentElement;T.insertBefore(U,T.firstChild);if(!!document.getElementById(V)){I.find.ID=function(X,Y,Z){if(typeof Y.getElementById!=="undefined"&&!Z){var W=Y.getElementById(X[1]);return W?W.id===X[1]||typeof W.getAttributeNode!=="undefined"&&W.getAttributeNode("id").nodeValue===X[1]?[W]:g:[]}};I.filter.ID=function(Y,W){var X=typeof Y.getAttributeNode!=="undefined"&&Y.getAttributeNode("id");return Y.nodeType===1&&X&&X.nodeValue===W}}T.removeChild(U)})();(function(){var T=document.createElement("div");T.appendChild(document.createComment(""));if(T.getElementsByTagName("*").length>0){I.find.TAG=function(U,Y){var X=Y.getElementsByTagName(U[1]);if(U[1]==="*"){var W=[];for(var V=0;X[V];V++){if(X[V].nodeType===1){W.push(X[V])}}X=W}return X}}T.innerHTML="<a href='#'></a>";if(T.firstChild&&typeof T.firstChild.getAttribute!=="undefined"&&T.firstChild.getAttribute("href")!=="#"){I.attrHandle.href=function(U){return U.getAttribute("href",2)}}})();if(document.querySelectorAll){(function(){var T=F,U=document.createElement("div");U.innerHTML="<p class='TEST'></p>";if(U.querySelectorAll&&U.querySelectorAll(".TEST").length===0){return}F=function(Y,X,V,W){X=X||document;if(!W&&X.nodeType===9&&!Q(X)){try{return E(X.querySelectorAll(Y),V)}catch(Z){}}return T(Y,X,V,W)};F.find=T.find;F.filter=T.filter;F.selectors=T.selectors;F.matches=T.matches})()}if(document.getElementsByClassName&&document.documentElement.getElementsByClassName){(function(){var T=document.createElement("div");T.innerHTML="<div class='test e'></div><div class='test'></div>";if(T.getElementsByClassName("e").length===0){return}T.lastChild.className="e";if(T.getElementsByClassName("e").length===1){return}I.order.splice(1,0,"CLASS");I.find.CLASS=function(U,V,W){if(typeof V.getElementsByClassName!=="undefined"&&!W){return V.getElementsByClassName(U[1])}}})()}function P(U,Z,Y,ad,aa,ac){var ab=U=="previousSibling"&&!ac;for(var W=0,V=ad.length;W<V;W++){var T=ad[W];if(T){if(ab&&T.nodeType===1){T.sizcache=Y;T.sizset=W}T=T[U];var X=false;while(T){if(T.sizcache===Y){X=ad[T.sizset];break}if(T.nodeType===1&&!ac){T.sizcache=Y;T.sizset=W}if(T.nodeName===Z){X=T;break}T=T[U]}ad[W]=X}}}function S(U,Z,Y,ad,aa,ac){var ab=U=="previousSibling"&&!ac;for(var W=0,V=ad.length;W<V;W++){var T=ad[W];if(T){if(ab&&T.nodeType===1){T.sizcache=Y;T.sizset=W}T=T[U];var X=false;while(T){if(T.sizcache===Y){X=ad[T.sizset];break}if(T.nodeType===1){if(!ac){T.sizcache=Y;T.sizset=W}if(typeof Z!=="string"){if(T===Z){X=true;break}}else{if(F.filter(Z,[T]).length>0){X=T;break}}}T=T[U]}ad[W]=X}}}var K=document.compareDocumentPosition?function(U,T){return U.compareDocumentPosition(T)&16}:function(U,T){return U!==T&&(U.contains?U.contains(T):true)};var Q=function(T){return T.nodeType===9&&T.documentElement.nodeName!=="HTML"||!!T.ownerDocument&&Q(T.ownerDocument)};var J=function(T,aa){var W=[],X="",Y,V=aa.nodeType?[aa]:aa;while((Y=I.match.PSEUDO.exec(T))){X+=Y[0];T=T.replace(I.match.PSEUDO,"")}T=I.relative[T]?T+"*":T;for(var Z=0,U=V.length;Z<U;Z++){F(T,V[Z],W)}return F.filter(X,W)};o.find=F;o.filter=F.filter;o.expr=F.selectors;o.expr[":"]=o.expr.filters;F.selectors.filters.hidden=function(T){return T.offsetWidth===0||T.offsetHeight===0};F.selectors.filters.visible=function(T){return T.offsetWidth>0||T.offsetHeight>0};F.selectors.filters.animated=function(T){return o.grep(o.timers,function(U){return T===U.elem}).length};o.multiFilter=function(V,T,U){if(U){V=":not("+V+")"}return F.matches(V,T)};o.dir=function(V,U){var T=[],W=V[U];while(W&&W!=document){if(W.nodeType==1){T.push(W)}W=W[U]}return T};o.nth=function(X,T,V,W){T=T||1;var U=0;for(;X;X=X[V]){if(X.nodeType==1&&++U==T){break}}return X};o.sibling=function(V,U){var T=[];for(;V;V=V.nextSibling){if(V.nodeType==1&&V!=U){T.push(V)}}return T};return;l.Sizzle=F})();o.event={add:function(I,F,H,K){if(I.nodeType==3||I.nodeType==8){return}if(I.setInterval&&I!=l){I=l}if(!H.guid){H.guid=this.guid++}if(K!==g){var G=H;H=this.proxy(G);H.data=K}var E=o.data(I,"events")||o.data(I,"events",{}),J=o.data(I,"handle")||o.data(I,"handle",function(){return typeof o!=="undefined"&&!o.event.triggered?o.event.handle.apply(arguments.callee.elem,arguments):g});J.elem=I;o.each(F.split(/\s+/),function(M,N){var O=N.split(".");N=O.shift();H.type=O.slice().sort().join(".");var L=E[N];if(o.event.specialAll[N]){o.event.specialAll[N].setup.call(I,K,O)}if(!L){L=E[N]={};if(!o.event.special[N]||o.event.special[N].setup.call(I,K,O)===false){if(I.addEventListener){I.addEventListener(N,J,false)}else{if(I.attachEvent){I.attachEvent("on"+N,J)}}}}L[H.guid]=H;o.event.global[N]=true});I=null},guid:1,global:{},remove:function(K,H,J){if(K.nodeType==3||K.nodeType==8){return}var G=o.data(K,"events"),F,E;if(G){if(H===g||(typeof H==="string"&&H.charAt(0)==".")){for(var I in G){this.remove(K,I+(H||""))}}else{if(H.type){J=H.handler;H=H.type}o.each(H.split(/\s+/),function(M,O){var Q=O.split(".");O=Q.shift();var N=RegExp("(^|\\.)"+Q.slice().sort().join(".*\\.")+"(\\.|$)");if(G[O]){if(J){delete G[O][J.guid]}else{for(var P in G[O]){if(N.test(G[O][P].type)){delete G[O][P]}}}if(o.event.specialAll[O]){o.event.specialAll[O].teardown.call(K,Q)}for(F in G[O]){break}if(!F){if(!o.event.special[O]||o.event.special[O].teardown.call(K,Q)===false){if(K.removeEventListener){K.removeEventListener(O,o.data(K,"handle"),false)}else{if(K.detachEvent){K.detachEvent("on"+O,o.data(K,"handle"))}}}F=null;delete G[O]}}})}for(F in G){break}if(!F){var L=o.data(K,"handle");if(L){L.elem=null}o.removeData(K,"events");o.removeData(K,"handle")}}},trigger:function(I,K,H,E){var G=I.type||I;if(!E){I=typeof I==="object"?I[h]?I:o.extend(o.Event(G),I):o.Event(G);if(G.indexOf("!")>=0){I.type=G=G.slice(0,-1);I.exclusive=true}if(!H){I.stopPropagation();if(this.global[G]){o.each(o.cache,function(){if(this.events&&this.events[G]){o.event.trigger(I,K,this.handle.elem)}})}}if(!H||H.nodeType==3||H.nodeType==8){return g}I.result=g;I.target=H;K=o.makeArray(K);K.unshift(I)}I.currentTarget=H;var J=o.data(H,"handle");if(J){J.apply(H,K)}if((!H[G]||(o.nodeName(H,"a")&&G=="click"))&&H["on"+G]&&H["on"+G].apply(H,K)===false){I.result=false}if(!E&&H[G]&&!I.isDefaultPrevented()&&!(o.nodeName(H,"a")&&G=="click")){this.triggered=true;try{H[G]()}catch(L){}}this.triggered=false;if(!I.isPropagationStopped()){var F=H.parentNode||H.ownerDocument;if(F){o.event.trigger(I,K,F,true)}}},handle:function(K){var J,E;K=arguments[0]=o.event.fix(K||l.event);K.currentTarget=this;var L=K.type.split(".");K.type=L.shift();J=!L.length&&!K.exclusive;var I=RegExp("(^|\\.)"+L.slice().sort().join(".*\\.")+"(\\.|$)");E=(o.data(this,"events")||{})[K.type];for(var G in E){var H=E[G];if(J||I.test(H.type)){K.handler=H;K.data=H.data;var F=H.apply(this,arguments);if(F!==g){K.result=F;if(F===false){K.preventDefault();K.stopPropagation()}}if(K.isImmediatePropagationStopped()){break}}}},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(H){if(H[h]){return H}var F=H;H=o.Event(F);for(var G=this.props.length,J;G;){J=this.props[--G];H[J]=F[J]}if(!H.target){H.target=H.srcElement||document}if(H.target.nodeType==3){H.target=H.target.parentNode}if(!H.relatedTarget&&H.fromElement){H.relatedTarget=H.fromElement==H.target?H.toElement:H.fromElement}if(H.pageX==null&&H.clientX!=null){var I=document.documentElement,E=document.body;H.pageX=H.clientX+(I&&I.scrollLeft||E&&E.scrollLeft||0)-(I.clientLeft||0);H.pageY=H.clientY+(I&&I.scrollTop||E&&E.scrollTop||0)-(I.clientTop||0)}if(!H.which&&((H.charCode||H.charCode===0)?H.charCode:H.keyCode)){H.which=H.charCode||H.keyCode}if(!H.metaKey&&H.ctrlKey){H.metaKey=H.ctrlKey}if(!H.which&&H.button){H.which=(H.button&1?1:(H.button&2?3:(H.button&4?2:0)))}return H},proxy:function(F,E){E=E||function(){return F.apply(this,arguments)};E.guid=F.guid=F.guid||E.guid||this.guid++;return E},special:{ready:{setup:B,teardown:function(){}}},specialAll:{live:{setup:function(E,F){o.event.add(this,F[0],c)},teardown:function(G){if(G.length){var E=0,F=RegExp("(^|\\.)"+G[0]+"(\\.|$)");o.each((o.data(this,"events").live||{}),function(){if(F.test(this.type)){E++}});if(E<1){o.event.remove(this,G[0],c)}}}}}};o.Event=function(E){if(!this.preventDefault){return new o.Event(E)}if(E&&E.type){this.originalEvent=E;this.type=E.type}else{this.type=E}this.timeStamp=e();this[h]=true};function k(){return false}function u(){return true}o.Event.prototype={preventDefault:function(){this.isDefaultPrevented=u;var E=this.originalEvent;if(!E){return}if(E.preventDefault){E.preventDefault()}E.returnValue=false},stopPropagation:function(){this.isPropagationStopped=u;var E=this.originalEvent;if(!E){return}if(E.stopPropagation){E.stopPropagation()}E.cancelBubble=true},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=u;this.stopPropagation()},isDefaultPrevented:k,isPropagationStopped:k,isImmediatePropagationStopped:k};var a=function(F){var E=F.relatedTarget;while(E&&E!=this){try{E=E.parentNode}catch(G){E=this}}if(E!=this){F.type=F.data;o.event.handle.apply(this,arguments)}};o.each({mouseover:"mouseenter",mouseout:"mouseleave"},function(F,E){o.event.special[E]={setup:function(){o.event.add(this,F,a,E)},teardown:function(){o.event.remove(this,F,a)}}});o.fn.extend({bind:function(F,G,E){return F=="unload"?this.one(F,G,E):this.each(function(){o.event.add(this,F,E||G,E&&G)})},one:function(G,H,F){var E=o.event.proxy(F||H,function(I){o(this).unbind(I,E);return(F||H).apply(this,arguments)});return this.each(function(){o.event.add(this,G,E,F&&H)})},unbind:function(F,E){return this.each(function(){o.event.remove(this,F,E)})},trigger:function(E,F){return this.each(function(){o.event.trigger(E,F,this)})},triggerHandler:function(E,G){if(this[0]){var F=o.Event(E);F.preventDefault();F.stopPropagation();o.event.trigger(F,G,this[0]);return F.result}},toggle:function(G){var E=arguments,F=1;while(F<E.length){o.event.proxy(G,E[F++])}return this.click(o.event.proxy(G,function(H){this.lastToggle=(this.lastToggle||0)%F;H.preventDefault();return E[this.lastToggle++].apply(this,arguments)||false}))},hover:function(E,F){return this.mouseenter(E).mouseleave(F)},ready:function(E){B();if(o.isReady){E.call(document,o)}else{o.readyList.push(E)}return this},live:function(G,F){var E=o.event.proxy(F);E.guid+=this.selector+G;o(document).bind(i(G,this.selector),this.selector,E);return this},die:function(F,E){o(document).unbind(i(F,this.selector),E?{guid:E.guid+this.selector+F}:null);return this}});function c(H){var E=RegExp("(^|\\.)"+H.type+"(\\.|$)"),G=true,F=[];o.each(o.data(this,"events").live||[],function(I,J){if(E.test(J.type)){var K=o(H.target).closest(J.data)[0];if(K){F.push({elem:K,fn:J})}}});F.sort(function(J,I){return o.data(J.elem,"closest")-o.data(I.elem,"closest")});o.each(F,function(){if(this.fn.call(this.elem,H,this.fn.data)===false){return(G=false)}});return G}function i(F,E){return["live",F,E.replace(/\./g,"`").replace(/ /g,"|")].join(".")}o.extend({isReady:false,readyList:[],ready:function(){if(!o.isReady){o.isReady=true;if(...
[truncated message content] |
|
From: <ye...@us...> - 2012-02-13 19:44:22
|
Revision: 8962
http://xoops.svn.sourceforge.net/xoops/?rev=8962&view=rev
Author: yerres2
Date: 2012-02-13 19:44:15 +0000 (Mon, 13 Feb 2012)
Log Message:
-----------
reverted to original images
added lost file jquery.min.js
Modified Paths:
--------------
XoopsModules/newsslider/trunk/newsslider/images/image1-small.jpg
XoopsModules/newsslider/trunk/newsslider/images/image1.jpg
XoopsModules/newsslider/trunk/newsslider/images/image2-small.jpg
XoopsModules/newsslider/trunk/newsslider/images/image2.jpg
XoopsModules/newsslider/trunk/newsslider/images/image3-small.jpg
XoopsModules/newsslider/trunk/newsslider/images/image3.jpg
XoopsModules/newsslider/trunk/newsslider/images/image4-small.jpg
XoopsModules/newsslider/trunk/newsslider/images/image4.jpg
XoopsModules/newsslider/trunk/newsslider/images/image5-small.jpg
XoopsModules/newsslider/trunk/newsslider/images/image5.jpg
XoopsModules/newsslider/trunk/newsslider/images/s3/image1.jpg
XoopsModules/newsslider/trunk/newsslider/images/s3/image2.jpg
XoopsModules/newsslider/trunk/newsslider/images/s3/image3.jpg
XoopsModules/newsslider/trunk/newsslider/images/s3/image4.jpg
XoopsModules/newsslider/trunk/newsslider/images/s3/image5.jpg
XoopsModules/newsslider/trunk/newsslider/images/s3/image6.jpg
XoopsModules/newsslider/trunk/newsslider/images/s3/image7.jpg
XoopsModules/newsslider/trunk/newsslider/readme.txt
Modified: XoopsModules/newsslider/trunk/newsslider/images/image1-small.jpg
===================================================================
(Binary files differ)
Modified: XoopsModules/newsslider/trunk/newsslider/images/image1.jpg
===================================================================
(Binary files differ)
Modified: XoopsModules/newsslider/trunk/newsslider/images/image2-small.jpg
===================================================================
(Binary files differ)
Modified: XoopsModules/newsslider/trunk/newsslider/images/image2.jpg
===================================================================
(Binary files differ)
Modified: XoopsModules/newsslider/trunk/newsslider/images/image3-small.jpg
===================================================================
(Binary files differ)
Modified: XoopsModules/newsslider/trunk/newsslider/images/image3.jpg
===================================================================
(Binary files differ)
Modified: XoopsModules/newsslider/trunk/newsslider/images/image4-small.jpg
===================================================================
(Binary files differ)
Modified: XoopsModules/newsslider/trunk/newsslider/images/image4.jpg
===================================================================
(Binary files differ)
Modified: XoopsModules/newsslider/trunk/newsslider/images/image5-small.jpg
===================================================================
(Binary files differ)
Modified: XoopsModules/newsslider/trunk/newsslider/images/image5.jpg
===================================================================
(Binary files differ)
Modified: XoopsModules/newsslider/trunk/newsslider/images/s3/image1.jpg
===================================================================
(Binary files differ)
Modified: XoopsModules/newsslider/trunk/newsslider/images/s3/image2.jpg
===================================================================
(Binary files differ)
Modified: XoopsModules/newsslider/trunk/newsslider/images/s3/image3.jpg
===================================================================
(Binary files differ)
Modified: XoopsModules/newsslider/trunk/newsslider/images/s3/image4.jpg
===================================================================
(Binary files differ)
Modified: XoopsModules/newsslider/trunk/newsslider/images/s3/image5.jpg
===================================================================
(Binary files differ)
Modified: XoopsModules/newsslider/trunk/newsslider/images/s3/image6.jpg
===================================================================
(Binary files differ)
Modified: XoopsModules/newsslider/trunk/newsslider/images/s3/image7.jpg
===================================================================
(Binary files differ)
Modified: XoopsModules/newsslider/trunk/newsslider/readme.txt
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/readme.txt 2012-02-13 17:56:41 UTC (rev 8961)
+++ XoopsModules/newsslider/trunk/newsslider/readme.txt 2012-02-13 19:44:15 UTC (rev 8962)
@@ -36,8 +36,7 @@
Featured Content Slider : Web Developer Plus : http://webdeveloperplus.com/jquery/featured-content-slider-using-jquery-ui/
S3Slider : http://www.serie3.info/s3slider/
jQuery bxSlider v3.0 : http://bxslider.com/
-News Module : Herve http://xoops.org/
-Free Font Billard : http://www.fontsner.com/font/Billard-3161.html
+News Module : Hervet http://xoops.org/
BETA VERSION
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-02-13 17:56:52
|
Revision: 8961
http://xoops.svn.sourceforge.net/xoops/?rev=8961&view=rev
Author: beckmi
Date: 2012-02-13 17:56:41 +0000 (Mon, 13 Feb 2012)
Log Message:
-----------
Updating version to 2.37 Beta 2
Modified Paths:
--------------
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/xoops_version.php
Modified: XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/xoops_version.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/xoops_version.php 2012-02-13 17:35:10 UTC (rev 8960)
+++ XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/xoops_version.php 2012-02-13 17:56:41 UTC (rev 8961)
@@ -41,10 +41,10 @@
//about
$modversion["module_website_url"] = "http://www.xoops.org/";
$modversion["module_website_name"] = "XOOPS";
-$modversion["release_date"] = "2012/01/31";
-$modversion['module_status'] = "Beta";
+$modversion["release_date"] = "2012/02/12";
+$modversion['module_status'] = "Beta 2";
$modversion['min_php'] = '5.2';
-$modversion['min_xoops'] = "2.5.0";
+$modversion['min_xoops'] = "2.5.4";
// Admin things
$modversion['hasAdmin'] = 1;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-02-13 17:35:21
|
Revision: 8960
http://xoops.svn.sourceforge.net/xoops/?rev=8960&view=rev
Author: mageg
Date: 2012-02-13 17:35:10 +0000 (Mon, 13 Feb 2012)
Log Message:
-----------
Fixed bug ID: 3443381
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/admin/images/main.php
XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/templates/admin/system_images.html
Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/admin/images/main.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/admin/images/main.php 2012-02-13 17:29:00 UTC (rev 8959)
+++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/admin/images/main.php 2012-02-13 17:35:10 UTC (rev 8960)
@@ -229,9 +229,8 @@
$criteria->setLimit(xoops_getModuleOption('images_pager', 'system'));
$images = $image_handler->getObjects($criteria, true, false);
- if ($imagecategory->getVar('imgcat_storetype') == 'db') {
- $xoopsTpl->assign('db_store', 1 );
-
+ if ($imagecategory->getVar('imgcat_storetype') == 'db') {
+ $xoopsTpl->assign('db_store', 1 );
}
foreach (array_keys($images) as $i) {
@@ -301,17 +300,19 @@
// Get image id
$image_id = system_CleanVars ( $_REQUEST, 'image_id', 0, 'int' );
if ( $image_id > 0 ) {
- $image = $image_handler->get($image_id);
-
+ $image = $image_handler->get($image_id);
$image_cat =& $imgcat_handler->get($image->getVar('imgcat_id'));
// Define Breadcrumb and tips
$xoBreadCrumb->addLink( _AM_SYSTEM_IMAGES_MANAGER, system_adminVersion('images', 'adminpath') );
$xoBreadCrumb->addLink( $image_cat->getVar('imgcat_name'), system_adminVersion('images', 'adminpath') . '&op=listimg&imgcat_id=' .$image->getVar('imgcat_id') );
$xoBreadCrumb->addLink( _AM_SYSTEM_IMAGES_EDITIMG );
$xoBreadCrumb->render();
+ if ($image_cat->getVar('imgcat_storetype') == 'db') {
+ $msg = '<div class="txtcenter"><img class="tooltip" src="' . XOOPS_URL . '/image.php?id=' . $image->getVar('image_id') . '" alt="' . $image->getVar('image_nicename') . '" title="' . $image->getVar('image_nicename') . '" style="max-width:120px; max-height:120px;"/></div>';
+ } else {
+ $msg = '<div class="txtcenter"><img src="./class/thumbs/phpThumb.php?src=' . XOOPS_UPLOAD_PATH . '/' . $image->getVar('image_name') . '&h=120" alt="" /></div>';
+ }
- $msg = '<div class="txtcenter"><img src="./class/thumbs/phpThumb.php?src=' . XOOPS_UPLOAD_PATH . '/' . $image->getVar('image_name') . '&h=120" alt="" /></div>';
-
$xoopsTpl->assign('edit_thumbs', $msg );
$form = new XoopsThemeForm( _AM_SYSTEM_IMAGES_EDITIMG, 'edit_form', 'admin.php', 'post', true );
@@ -339,6 +340,7 @@
case 'delfile':
// Get image handler
$image_handler = xoops_gethandler('image');
+ $imgcat_handler = xoops_gethandler('imagecategory');
// Call Header
xoops_cp_header();
// Define Stylesheet
@@ -351,7 +353,12 @@
$image_id = system_CleanVars ( $_REQUEST, 'image_id', 0, 'int' );
if ( $image_id > 0 ) {
$image = $image_handler->get($image_id);
- $msg = '<div style="width: 180px;margin:0 auto;"><img class="thumb" src="' . XOOPS_UPLOAD_URL . '/' . $image->getVar('image_name') . '" alt="" /></div>';
+ $image_cat =& $imgcat_handler->get($image->getVar('imgcat_id'));
+ if ($image_cat->getVar('imgcat_storetype') == 'db') {
+ $msg = '<div style="width: 180px;margin:0 auto;"><img class="thumb" src="' . XOOPS_URL . '/image.php?id=' . $image->getVar('image_id') . '" alt="" title="" style="max-width:120px; max-height:120px;"/></div>';
+ } else {
+ $msg = '<div style="width: 180px;margin:0 auto;"><img class="thumb" src="' . XOOPS_UPLOAD_URL . '/' . $image->getVar('image_name') . '" alt="" /></div>';
+ }
$msg .= '<div class="spacer">' . $image->getVar('image_nicename') . '</div>';
$msg .= '<div class="spacer">' . _AM_SYSTEM_IMAGES_RUDELIMG . '</div>';
xoops_confirm( array('op' => 'delfileok', 'image_id' => $image_id, 'fct' => 'images'), 'admin.php', $msg );
Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/templates/admin/system_images.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/templates/admin/system_images.html 2012-02-13 17:29:00 UTC (rev 8959)
+++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/templates/admin/system_images.html 2012-02-13 17:35:10 UTC (rev 8960)
@@ -86,11 +86,11 @@
<div class="xo-actions txtcenter">
<div class="spacer bold"><{$img.image_nicename}></div>
<img id="loading_img<{$img.image_id}>" src="./images/spinner.gif" style="display:none;" alt="<{$smarty.const._AM_SYSTEM_LOADING}>" /><img class="cursorpointer tooltip" id="img<{$img.image_id}>" onclick="system_setStatus( { fct: 'images', op: 'display_img', image_id: <{$img.image_id}> }, 'img<{$img.image_id}>', 'admin.php' )" src="<{if $img.image_display}><{xoAdminIcons success.png}><{else}><{xoAdminIcons cancel.png}><{/if}>" alt="<{$smarty.const._IMGDISPLAY}>" title="<{$smarty.const._IMGDISPLAY}>" />
- <{if !$db_store}>
- <a class="lightbox tooltip" href="<{$xoops_upload_url}>/<{$img.image_name}>" title="<{$smarty.const._PREVIEW}>">
+ <{if !$db_store}>
+ <a class="lightbox tooltip" href="<{$xoops_upload_url}>/<{$img.image_name}>" title="<{$smarty.const._PREVIEW}>">
<{else}>
<a class="lightbox tooltip" href="<{$xoops_url}>/image.php?id=<{$img.image_id}>" title="<{$smarty.const._PREVIEW}>">
- <{/if}>
+ <{/if}>
<img src="<{xoAdminIcons display.png}>" alt="<{$smarty.const._AM_SYSTEM_IMAGES_VIEW}>" />
</a>
<a class="tooltip" href="admin.php?fct=images&op=editimg&image_id=<{$img.image_id}>" title="<{$smarty.const._EDIT}>">
@@ -99,20 +99,20 @@
<a class="tooltip" href="admin.php?fct=images&op=delfile&image_id=<{$img.image_id}>" title="<{$smarty.const._DELETE}>">
<img src="<{xoAdminIcons delete.png}>" alt="<{$smarty.const._DELETE}>" />
</a>
- <img class="tooltip" onclick="display_dialog(<{$img.image_id}>, true, true, 'slide', 'slide', 120, 350);" src="<{xoAdminIcons url.png}>" alt="<{$smarty.const._AM_SYSTEM_IMAGES_URL}>" title="<{$smarty.const._AM_SYSTEM_IMAGES_URL}>" />
+ <img class="tooltip" onclick="display_dialog(<{$img.image_id}>, true, true, 'slide', 'slide', 120, 350);" src="<{xoAdminIcons url.png}>" alt="<{$smarty.const._AM_SYSTEM_IMAGES_URL}>" title="<{$smarty.const._AM_SYSTEM_IMAGES_URL}>" />
</div>
</div>
</div>
<div id="dialog<{$img.image_id}>" title="<{$img.image_nicename}>" style='display:none;'>
- <div class="center">
- <{if !$db_store}>
- <{$xoops_upload_url}>/<{$img.image_name}>
- <{else}>
- <{$xoops_url}>/image.php?id=<{$img.image_id}>
- <{/if}>
- </div>
- </div>
+ <div class="center">
+ <{if !$db_store}>
+ <{$xoops_upload_url}>/<{$img.image_name}>
+ <{else}>
+ <{$xoops_url}>/image.php?id=<{$img.image_id}>
+ <{/if}>
+ </div>
+ </div>
<{/foreach}>
<div class="clear"></div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-02-13 17:29:13
|
Revision: 8959
http://xoops.svn.sourceforge.net/xoops/?rev=8959&view=rev
Author: beckmi
Date: 2012-02-13 17:29:00 +0000 (Mon, 13 Feb 2012)
Log Message:
-----------
- fix: no view for anonymous
- fix: visibility for past events set in Preferences
- fix: links to icons
- replacing hard-coded date format with _SHORTDATESTRING
Modified Paths:
--------------
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/cat.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/event.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/class/config.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/class/event.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/class/time.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/include/constantes.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/language/french/modinfo.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/language/french_iso/modinfo.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/language/spanish/modinfo.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/new_event.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/post.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/templates/extcal_event.html
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/view_calendar-month.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/view_new-event.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/view_search.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/view_year.php
Modified: XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/cat.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/cat.php 2012-02-13 17:23:02 UTC (rev 8958)
+++ XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/cat.php 2012-02-13 17:29:00 UTC (rev 8959)
@@ -3,47 +3,49 @@
include '../../../include/cp_header.php';
include '../../../class/xoopsformloader.php';
include 'admin_header.php';
-include_once(XOOPS_ROOT_PATH . '/modules/extcal/include/functions.php') ;
-include_once(XOOPS_ROOT_PATH . '/modules/extcal/include/constantes.php') ;
-
+include_once(XOOPS_ROOT_PATH . '/modules/extcal/include/functions.php');
+include_once(XOOPS_ROOT_PATH . '/modules/extcal/include/constantes.php');
+
$gepeto = array_merge($_GET, $_POST);
-while (list($k,$v) = each ($gepeto)){
- $$k = $v;
+while (list($k, $v) = each($gepeto)) {
+ $$k = $v;
}
-if (!isset($op)) $op = '';
+if (!isset($op)) {
+ $op = '';
+}
// $t=print_r($gepeto,true);
// echo "<pre>{$t}</pre>";
-switch($op) {
+switch ($op) {
case 'enreg':
// Modify cat
- if(isset($cat_id)) {
+ if (isset($cat_id)) {
$catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
- $varArr = array(
- 'cat_name'=>$cat_name,
- 'cat_desc'=>$cat_desc,
- 'cat_weight'=>$cat_weight,
- 'cat_color'=>substr($cat_color,1),
- 'cat_icone'=>$cat_icone
- );
+ $varArr = array(
+ 'cat_name' => $cat_name,
+ 'cat_desc' => $cat_desc,
+ 'cat_weight'=> $cat_weight,
+ 'cat_color' => substr($cat_color, 1),
+ 'cat_icone' => $cat_icone
+ );
$catHandler->modifyCat($cat_id, $varArr);
redirect_header("cat.php", 3, _AM_EXTCAL_CAT_EDITED, false);
- // Create new cat
+ // Create new cat
} else {
$catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
- $varArr = array(
- 'cat_name'=>$cat_name,
- 'cat_desc'=>$cat_desc,
- 'cat_weight'=>$cat_weight,
- 'cat_color'=>substr($cat_color,1),
- 'cat_icone'=>$cat_icone
- );
+ $varArr = array(
+ 'cat_name' => $cat_name,
+ 'cat_desc' => $cat_desc,
+ 'cat_weight'=> $cat_weight,
+ 'cat_color' => substr($cat_color, 1),
+ 'cat_icone' => $cat_icone
+ );
$catHandler->createCat($varArr);
redirect_header("cat.php", 3, _AM_EXTCAL_CAT_CREATED, false);
}
@@ -55,72 +57,72 @@
xoops_cp_header();
$catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
- $cat = $catHandler->getCat($cat_id, true);
+ //$cat = $catHandler->getCat($cat_id, true);
$form = new XoopsThemeForm(_AM_EXTCAL_ADD_CATEGORY, 'add_cat', 'cat.php?op=enreg', 'post', true);
$form->addElement(new XoopsFormText(_AM_EXTCAL_NAME, 'cat_name', 30, 255), true);
$form->addElement(new XoopsFormDhtmlTextArea(_AM_EXTCAL_DESCRIPTION, 'cat_desc', ''), false);
$form->addElement(new XoopsFormText(_AM_EXTCAL_WEIGHT, 'cat_weight', 30, 5, 0), false);
- $form->addElement(new XoopsFormColorPicker(_AM_EXTCAL_COLOR, 'cat_color',"#FF0000"));
+ $form->addElement(new XoopsFormColorPicker(_AM_EXTCAL_COLOR, 'cat_color', "#FF0000"));
$file_path = XOOPS_ROOT_PATH . '/modules/extcal/css/images';
- $tf= XoopsLists::getImgListAsArray($file_path);
- array_unshift ($tf,"--- aucun ---");
- $xfIcones = new XoopsFormSelect(_AM_EXTCAL_ICONE, "cat_icone", $cat->getVar('cat_icone'), '') ;
+ $tf = XoopsLists::getImgListAsArray($file_path);
+ array_unshift($tf, _MD_EXTCAL_NONE);
+ //$xfIcones = new XoopsFormSelect(_AM_EXTCAL_ICONE, "cat_icone", $cat->getVar('cat_icone'), '');
+ $xfIcones = new XoopsFormSelect(_AM_EXTCAL_ICONE, "cat_icone", '', '');
$xfIcones->addOptionArray($tf);
- $form->addElement($xfIcones, false);
+ $form->addElement($xfIcones, false);
$form->addElement(new XoopsFormButton("", "form_submit", _SEND, "submit"), false);
+
$form->display();
-
-
-
include 'admin_footer.php';
break;
case 'edit':
- xoops_cp_header();
+ xoops_cp_header();
- $catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
- if ($cat_id <> 0){
- $cat = $catHandler->getCat($cat_id, true);
- }else{
- $cat = $catHandler->getCat($cat_id, true);
- }
+ $catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
+ if ($cat_id <> 0) {
+ $cat = $catHandler->getCat($cat_id, true);
+ } else {
+ $cat = $catHandler->getCat($cat_id, true);
+ }
- echo'<fieldset><legend style="font-weight:bold; color:#990000;">'
- . _AM_EXTCAL_EDIT_CATEGORY . '</legend>';
+ echo'<fieldset><legend style="font-weight:bold; color:#990000;">' . _AM_EXTCAL_EDIT_CATEGORY . '</legend>';
- $form = new XoopsThemeForm(_AM_EXTCAL_ADD_CATEGORY, 'add_cat', 'cat.php?op=enreg', 'post', true);
- $form->addElement(new XoopsFormText(_AM_EXTCAL_NAME, 'cat_name', 30, 255, $cat->getVar('cat_name')), true);
- $form->addElement(new XoopsFormDhtmlTextArea(_AM_EXTCAL_DESCRIPTION, 'cat_desc', $cat->getVar('cat_desc')), false);
- $form->addElement(new XoopsFormText(_AM_EXTCAL_WEIGHT, 'cat_weight', 30, 5, $cat->getVar('cat_weight')), false);
- $form->addElement(
- new XoopsFormColorPicker(_AM_EXTCAL_COLOR, 'cat_color',
- '#' . $cat->getVar('cat_color'))
- );
-
- $file_path = XOOPS_ROOT_PATH . '/modules/extcal/css/images';
- $tf = XoopsLists::getImgListAsArray($file_path);
- array_unshift ($tf,"--- aucun ---");
- $xfIcones = new XoopsFormSelect(_AM_EXTCAL_ICONE, "cat_icone", $cat->getVar('cat_icone'), '') ;
- $xfIcones->addOptionArray($tf);
- $form->addElement($xfIcones, false);
-
- $form->addElement(new XoopsFormHidden('cat_id', $cat->getVar('cat_id')), false);
- $form->addElement(new XoopsFormButton("", "form_submit", _SEND, "submit"), false);
- $form->display();
+ $form = new XoopsThemeForm(_AM_EXTCAL_ADD_CATEGORY, 'add_cat', 'cat.php?op=enreg', 'post', true);
+ $form->addElement(new XoopsFormText(_AM_EXTCAL_NAME, 'cat_name', 30, 255, $cat->getVar('cat_name')), true);
+ $form->addElement(new XoopsFormDhtmlTextArea(_AM_EXTCAL_DESCRIPTION, 'cat_desc', $cat->getVar('cat_desc')), false);
+ $form->addElement(new XoopsFormText(_AM_EXTCAL_WEIGHT, 'cat_weight', 30, 5, $cat->getVar('cat_weight')), false);
+ $form->addElement(
+ new XoopsFormColorPicker(_AM_EXTCAL_COLOR, 'cat_color', '#' . $cat->getVar('cat_color'))
+ );
- echo '</fieldset>';
+ $file_path = XOOPS_ROOT_PATH . '/modules/extcal/css/images';
+ $tf = XoopsLists::getImgListAsArray($file_path);
+ array_unshift($tf, _MD_EXTCAL_NONE);
+ $xfIcones = new XoopsFormSelect(_AM_EXTCAL_ICONE, "cat_icone", $cat->getVar('cat_icone'), '');
+ $xfIcones->addOptionArray($tf);
+ $form->addElement($xfIcones, false);
- xoops_cp_footer();
+ $form->addElement(new XoopsFormHidden('cat_id', $cat->getVar('cat_id')), false);
+ $form->addElement(new XoopsFormButton("", "form_submit", _SEND, "submit"), false);
+ $form->display();
+
+ echo '</fieldset>';
+
+ xoops_cp_footer();
break;
-
+
case 'delete':
if (!isset($confirm)) {
xoops_cp_header();
- $hiddens = array('cat_id' => $cat_id, 'form_delete' => '', 'confirm' => 1);
+ $hiddens = array('cat_id' => $cat_id,
+ 'form_delete' => '',
+ 'confirm' => 1
+ );
xoops_confirm($hiddens, 'cat.php?op=delete', _AM_EXTCAL_CONFIRM_DELETE_CAT, _DELETE, 'cat.php');
xoops_cp_footer();
@@ -236,23 +238,23 @@
// include 'admin_footer.php';
//
// break;
-
-
+
+
case 'list':
default:
xoops_cp_header();
$categoryAdmin = new ModuleAdmin();
echo $categoryAdmin->addNavigation('cat.php');
- $categoryAdmin->addItemButton('Add Category', 'cat.php?op=new&id=0', 'add' , '');
+ $categoryAdmin->addItemButton('Add Category', 'cat.php?op=new', 'add', '');
echo $categoryAdmin->renderButton('right', '');
-
+
$catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
- $cats =$catHandler->getAllCatById($xoopsUser);
+ $cats = $catHandler->getAllCatById($xoopsUser);
- $xoopsTpl->assign("cats", $cats);
+ $xoopsTpl->assign("cats", $cats);
//$xoopsTpl->assign("module_dirname", $xoopsModule->getVar("dirname") );
-
+
$xoopsTpl->display("db:admin/extcal_admin_cat_list.html");
include "admin_footer.php";
break;
Modified: XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/event.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/event.php 2012-02-13 17:23:02 UTC (rev 8958)
+++ XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/event.php 2012-02-13 17:29:00 UTC (rev 8959)
@@ -54,16 +54,16 @@
// echo "<pre>{$t}</pre><br>";
// exit;
// If the date format is wrong
- if (
- !preg_match(_EXTCAL_MOTIF_DATE, $_POST['event_start']['date'])
- || !preg_match(_EXTCAL_MOTIF_DATE, $_POST['event_end']['date'])
- ) {
- redirect_header(
- 'event.php', 3, _MD_EXTCAL_WRONG_DATE_FORMAT . "<br />"
- . implode('<br />', $GLOBALS['xoopsSecurity']->getErrors())
- );
- exit;
- }
+// if (
+// !preg_match(_EXTCAL_MOTIF_DATE, $_POST['event_start']['date'])
+// || !preg_match(_EXTCAL_MOTIF_DATE, $_POST['event_end']['date'])
+// ) {
+// redirect_header(
+// 'event.php', 3, _MD_EXTCAL_WRONG_DATE_FORMAT . "<br />"
+// . implode('<br />', $GLOBALS['xoopsSecurity']->getErrors())
+// );
+// exit;
+// }
//exit;
///////////////////////////////////////////////////////////////////////////////
@@ -306,7 +306,7 @@
$eventHandler = xoops_getmodulehandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
$events = $eventHandler->objectToArray($eventHandler->getNewEvent($start, $nbEventsByPage, 0, true), array('cat_id'));
- $eventHandler->formatEventsDate($events, 'd/m/Y');
+ $eventHandler->formatEventsDate($events, _SHORTDATESTRING);
echo'<fieldset><legend style="font-weight:bold; color:#990000;">' . _AM_EXTCAL_APPROVED_EVENT . '</legend>';
echo'<fieldset><legend style="font-weight:bold; color:#0A3760;">' . _AM_EXTCAL_INFORMATION . '</legend>';
Modified: XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/class/config.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/class/config.php 2012-02-13 17:23:02 UTC (rev 8958)
+++ XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/class/config.php 2012-02-13 17:29:00 UTC (rev 8959)
@@ -7,7 +7,7 @@
class ExtcalConfig
{
- function &getHandler()
+ static function &getHandler()
{
static $configHandler;
if (!isset($configHandler[0])) {
Modified: XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/class/event.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/class/event.php 2012-02-13 17:23:02 UTC (rev 8958)
+++ XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/class/event.php 2012-02-13 17:29:00 UTC (rev 8959)
@@ -19,13 +19,13 @@
var $externalKey = array();
- function ExtcalEvent()
+ function __construct()
{
$this->initVar('event_id', XOBJ_DTYPE_INT, null, false);
$this->initVar('cat_id', XOBJ_DTYPE_INT, null, true);
$this->initVar('event_title', XOBJ_DTYPE_TXTBOX, null, true, 255);
$this->initVar('event_desc', XOBJ_DTYPE_TXTAREA, '', false);
- $this->initVar('event_organisateur', XOBJ_DTYPE_TXTBOX, '', false);
+ $this->initVar('event_organisateur', XOBJ_DTYPE_TXTBOX, '', false);
$this->initVar('event_contact', XOBJ_DTYPE_TXTBOX, '', false);
$this->initVar('event_url', XOBJ_DTYPE_URL, '', false);
$this->initVar('event_email', XOBJ_DTYPE_TXTBOX, '', false);
@@ -41,15 +41,25 @@
$this->initVar('event_recur_start', XOBJ_DTYPE_INT, 0, false);
$this->initVar('event_recur_end', XOBJ_DTYPE_INT, 0, false);
$this->initVar('dohtml', XOBJ_DTYPE_INT, 0, false);
- $this->initVar('event_picture1', XOBJ_DTYPE_TXTBOX, null, false);
- $this->initVar('event_picture2', XOBJ_DTYPE_TXTBOX, null, false);
- //$this->initVar("event_price",XOBJ_DTYPE_OTHER,null,false,10);
- $this->initVar('event_price', XOBJ_DTYPE_TXTBOX, '', false);
- $this->initVar('event_etablissement', XOBJ_DTYPE_INT, 5, false);
- $this->initVar('event_icone', XOBJ_DTYPE_TXTBOX, '', false);
+ $this->initVar('event_picture1', XOBJ_DTYPE_TXTBOX, null, false);
+ $this->initVar('event_picture2', XOBJ_DTYPE_TXTBOX, null, false);
+ //$this->initVar("event_price",XOBJ_DTYPE_OTHER,null,false,10);
+ $this->initVar('event_price', XOBJ_DTYPE_TXTBOX, '', false);
+ $this->initVar('event_etablissement', XOBJ_DTYPE_INT, 5, false);
+ $this->initVar('event_icone', XOBJ_DTYPE_TXTBOX, '', false);
- $this->externalKey['cat_id'] = array('className' => 'cat', 'getMethodeName' => 'getCat', 'keyName' => 'cat', 'core' => false);
- $this->externalKey['event_submitter'] = array('className' => 'user', 'getMethodeName' => 'get', 'keyName' => 'user', 'core' => true);
+ $this->externalKey['cat_id'] = array(
+ 'className' => 'cat',
+ 'getMethodeName' => 'getCat',
+ 'keyName' => 'cat',
+ 'core' => false
+ );
+ $this->externalKey['event_submitter'] = array(
+ 'className' => 'user',
+ 'getMethodeName' => 'get',
+ 'keyName' => 'user',
+ 'core' => true
+ );
}
function getExternalKey($key)
@@ -66,12 +76,12 @@
private $_extcalTime;
private $_extcalConfig;
- function ExtcalEventHandler(&$db)
+ function __construct(&$db)
{
$this->_extcalPerm = ExtcalPerm::getHandler();
$this->_extcalTime = ExtcalTime::getHandler();
-// $extcalConfig = ExtcalConfig::getHandler();
-// $this->_extcalConfig = $extcalConfig->getModuleConfig();
+ // $extcalConfig = ExtcalConfig::getHandler();
+ // $this->_extcalConfig = $extcalConfig->getModuleConfig();
$this->ExtcalPersistableObjectHandler($db, 'extcal_event', _EXTCAL_CLN_EVENT, 'event_id');
}
@@ -115,7 +125,7 @@
*/
$this->delete($eventId, true);
}
-
+
function deleteAllEvents($criteria = null, $force = true, $asObject = false)
{
/* TODO :
@@ -132,10 +142,10 @@
$rst = $this->getObjects($criteria, $asObject);
- if ($asObject){
- return $rst;
- }else{
- return $this->objectToArray($rst);
+ if ($asObject) {
+ return $rst;
+ } else {
+ return $this->objectToArray($rst);
}
}
@@ -158,8 +168,8 @@
return false;
}
}
-
+
// Return one event selected by his id (approve or not)
function getEventWithNotApprove($eventId, $skipPerm = false)
{
@@ -182,11 +192,13 @@
function formatEventsDate(&$events, $pattern)
{
$max = count($events);
- for ($i = 0; $i < $max; $i++) {
+ for (
+ $i = 0; $i < $max; $i++
+ ) {
$this->formatEventDate($events[$i], $pattern);
}
}
-
+
// function getPicture1(&$event) {
// return $event['event_picture1'];
// }
@@ -201,10 +213,10 @@
{
if (!$event['event_isrecur']) {
$event['formated_event_start'] = $this->_extcalTime->getFormatedDate($pattern, $event['event_start']);
- $event['formated_event_end'] = $this->_extcalTime->getFormatedDate($pattern, $event['event_end']);
+ $event['formated_event_end'] = $this->_extcalTime->getFormatedDate($pattern, $event['event_end']);
} else {
$event['formated_event_start'] = $this->_extcalTime->getFormatedDate($pattern, $event['event_start']);
- $event['formated_event_end'] = $this->_extcalTime->getFormatedDate($pattern, $event['event_end']);
+ $event['formated_event_end'] = $this->_extcalTime->getFormatedDate($pattern, $event['event_end']);
$event['formated_reccur_rule'] = $this->_extcalTime->getFormatedReccurRule($event['event_recur_rules']);
}
$event['formated_event_submitdate'] = $this->_extcalTime->getFormatedDate($pattern, $event['event_submitdate']);
@@ -233,9 +245,9 @@
{
$data['event_start'] = strtotime($data['event_start']['date']) + $data['event_start']['time'];
- $data['event_end'] = strtotime($data['event_end']['date']) + $data['event_end']['time'];
-
+ $data['event_end'] = strtotime($data['event_end']['date']) + $data['event_end']['time'];
+
if ($data['have_end'] == 0 || $data['event_start'] > $data['event_end']
) {
$data['event_end'] = $data['event_start'];
@@ -249,7 +261,7 @@
$user = $GLOBALS['xoopsUser'];
$data['event_start'] = userTimeToServerTime($data['event_start'], $this->_extcalTime->_getUserTimeZone($user));
- $data['event_end'] = userTimeToServerTime($data['event_end'], $this->_extcalTime->_getUserTimeZone($user));
+ $data['event_end'] = userTimeToServerTime($data['event_end'], $this->_extcalTime->_getUserTimeZone($user));
}
@@ -258,8 +270,8 @@
$user = $GLOBALS['xoopsUser'];
- $data['event_start'] = xoops_getUserTimestamp($data['event_start'], $this->_extcalTime->_getUserTimeZone($user));
- $data['event_end'] = xoops_getUserTimestamp($data['event_end'], $this->_extcalTime->_getUserTimeZone($user));
+ $data['event_start'] = xoops_getUserTimestamp($data['event_start'], $this->_extcalTime->_getUserTimeZone($user));
+ $data['event_end'] = xoops_getUserTimestamp($data['event_end'], $this->_extcalTime->_getUserTimeZone($user));
$data['event_submitdate'] = xoops_getUserTimestamp($data['event_submitdate'], $this->_extcalTime->_getUserTimeZone($user));
}
@@ -267,6 +279,7 @@
function serverTimeToUserTimes(&$events)
{
$max = count($events);
+
for (
$i = 0; $i < $max; $i++
) {
@@ -276,235 +289,261 @@
function _addRecurValue(&$data)
{
- $data['event_isrecur'] = $this->getIsRecur($_POST);
+ $data['event_isrecur'] = $this->getIsRecur($_POST);
$data['event_recur_rules'] = $this->getRecurRules($_POST);
$data['event_recur_start'] = $this->getRecurStart($data, $_POST);
- $data['event_recur_end'] = $this->getRecurEnd($data, $_POST);
+ $data['event_recur_end'] = $this->getRecurEnd($data, $_POST);
}
/***************************************************************
- * Return events on perioe
- ***************************************************************/
- function getEventsOnPeriode($criteres){
- //ext_echoArray($criteres);
- global $extcalConfig;
-
- $eventsU = $this->getEventsUniques($criteres);
- $eventsR = $this->getEventsRecurents($criteres);
- $events = array_merge($eventsU, $eventsR);
-// $events = $eventsU;
-
- //ext_echoArray($events);
+ * Return events on perioe
+ ***************************************************************/
+ function getEventsOnPeriode($criteres)
+ {
+ //ext_echoArray($criteres);
+ global $extcalConfig;
- //Tri des evennement par date ascendante
- $ordre = array();
- $eventArray = array();
-
- while(list($k,$v)=each($events)){
- $ordre[] = intval($v['event_start']);
- $this->formatEventDate($v, $extcalConfig['event_date_week']);
- //$v['cat']['cat_light_color'] = $v['cat']['cat_color'];
- $v['cat']['cat_light_color'] = eclaircirCouleur($v['cat']['cat_color'],_EXTCAL_INFOBULLE_RGB_MIN,_EXTCAL_INFOBULLE_RGB_MAX);
-if ($v['event_icone'] == '') $v['event_icone'] = $v['cat']['cat_icone'];
- $eventArray[]= $v;
- }
- array_multisort($eventArray, SORT_ASC, SORT_NUMERIC, $ordre, SORT_ASC, SORT_NUMERIC);
-
- return $eventArray ;
+ $eventsU = $this->getEventsUniques($criteres);
+ $eventsR = $this->getEventsRecurents($criteres);
+ $events = array_merge($eventsU, $eventsR);
+
+ // $events = $eventsU;
+
+ //ext_echoArray($events);
+
+ //Tri des evennement par date ascendante
+ $ordre = array();
+ $eventArray = array();
+
+ while (list($k, $v) = each($events)) {
+ $ordre[] = intval($v['event_start']);
+ $this->formatEventDate($v, $extcalConfig['event_date_week']);
+ //$v['cat']['cat_light_color'] = $v['cat']['cat_color'];
+ $v['cat']['cat_light_color'] = eclaircirCouleur($v['cat']['cat_color'], _EXTCAL_INFOBULLE_RGB_MIN, _EXTCAL_INFOBULLE_RGB_MAX);
+ if ($v['event_icone'] == '') {
+ $v['event_icone'] = $v['cat']['cat_icone'];
+ }
+ $eventArray[] = $v;
+ }
+ array_multisort($eventArray, SORT_ASC, SORT_NUMERIC, $ordre, SORT_ASC, SORT_NUMERIC);
+
+ return $eventArray;
}
+
/*****************************************************************
*
- *****************************************************************/
- function getEventsUniques($criteres){
- while (list($k,$v) = each ($criteres) ){
- $$k = $v;
- }
- if (!isset($nbDays)) $nbDays = 7;
- if (!isset($sens)) $sens = 'ASC';
- if (!isset($externalKeys)) $externalKeys = array('cat_id');
- //------------------------------------------------------
- switch ($periode){
- case _EXTCAL_EVENTS_WEEK:
- case _EXTCAL_EVENTS_CALENDAR_WEEK:
- case _EXTCAL_EVENTS_AGENDA_WEEK:
- $criteriaCompo = $this->_getEventWeekCriteria($day, $month, $year, $cat, $nbDays);
- if (!$this->_extcalConfig['diplay_past_event_cal']) {
- $criteriaCompo->add(new Criteria('event_end', time(), '>'));
- }
- break;
-
-
-
-
-
- case _EXTCAL_EVENTS_MONTH:
- case _EXTCAL_EVENTS_CALENDAR_MONTH:
- $criteriaCompo = $this->_getEventMonthCriteria($month, $year, $cat);
- if (!$this->_extcalConfig['diplay_past_event_cal']) {
- $criteriaCompo->add(new Criteria('event_end', time(), '>'));
+ *****************************************************************/
+ function getEventsUniques($criteres)
+ {
+ global $extcalConfig;
+ while (list($k, $v) = each($criteres)) {
+ $$k = $v;
+
}
- break;
-
- case _EXTCAL_EVENTS_DAY:
- $criteriaCompo = $this->_getEventDayCriteria($day, $month, $year, $cat);
- break;
-
- case _EXTCAL_EVENTS_YEAR:
- $criteriaCompo = $this->_getEventYearCriteria($year, $cat);
- break;
- }
- //--------------------------------------------------------------------------
- $criteriaCompo->add(new Criteria('event_isrecur', 0, '='));
- $criteriaCompo->setOrder($sens);
-
- $result = $this->getObjects($criteriaCompo);
- $events = $this->objectToArray($result, $externalKeys);
- $this->serverTimeToUserTimes($events);
-
- return $events;
-
+ if (!isset($nbDays)) {
+ $nbDays = 7;
+ }
+ if (!isset($sens)) {
+ $sens = 'ASC';
+ }
+ if (!isset($externalKeys)) {
+ $externalKeys = array('cat_id');
+ }
+ //------------------------------------------------------
+ switch ($periode) {
+ case _EXTCAL_EVENTS_WEEK:
+ case _EXTCAL_EVENTS_CALENDAR_WEEK:
+ case _EXTCAL_EVENTS_AGENDA_WEEK:
+ $criteriaCompo = $this->_getEventWeekCriteria($day, $month, $year, $cat, $nbDays);
+ if (!$extcalConfig['diplay_past_event_cal']) {
+ $criteriaCompo->add(new Criteria('event_end', time(), '>'));
+ }
+ break;
+
+ case _EXTCAL_EVENTS_MONTH:
+ case _EXTCAL_EVENTS_CALENDAR_MONTH:
+ $criteriaCompo = $this->_getEventMonthCriteria($month, $year, $cat);
+
+ if (!$extcalConfig['diplay_past_event_cal']) {
+ $criteriaCompo->add(new Criteria('event_end', time(), '>'));
+ }
+ break;
+
+ case _EXTCAL_EVENTS_DAY:
+ $criteriaCompo = $this->_getEventDayCriteria($day, $month, $year, $cat);
+ break;
+
+ case _EXTCAL_EVENTS_YEAR:
+ $criteriaCompo = $this->_getEventYearCriteria($year, $cat);
+ break;
+ }
+ //--------------------------------------------------------------------------
+ $criteriaCompo->add(new Criteria('event_isrecur', 0, '='));
+ $criteriaCompo->setOrder($sens);
+
+ $result = $this->getObjects($criteriaCompo);
+ $events = $this->objectToArray($result, $externalKeys);
+ $this->serverTimeToUserTimes($events);
+ return $events;
+
}
-
+
/*****************************************************************
* evennement r\xE9curents
- *****************************************************************/
+ *****************************************************************/
- function getEventsRecurents($criteres){
- global $extcalConfig;
-
- while (list($k,$v) = each ($criteres) ){
- $$k = $v;
- }
- if (!isset($nbDays)) $nbDays = 7;
- if (!isset($sens)) $sens = 'ASC';
- if (!isset($externalKeys)) $externalKeys = array('cat_id');
+ function getEventsRecurents($criteres)
+ {
+ global $extcalConfig;
+
+ while (list($k, $v) = each($criteres)) {
+ $$k = $v;
+ }
+ if (!isset($nbDays)) {
+ $nbDays = 7;
+ }
+ if (!isset($sens)) {
+ $sens = 'ASC';
+ }
+ if (!isset($externalKeys)) {
+ $externalKeys = array('cat_id');
+ }
$user = $GLOBALS['xoopsUser'];
- //------------------------------------------------------
-
+ //------------------------------------------------------
-
+
$criteriaCompo = new CriteriaCompo();
-
- switch ($periode){
- case _EXTCAL_EVENTS_WEEK:
- case _EXTCAL_EVENTS_CALENDAR_WEEK:
- case _EXTCAL_EVENTS_AGENDA_WEEK:
- $start = userTimeToServerTime(mktime(0, 0, 0, $month, $day, $year), $this->_extcalTime->_getUserTimeZone($user));
- $end = userTimeToServerTime(mktime(0, 0, 0, $month, $day + $nbDays + 1, $year), $this->_extcalTime->_getUserTimeZone($user));
- //$end = $start + (($nbDays + 1 )* _EXTCAL_TS_DAY);
- //$end = userTimeToServerTime(mktime(0, 0, 0, $month, $day+(($nbJours)+1 * _EXTCAL_TS_DAY), $year), $this->_extcalTime->_getUserTimeZone($user));;
- break;
-
-
-
-
- case _EXTCAL_EVENTS_MONTH:
- case _EXTCAL_EVENTS_CALENDAR_MONTH:
- $start = userTimeToServerTime(mktime(0, 0, 0, $month, 1, $year), $this->_extcalTime->_getUserTimeZone($user));
- $end = userTimeToServerTime(mktime(23, 59, 59, $month+1, 1, $year)-_EXTCAL_TS_DAY, $this->_extcalTime->_getUserTimeZone($user));
- $criteriaCompo->add(new Criteria('event_start', $end, '<='));
- //$criteriaCompo->add(new Criteria('event_end', $start, '>='));
-
-
+ switch ($periode) {
+ case _EXTCAL_EVENTS_WEEK:
+ case _EXTCAL_EVENTS_CALENDAR_WEEK:
+ case _EXTCAL_EVENTS_AGENDA_WEEK:
+ $start = userTimeToServerTime(mktime(0, 0, 0, $month, $day, $year), $this->_extcalTime->_getUserTimeZone($user));
+ $end = userTimeToServerTime(
+ mktime(
+ 0, 0, 0, $month, $day + $nbDays + 1, $year
+ ), $this->_extcalTime->_getUserTimeZone($user)
+ );
+ //$end = $start + (($nbDays + 1 )* _EXTCAL_TS_DAY);
+ //$end = userTimeToServerTime(mktime(0, 0, 0, $month, $day+(($nbJours)+1 * _EXTCAL_TS_DAY), $year), $this->_extcalTime->_getUserTimeZone($user));;
+ break;
- break;
-
- case _EXTCAL_EVENTS_DAY:
- $start = userTimeToServerTime(mktime(0, 0, 0, $month, $day, $year), $this->_extcalTime->_getUserTimeZone($user));
- $end = userTimeToServerTime(mktime(0, 0, 0, $month, $day+1, $year), $this->_extcalTime->_getUserTimeZone($user));;
- //$criteriaCompo->add(new Criteria('event_start', $end, '<='));
-
- break;
-
- case _EXTCAL_EVENTS_YEAR:
- $start = userTimeToServerTime(mktime(0, 0, 0, 1, 1, $year), $this->_extcalTime->_getUserTimeZone($user));
- $end = userTimeToServerTime(mktime(0, 0, 0, 12, 31, $year), $this->_extcalTime->_getUserTimeZone($user));
- break;
- }
- $formatDate =$extcalConfig['event_date_week'];
- //--------------------------------------------------------------------------
- $criteriaCompo->add(new Criteria('event_isrecur', 1, '='));
- $criteriaCompo->setOrder($sens);
-
- $result = $this->getObjects($criteriaCompo);
- $events = $this->objectToArray($result, $externalKeys);
- $this->serverTimeToUserTimes($events);
-
- //Balyage de tous les evennements r\xE9currents et creation de toutes le events
- $eventsR = array();
- while (list($k,$event) = each($events)){
- //$te = $this->GetInterval($event, $start, $end);
- //$eventsR = array_merge($eventsR, $te);
- //echo 'event : ' . $event['event_id'] . '<br>';
- //ext_echoArray($event);
- $recurEvents = $this->getRecurEventToDisplay($event, $start, $end);
- if (count($recurEvents)>0){
- $eventsR = array_merge($eventsR, $recurEvents);
+ case _EXTCAL_EVENTS_MONTH:
+ case _EXTCAL_EVENTS_CALENDAR_MONTH:
+ $start = userTimeToServerTime(mktime(0, 0, 0, $month, 1, $year), $this->_extcalTime->_getUserTimeZone($user));
+ $end = userTimeToServerTime(
+ mktime(23, 59, 59, $month + 1, 1, $year)
+ - _EXTCAL_TS_DAY, $this->_extcalTime->_getUserTimeZone($user)
+ );
+
+ $criteriaCompo->add(new Criteria('event_start', $end, '<='));
+ //$criteriaCompo->add(new Criteria('event_end', $start, '>='));
+
+
+ break;
+
+ case _EXTCAL_EVENTS_DAY:
+ $start = userTimeToServerTime(mktime(0, 0, 0, $month, $day, $year), $this->_extcalTime->_getUserTimeZone($user));
+ $end = userTimeToServerTime(
+ mktime(
+ 0, 0, 0, $month, $day + 1, $year
+ ), $this->_extcalTime->_getUserTimeZone($user)
+ );
+ ;
+ //$criteriaCompo->add(new Criteria('event_start', $end, '<='));
+
+ break;
+
+ case _EXTCAL_EVENTS_YEAR:
+ $start = userTimeToServerTime(mktime(0, 0, 0, 1, 1, $year), $this->_extcalTime->_getUserTimeZone($user));
+ $end = userTimeToServerTime(mktime(0, 0, 0, 12, 31, $year), $this->_extcalTime->_getUserTimeZone($user));
+ break;
}
-
- // Formating date
- //$eventsR = array_merge($eventsArray, $recurEvents);
-
- }
-
-
-
- return $eventsR;
-
+ $formatDate = $extcalConfig['event_date_week'];
+ //--------------------------------------------------------------------------
+ $criteriaCompo->add(new Criteria('event_isrecur', 1, '='));
+ $criteriaCompo->setOrder($sens);
+
+ $result = $this->getObjects($criteriaCompo);
+ $events = $this->objectToArray($result, $externalKeys);
+ $this->serverTimeToUserTimes($events);
+
+ //Balyage de tous les evennements r\xE9currents et creation de toutes le events
+ $eventsR = array();
+ while (list($k, $event) = each($events)) {
+ //$te = $this->GetInterval($event, $start, $end);
+ //$eventsR = array_merge($eventsR, $te);
+ //echo 'event : ' . $event['event_id'] . '<br>';
+ //ext_echoArray($event);
+ $recurEvents = $this->getRecurEventToDisplay($event, $start, $end);
+ if (count($recurEvents) > 0) {
+ $eventsR = array_merge($eventsR, $recurEvents);
+ }
+
+ // Formating date
+ //$eventsR = array_merge($eventsArray, $recurEvents);
+
+ }
+
+
+ return $eventsR;
+
}
/*****************************************************************
- *
- *****************************************************************/
- function echoDateArray($period, $caption=''){
- if ($caption!=''){
- echo "<hr>echoDateArray -> {$caption}<br>";
- }else{
- echo "<hr>echoDateArray<br>";
- }
-
- reset($period);
- foreach ( $period as $dt ) {
- echo $dt->format( "l d-m-Y H:i:s\n" ).'<br>';
- }
-
+ *
+ *****************************************************************/
+ function echoDateArray($period, $caption = '')
+ {
+ if ($caption != '') {
+ echo "<hr>echoDateArray -> {$caption}<br>";
+ } else {
+ echo "<hr>echoDateArray<br>";
+ }
+
+ reset($period);
+ foreach (
+ $period as $dt
+ ) {
+ echo $dt->format("l d-m-Y H:i:s\n") . '<br>';
+ }
+
}
-
-
-
+
+
/*****************************************************************
* Criteria
- *****************************************************************/
+ *****************************************************************/
// Return the criteria compo object for a day
function _getEventDayCriteria($day, $month, $year, $cat = 0)
- {
-
+ {
+
$user = $GLOBALS['xoopsUser'];
- $dayStart = userTimeToServerTime(mktime(0, 0, 0, $month, $day, $year), $this->_extcalTime->_getUserTimeZone($user));
- $dayEnd = userTimeToServerTime(mktime(23, 59, 59, $month, $day, $year), $this->_extcalTime->_getUserTimeZone($user));
+ $dayStart = userTimeToServerTime(mktime(0, 0, 0, $month, $day, $year), $this->_extcalTime->_getUserTimeZone($user));
+ $dayEnd = userTimeToServerTime(mktime(23, 59, 59, $month, $day, $year), $this->_extcalTime->_getUserTimeZone($user));
$criteriaCompo = $this->_getListCriteriaCompo($dayStart, $dayEnd, $cat, $user);
return $criteriaCompo;
}
+
// Return the criteria compo object for a week
function _getEventWeekCriteria($day, $month, $year, $cat, $nbDays = 7)
- {
-
+ {
+
$user = $GLOBALS['xoopsUser'];
$userStartTime = mktime(0, 0, 0, $month, $day, $year);
- $userEndTime = $userStartTime + (_EXTCAL_TS_DAY * $nbDays);
- $weekStart = userTimeToServerTime($userStartTime, $this->_extcalTime->_getUserTimeZone($user));
- $weekEnd = userTimeToServerTime($userEndTime, $this->_extcalTime->_getUserTimeZone($user));
+ $userEndTime = $userStartTime + (_EXTCAL_TS_DAY * $nbDays);
+ $weekStart = userTimeToServerTime($userStartTime, $this->_extcalTime->_getUserTimeZone($user));
+ $weekEnd = userTimeToServerTime($userEndTime, $this->_extcalTime->_getUserTimeZone($user));
$criteriaCompo = $this->_getCriteriaCompo($weekStart, $weekEnd, $cat, $user);
return $criteriaCompo;
}
-
+
// Return the criteria compo object for a month
function _getEventMonthCriteria($month, $year, $cat)
{
@@ -512,9 +551,9 @@
$user = $GLOBALS['xoopsUser'];
$userStartTime = mktime(0, 0, 0, $month, 1, $year);
- $userEndTime = mktime(23, 59, 59, $month + 1, 0, $year);
- $monthStart = userTimeToServerTime($userStartTime, $this->_extcalTime->_getUserTimeZone($user));
- $monthEnd = userTimeToServerTime($userEndTime, $this->_extcalTime->_getUserTimeZone($user));
+ $userEndTime = mktime(23, 59, 59, $month + 1, 0, $year);
+ $monthStart = userTimeToServerTime($userStartTime, $this->_extcalTime->_getUserTimeZone($user));
+ $monthEnd = userTimeToServerTime($userEndTime, $this->_extcalTime->_getUserTimeZone($user));
$criteriaCompo = $this->_getCriteriaCompo($monthStart, $monthEnd, $cat, $user);
return $criteriaCompo;
}
@@ -522,35 +561,31 @@
// Return event occuring on a given year
function _getEventYearCriteria($year, $cat = 0)
{
-
$user = $GLOBALS['xoopsUser'];
$userStartTime = mktime(0, 0, 0, 1, 1, $year);
- $userEndTime = mktime(23, 59, 59, 12, 31, $year);
- $yearStart = userTimeToServerTime($userStartTime, $this->_extcalTime->_getUserTimeZone($user));
- $yearEnd = userTimeToServerTime($userEndTime, $this->_extcalTime->_getUserTimeZone($user));
+ $userEndTime = mktime(23, 59, 59, 12, 31, $year);
+ $yearStart = userTimeToServerTime($userStartTime, $this->_extcalTime->_getUserTimeZone($user));
+ $yearEnd = userTimeToServerTime($userEndTime, $this->_extcalTime->_getUserTimeZone($user));
$criteriaCompo = $this->_getListCriteriaCompo($yearStart, $yearEnd, $cat, $user);
return $criteriaCompo;
}
-
-
- /**********************************************************************
- * Debut de - A virer in fine
- **********************************************************************/
+ /**********************************************************************
+ * Debut de - A virer in fine
+ **********************************************************************/
- /**********************************************************************
- * FIN de - A virer in fine
- **********************************************************************/
+ /**********************************************************************
+ * FIN de - A virer in fine
+ **********************************************************************/
+ /**********************************************************************
+ * Construction des criteres en fonction de la p\xE9riode
+ **********************************************************************/
- /**********************************************************************
- * Construction des criteres en fonction de la p\xE9riode
- **********************************************************************/
-
function _getCriteriaCompo($start, $end, $cat, &$user)
{
@@ -581,9 +616,10 @@
function _getCalendarCriteriaCompo($start, $end, $cat, &$user)
{
-
+ global $extcalConfig;
$criteriaCompo = $this->_getCriteriaCompo($start, $end, $cat, $user);
- if (!$this->_extcalConfig['diplay_past_event_cal']) {
+ //if (!$this->_extcalConfig['diplay_past_event_cal']) {
+ if (!$extcalConfig['diplay_past_event_cal']) {
$criteriaCompo->add(new Criteria('event_end', time(), '>'));
}
return $criteriaCompo;
@@ -591,9 +627,10 @@
function _getListCriteriaCompo($start, $end, $cat, &$user)
{
-
+ global $extcalConfig;
$criteriaCompo = $this->_getCriteriaCompo($start, $end, $cat, $user);
- if (!$this->_extcalConfig['diplay_past_event_list']) {
+ // if (!$this->_extcalConfig['diplay_past_event_list']) {
+ if (!$extcalConfig['diplay_past_event_list']) {
$criteriaCompo->add(new Criteria('event_end', time(), '>'));
}
return $criteriaCompo;
@@ -629,17 +666,17 @@
$criteriaCompo->setLimit($nbEvent);
return $this->getObjects($criteriaCompo);
}
-
+
// Return event occuring this day
function getThisDayEvent($nbEvent, $cat = 0)
{
- $day = date("j");
+ $day = date("j");
$month = date("n");
- $year = date("Y");
+ $year = date("Y");
$dayStart = mktime(0, 0, 0, $month, $day, $year);
- $dayEnd = mktime(0, 0, 0, $month, $day + 1, $year);
+ $dayEnd = mktime(0, 0, 0, $month, $day + 1, $year);
$criteriaCompo = new CriteriaCompo();
$this->_addCatSelectCriteria($criteriaCompo, $cat);
@@ -701,7 +738,7 @@
function _addCatPermCriteria(&$criteria, &$user)
{
$authorizedAccessCats = $this->_extcalPerm->getAuthorizedCat($user, 'extcal_cat_view');
- $count = count($authorizedAccessCats);
+ $count = count($authorizedAccessCats);
if ($count > 0) {
$in = '(' . $authorizedAccessCats[0];
array_shift($authorizedAccessCats);
@@ -736,24 +773,24 @@
}
}
}
+
/**********************************************************************
- formulaire d'edition des evennements*
- **********************************************************************/
+ formulaire d'edition des evennements*
+ **********************************************************************/
function getEventForm($siteSide = 'user', $mode = 'new', $data = null)
{
-
- $catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
+ $catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
$fileHandler = xoops_getmodulehandler(_EXTCAL_CLS_FILE, _EXTCAL_MODULE);
- /***************************************************/
- include_once XOOPS_ROOT_PATH."/modules/extcal/class/etablissement.php";
+ /***************************************************/
+ include_once XOOPS_ROOT_PATH . "/modules/extcal/class/etablissement.php";
if ($siteSide == 'admin') {
$action = 'event.php?op=enreg';
- $cats = $catHandler->getAllCat($GLOBALS['xoopsUser'], 'all');
+ $cats = $catHandler->getAllCat($GLOBALS['xoopsUser'], 'all');
} else {
$action = 'post.php';
- $cats = $catHandler->getAllCat($GLOBALS['xoopsUser']);
+ $cats = $catHandler->getAllCat($GLOBALS['xoopsUser']);
}
- /***************************************************/
+ /***************************************************/
$reccurOptions = array();
if ($mode == 'edit' OR $mode == 'clone') {
@@ -761,47 +798,47 @@
return false;
}
if ($mode == 'clone') {
- $data['event_id'] = 0;
- $event->setVar('event_id', 0);
- $newTitle = $event->getVar('event_title') . ' (' . _AM_EXTCAL_CLONE_OF. $data['event_id'] . ')';
- $event->setVar('event_title', $newTitle);
+ $data['event_id'] = 0;
+ $event->setVar('event_id', 0);
+ $newTitle = $event->getVar('event_title') . ' (' . _AM_EXTCAL_CLONE_OF . $data['event_id'] . ')';
+ $event->setVar('event_title', $newTitle);
}
-
- $formTitle = _MD_EXTCAL_EDIT_EVENT;
- $formName = 'modify_event';
- $title = $event->getVar('event_title', 'e');
- $cat = $event->getVar('cat_id');
- $desc = $event->getVar('event_desc', 'e');
- $nbMember = $event->getVar('event_nbmember', 'e');
- $organisateur = $event->getVar('event_organisateur');
- $contact = $event->getVar('event_contact', 'e');
- $url = $event->getVar('event_url', 'e');
- $email = $event->getVar('event_email', 'e');
- $event_address = $event->getVar('event_address', 'e');
- $startDateValue = xoops_getUserTimestamp($event->getVar('event_start'), $this->_extcalTime->_getUserTimeZone($GLOBALS['xoopsUser']));
- $endDateValue = xoops_getUserTimestamp($event->getVar('event_end'), $this->_extcalTime->_getUserTimeZone($GLOBALS['xoopsUser']));
- $event_picture1 = $event->getVar('event_picture1');
- $event_picture2 = $event->getVar('event_picture2');
- $event_price = $event->getVar('event_price');
- $event_etablissement = $event->getVar('event_etablissement');
- $event_icone = $event->getVar('event_icone');
+ $formTitle = _MD_EXTCAL_EDIT_EVENT;
+ $formName = 'modify_event';
+ $title = $event->getVar('event_title', 'e');
+ $cat = $event->getVar('cat_id');
+ $desc = $event->getVar('event_desc', 'e');
+ $nbMember = $event->getVar('event_nbmember', 'e');
+ $organisateur = $event->getVar('event_organisateur');
+ $contact = $event->getVar('event_contact', 'e');
+ $url = $event->getVar('event_url', 'e');
+ $email = $event->getVar('event_email', 'e');
+ $event_address = $event->getVar('event_address', 'e');
+ $startDateValue = xoops_getUserTimestamp($event->getVar('event_start'), $this->_extcalTime->_getUserTimeZone($GLOBALS['xoopsUser']));
+ $endDateValue = xoops_getUserTimestamp($event->getVar('event_end'), $this->_extcalTime->_getUserTimeZone($GLOBALS['xoopsUser']));
+ $event_picture1 = $event->getVar('event_picture1');
+ $event_picture2 = $event->getVar('event_picture2');
+ $event_price = $event->getVar('event_price');
+ $event_etablissement = $event->getVar('event_etablissement');
+ $event_icone = $event->getVar('event_icone');
+
// Configuring recurring form
$eventOptions = explode('|', $event->getVar('event_recur_rules'));
- $reccurMode = $eventOptions[0];
+ $reccurMode = $eventOptions[0];
array_shift($eventOptions);
switch ($reccurMode) {
case 'daily':
- $reccurOptions['rrule_freq'] = 'daily';
+ $reccurOptions['rrule_freq'] = 'daily';
$reccurOptions['rrule_daily_interval'] = $eventOptions[0];
break;
case 'weekly':
- $reccurOptions['rrule_freq'] = 'weekly';
+ $reccurOptions['rrule_freq'] = 'weekly';
$reccurOptions['rrule_weekly_interval'] = $eventOptions[0];
array_shift($eventOptions);
$reccurOptions['rrule_weekly_bydays'] = $eventOptions;
@@ -810,7 +847,7 @@
case 'monthly':
- $reccurOptions['rrule_freq'] = 'monthly';
+ $reccurOptions['rrule_freq'] = 'monthly';
$reccurOptions['rrule_monthly_interval'] = $eventOptions[0];
array_shift($eventOptions);
if (substr($eventOptions[0], 0, 2) != "MD") {
@@ -823,7 +860,7 @@
case 'yearly':
- $reccurOptions['rrule_freq'] = 'yearly';
+ $reccurOptions['rrule_freq'] = 'yearly';
$reccurOptions['rrule_yearly_interval'] = $eventOptions[0];
array_shift($eventOptions);
$reccurOptions['rrule_yearly_byday'] = $eventOptions[0];
@@ -839,42 +876,42 @@
} elseif ($mode == 'preview') {
- $formTitle = _MD_EXTCAL_SUBMIT_EVENT;
- $formName = 'submit_event';
- $title = $data['event_title'];
- $cat = $data['cat_id'];
- $desc = $data['event_desc'];
- $nbMember = $data['event_nbmember'];
- $organisateur = $data['event_organisateur'];
- $contact = $data['event_contact'];
- $url = $data['event_url'];
- $email = $data['event_email'];
- $event_address = $data['event_address'];
- $startDateValue = $data['event_start'];
- $endDateValue = $data['event_end'];
- $eventEndOk = $data['have_end'];
- $event_picture1 = $data['event_picture1'];
- $event_picture2 = $data['event_picture2'];
- $event_price = $data['event_price'];
- $event_etablissement = $data['event_etablissement'];
- $event_icone = $data['event_icone'];
+ $formTitle = _MD_EXTCAL_SUBMIT_EVENT;
+ $formName = 'submit_event';
+ $title = $data['event_title'];
+ $cat = $data['cat_id'];
+ $desc = $data['event_desc'];
+ $nbMember = $data['event_nbmember'];
+ $organisateur = $data['event_organisateur'];
+ $contact = $data['event_contact'];
+ $url = $data['event_url'];
+ $email = $data['event_email'];
+ $event_address = $data['event_address'];
+ $startDateValue = $data['event_start'];
+ $endDateValue = $data['event_end'];
+ $eventEndOk = $data['have_end'];
+ $event_picture1 = $data['event_picture1'];
+ $event_picture2 = $data['event_picture2'];
+ $event_price = $data['event_price'];
+ $event_etablissement = $data['event_etablissement'];
+ $event_icone = $data['event_icone'];
// Configuring recurring form
$eventOptions = explode('|', $this->getRecurRules($_POST));
- $reccurMode = $eventOptions[0];
+ $reccurMode = $eventOptions[0];
array_shift($eventOptions);
switch ($reccurMode) {
case 'daily':
- $reccurOptions['rrule_freq'] = 'daily';
+ $reccurOptions['rrule_freq'] = 'daily';
$reccurOptions['rrule_daily_interval'] = $eventOptions[0];
break;
case 'weekly':
- $reccurOptions['rrule_freq'] = 'weekly';
+ $reccurOptions['rrule_freq'] = 'weekly';
$reccurOptions['rrule_weekly_interval'] = $eventOptions[0];
array_shift($eventOptions);
$reccurOptions['rrule_weekly_bydays'] = $eventOptions;
@@ -883,7 +920,7 @@
case 'monthly':
- $reccurOptions['rrule_freq'] = 'monthly';
+ $reccurOptions['rrule_freq'] = 'monthly';
$reccurOptions['rrule_monthly_interval'] = $eventOptions[0];
array_shift($eventOptions);
if (substr($eventOptions[0], 0, 2) != "MD") {
@@ -896,7 +933,7 @@
case 'yearly':
- $reccurOptions['rrule_freq'] = 'yearly';
+ $reccurOptions['rrule_freq'] = 'yearly';
$reccurOptions['rrule_yearly_interval'] = $eventOptions[0];
array_shift($eventOptions);
$reccurOptions['rrule_yearly_byday'] = $eventOptions[0];
@@ -911,26 +948,26 @@
$fileHandler->formatFilesSize($files);
} else {
- $formTitle = _MD_EXTCAL_SUBMIT_EVENT;
- $formName = 'submit_event';
- $title = '';
- $cat = '';
- $desc = '';
- $nbMember = 0;
- $organisateur = '';
- $contact = '';
- $url = '';
- $email = '';
- $event_address = '';
- $startDateValue = 0;
- $endDateValue = 0;
- $eventEndOk = 0;
- $event_picture1 = '';
- $event_picture2 = '';
- $event_price = '';
- $event_etablissement = '';
- $files = array();
- $event_icone = '';
+ $formTitle = _MD_EXTCAL_SUBMIT_EVENT;
+ $formName = 'submit_event';
+ $title = '';
+ $cat = '';
+ $desc = '';
+ $nbMember = 0;
+ $organisateur = '';
+ $contact = '';
+ $url = '';
+ $email = '';
+ $event_address = '';
+ $startDateValue = 0;
+ $endDateValue = 0;
+ $eventEndOk = 0;
+ $event_picture1 = '';
+ $event_picture2 = '';
+ $event_price = '';
+ $event_etablissement = '';
+ $files = array();
+ $event_icone = '';
}
@@ -938,8 +975,8 @@
$form = new ExtcalThemeForm($formTitle, 'event_form', $action, 'post', true);
// Add this extra to allow file upload
$form->setExtra('enctype="multipart/form-data"');
-
-
+
+
//-----------------------------------------------
// Title
$form->addElement(new XoopsFormText(_MD_EXTCAL_TITLE, 'event_title', 80, 255, $title), true);
@@ -952,42 +989,43 @@
$catSelect->addOption($cat->getVar('cat_id'), $cat->getVar('cat_name'));
}
$form->addElement($catSelect, true);
- //-----------------------------------------------------------
-
- $file_path = XOOPS_ROOT_PATH . '/modules/extcal/css/images';
- $tf = XoopsLists::getImgListAsArray($file_path);
- array_unshift ($tf,"--- aucun ---");
- $xfIcones = new XoopsFormSelect(_AM_EXTCAL_ICONE, "event_icone", $event_icone, '') ;
- $xfIcones->addOptionArray($tf);
- $form->addElement($xfIcones, false);
- //-----------------------------------------------------------
- //etablissement
- $etablissementHandler = xoops_getmodulehandler(_EXTCAL_CLS_ETABLISSEMENT, _EXTCAL_MODULE);
- $etablissement_select = new XoopsFormSelect(_MD_EXTCAL_ETABLISSEMENT, 'event_etablissement', $event_etablissement);
- $criteria = new CriteriaCompo();
- $criteria->setSort('nom');
- $criteria->setOrder('ASC');
-
-
- //$lstEtablissement = $etablissementHandler->getList($criteria);
- $etablissement_arr= $etablissementHandler->getAll($criteria);
- $tEts = array();
- $tEts[0] = _MD_EXTCAL_NONE;
- foreach (array_keys($etablissement_arr) as $i)
- {
- //$tEts[$etablissement_arr[$i]->getVar('id')] = $etablissement_arr[$i]->getVar('nom');
- $tEts[$etablissement_arr[$i]['id']] = $etablissement_arr[$i]['nom'];
- }
- //array_unshift($tEts, _MD_EXTCAL_NONE);
-
- $etablissement_select->addOptionArray($tEts);
- $form->addElement($etablissement_select, true);
+ //-----------------------------------------------------------
- //-----------------------------------------------------------
+ $file_path = XOOPS_ROOT_PATH . '/modules/extcal/css/images';
+ $tf = XoopsLists::getImgListAsArray($file_path);
+ array_unshift($tf, _MD_EXTCAL_NONE);
+ $xfIcones = new XoopsFormSelect(_MD_EXTCAL_ICONE, "event_icone", $event_icone, '');
+ $xfIcones->addOptionArray($tf);
+ $form->addElement($xfIcones, false);
+ //-----------------------------------------------------------
+ //etablissement
+ $etablissementHandler = xoops_getmodulehandler(_EXTCAL_CLS_ETABLISSEMENT, _EXTCAL_MODULE);
+ $etablissement_select = new XoopsFormSelect(_MD_EXTCAL_ETABLISSEMENT, 'event_etablissement', $event_etablissement);
+ $criteria = new CriteriaCompo();
+ $criteria->setSort('nom');
+ $criteria->setOrder('ASC');
-
+
+ //$lstEtablissement = $etablissementHandler->getList($criteria);
+ $etablissement_arr = $etablissementHandler->getAll($criteria);
+ $tEts = array();
+ $tEts[0] = _MD_EXTCAL_NONE;
+ foreach (
+ array_keys($etablissement_arr) as $i
+ ) {
+ //$tEts[$etablissement_arr[$i]->getVar('id')] = $etablissement_arr[$i]->getVar('nom');
+ $tEts[$etablissement_arr[$i]['id']] = $etablissement_arr[$i]['nom'];
+ }
+ //array_unshift($tEts, _MD_EXTCAL_NONE);
+
+ $etablissement_select->addOptionArray($tEts);
+ $form->addElement($etablissement_select, true);
+
+ //-----------------------------------------------------------
+
+
// Start and end
- new ExtcalFormDateTime($form, $startDateValue, $endDateValue);
+ new ExtcalFormDateTime($form, $startDateValue, $endDateValue); //mb
// Description
$form->addElement(new XoopsFormDhtmlTextArea(_MD_EXTCAL_DESCRIPTION, 'event_desc', $desc, 10), false);
// Max registered member for this event
@@ -995,16 +1033,16 @@
$nbMemberElement->setDescription(_MD_EXTCAL_NBMEMBER_DESC);
$form->addElement($nbMemberElement, false);
-//Price and monnaie
- $monnaie_price = new XoopsFormElementTray(_MD_EXTCAL_PRICE ,'');
- //price
- $monnaie_price->addElement(new XoopsFormText('' , 'event_price',...
[truncated message content] |
|
From: <dj...@us...> - 2012-02-13 17:23:12
|
Revision: 8958
http://xoops.svn.sourceforge.net/xoops/?rev=8958&view=rev
Author: djculex
Date: 2012-02-13 17:23:02 +0000 (Mon, 13 Feb 2012)
Log Message:
-----------
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/js/smallworld.js
Modified: XoopsModules/smallworld/trunk/smallworld/js/smallworld.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2012-02-13 17:16:13 UTC (rev 8957)
+++ XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2012-02-13 17:23:02 UTC (rev 8958)
@@ -572,7 +572,7 @@
function smallworldCheckNumDivs() {
xoops_smallworld(document).ready(function() {
xoops_smallworld('.smallworld_commentcontainer').children('div').show();
- xoops_smallworld('.smallworld_CommentShowMore').remove();
+ xoops_smallworld('.smallworld_CommentShowMoreSpan').remove();
xoops_smallworld('.smallworld_CommentShowMore').die('click');
xoops_smallworld('.smallworld_commentcontainer').each(function(){
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-02-13 17:16:20
|
Revision: 8957
http://xoops.svn.sourceforge.net/xoops/?rev=8957&view=rev
Author: djculex
Date: 2012-02-13 17:16:13 +0000 (Mon, 13 Feb 2012)
Log Message:
-----------
- NEW: If number if comments >2 then show 2 comments and show "show more" / "Show less" container
- CHANGE: Replace a split() -> explode() function to remove depreseated info
- LANG_DIFF: see docs/lang_diff.txt for 2 changes in lang/js/variables.js
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/css/smallworld.css
XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt
XoopsModules/smallworld/trunk/smallworld/docs/lang_diff.txt
XoopsModules/smallworld/trunk/smallworld/include/functions.php
XoopsModules/smallworld/trunk/smallworld/js/smallworld.js
XoopsModules/smallworld/trunk/smallworld/js/wall.js
XoopsModules/smallworld/trunk/smallworld/language/english/js/variables.js
XoopsModules/smallworld/trunk/smallworld/templates/getlastcom.html
XoopsModules/smallworld/trunk/smallworld/templates/getlastmsg.html
XoopsModules/smallworld/trunk/smallworld/templates/getmore.html
Modified: XoopsModules/smallworld/trunk/smallworld/css/smallworld.css
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/css/smallworld.css 2012-02-13 16:43:44 UTC (rev 8956)
+++ XoopsModules/smallworld/trunk/smallworld/css/smallworld.css 2012-02-13 17:16:13 UTC (rev 8957)
@@ -410,7 +410,9 @@
padding-top: 2px;
}
-input.error, select.error, textarea.error { background-color: #FAF4F4; }
+input.error, select.error, textarea.error {
+ background-color: #FAF4F4;
+}
.smallworld_moreinfo {
color: #7777FF;
@@ -672,7 +674,29 @@
/*---------- Gallery ------------*/
/*----------- WALL -------------*/
+.smallworld_commentcontainer {
+}
+
+.smallworld_CommentShowMoreSpan {
+ background-color: #E6E6E6;
+ border-color: #A8A8A8;
+ border-style: dotted;
+ border-width: thin;
+ display: block;
+ height: 5px;
+ margin: 0 5%;
+ padding: 5px 0 5%;
+ width: 96%;
+}
+
+.smallworld_CommentShowMore:link {
+ color: #6B6B6B;
+ font-size: 9px;
+ margin: 0 36%;
+ position: relative;
+}
+
.smallworld_share {
}
Modified: XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt 2012-02-13 16:43:44 UTC (rev 8956)
+++ XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt 2012-02-13 17:16:13 UTC (rev 8957)
@@ -22,6 +22,9 @@
- Bugfix: Removed php 5.30 function to convert dateformat and replaced with simpler function
- Change: Removed php 5.30 function to calculate difference between dates in Years.
- change: Smallworld decreased min-php to >= 5.20
+- NEW: If number if comments >2 then show 2 comments and show "show more" / "Show less" container
+- Change: Replace a split() -> explode() function to remove depreseated info
+- land_diff: see docs/lang_diff.txt for 2 changes in lang/js/variables.js
------------------------------
Changelog v.1.10 RC
Modified: XoopsModules/smallworld/trunk/smallworld/docs/lang_diff.txt
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/docs/lang_diff.txt 2012-02-13 16:43:44 UTC (rev 8956)
+++ XoopsModules/smallworld/trunk/smallworld/docs/lang_diff.txt 2012-02-13 17:16:13 UTC (rev 8957)
@@ -7,12 +7,15 @@
+ Added
- Removed
* Modified
+
+===============================
+2012/02/13: Version 1.15 RC3
+===============================
+htdocs/modules/smallworld/language/english/js/variables.js
++ var _smallworldCommentsMoreMore = "..Show more";
++ var _smallworldCommentsMoreLess = "..Show less";
-=============
-1.0
-=============
+===============================
+2011/12/24: Version 1.00 RC1
+===============================
Original Version
-
-=============
-1.10
-=============
\ No newline at end of file
Modified: XoopsModules/smallworld/trunk/smallworld/include/functions.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/include/functions.php 2012-02-13 16:43:44 UTC (rev 8956)
+++ XoopsModules/smallworld/trunk/smallworld/include/functions.php 2012-02-13 17:16:13 UTC (rev 8957)
@@ -638,7 +638,7 @@
function Smallworld_euroToUsDate($stringDate)
{
if ($stringDate != 0 || $stringDate != '') {
- $theData = split("-", trim($stringDate));
+ $theData = explode("-", trim($stringDate));
$ret = $theData[2] . "-" . $theData[1] . "-" . $theData[0];
return $ret;
} else {
@@ -654,7 +654,7 @@
function Smallworld_UsToEuroDate($stringDate)
{
if ($stringDate != 0 || $stringDate != '') {
- $theData = split("-", trim($stringDate));
+ $theData = explode("-", trim($stringDate));
$ret = $theData[2] . "-" . $theData[1] . "-" . $theData[0];
return $ret;
} else {
@@ -806,5 +806,4 @@
} else {
return '';
}
- }
-?>
+ }
\ No newline at end of file
Modified: XoopsModules/smallworld/trunk/smallworld/js/smallworld.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2012-02-13 16:43:44 UTC (rev 8956)
+++ XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2012-02-13 17:16:13 UTC (rev 8957)
@@ -562,8 +562,41 @@
});
});
+
+smallworldCheckNumDivs();
+
}); // END OF DOCUMENT READY IN THE START
+// function to apply "show more" show less if number of comments
+// are more than 2
+function smallworldCheckNumDivs() {
+xoops_smallworld(document).ready(function() {
+ xoops_smallworld('.smallworld_commentcontainer').children('div').show();
+ xoops_smallworld('.smallworld_CommentShowMore').remove();
+ xoops_smallworld('.smallworld_CommentShowMore').die('click');
+
+ xoops_smallworld('.smallworld_commentcontainer').each(function(){
+ var hiddenElements = xoops_smallworld(this).children('div:gt(1)').hide();
+ if (hiddenElements.size() > 0) {
+ var showCaption = _smallworldCommentsMoreMore;
+ xoops_smallworld(this).children('div:gt(1)').hide();
+ xoops_smallworld(this).after('<div class="smallworld_CommentShowMoreSpan"><a href="javascript:void(0);" class="smallworld_CommentShowMore">' + showCaption + '</a></div>');
+ }
+ });
+
+ xoops_smallworld('.smallworld_CommentShowMore').live('click', function(e){
+ e.preventDefault();
+ xoops_smallworld(this).parent().prev('div').children('div:gt(1)').slideToggle('slow');
+ xoops_smallworld(this).text(_smallworldCommentsMoreLess);
+ },
+ function() {
+ hiddenElements.hide();
+ xoops_smallworld(this).text('more');
+ });
+ });
+}
+
+
// Open custom boomark window
function customBookmark(id, display, url) {
window.open(url, '_blank',
Modified: XoopsModules/smallworld/trunk/smallworld/js/wall.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/js/wall.js 2012-02-13 16:43:44 UTC (rev 8956)
+++ XoopsModules/smallworld/trunk/smallworld/js/wall.js 2012-02-13 17:16:13 UTC (rev 8957)
@@ -23,6 +23,7 @@
xoops_smallworld("#smallworld_update").val('');
xoops_smallworld("#smallworld_update").focus();
xoops_smallworld("#smallworld_stexpand").oembed(updateval);
+ smallworldCheckNumDivs();
}
});
}
@@ -130,6 +131,7 @@
else {
}
+ smallworldCheckNumDivs();
return false;
});
});
Modified: XoopsModules/smallworld/trunk/smallworld/language/english/js/variables.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/english/js/variables.js 2012-02-13 16:43:44 UTC (rev 8956)
+++ XoopsModules/smallworld/trunk/smallworld/language/english/js/variables.js 2012-02-13 17:16:13 UTC (rev 8957)
@@ -10,6 +10,9 @@
var _smallworldCancel = "Cancel";
var _smallworldClose = "close";
+var _smallworldCommentsMoreMore = "..Show more";
+var _smallworldCommentsMoreLess = "..Show less";
+
var SmallworldGenderError = "Please choose your gender";
var SmallworldBirthdayError = "Please choose your birthday";
var SmallworldEmailError = "Please fill at least one email";
Modified: XoopsModules/smallworld/trunk/smallworld/templates/getlastcom.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/templates/getlastcom.html 2012-02-13 16:43:44 UTC (rev 8956)
+++ XoopsModules/smallworld/trunk/smallworld/templates/getlastcom.html 2012-02-13 17:16:13 UTC (rev 8957)
@@ -38,5 +38,8 @@
</div>
<{/section}>
<script type="text/javascript">
-attachAvatarOpen();
+xoops_smallworld(document).ready(function() {
+ smallworldCheckNumDivs();
+ attachAvatarOpen();
+});
</script>
\ No newline at end of file
Modified: XoopsModules/smallworld/trunk/smallworld/templates/getlastmsg.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/templates/getlastmsg.html 2012-02-13 16:43:44 UTC (rev 8956)
+++ XoopsModules/smallworld/trunk/smallworld/templates/getlastmsg.html 2012-02-13 17:16:13 UTC (rev 8957)
@@ -121,5 +121,8 @@
<br><br>
<{/foreach}>
<script type="text/javascript">
-attachAvatarOpen();
+xoops_smallworld(document).ready(function() {
+ smallworldCheckNumDivs();
+ attachAvatarOpen();
+});
</script>
\ No newline at end of file
Modified: XoopsModules/smallworld/trunk/smallworld/templates/getmore.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/templates/getmore.html 2012-02-13 16:43:44 UTC (rev 8956)
+++ XoopsModules/smallworld/trunk/smallworld/templates/getmore.html 2012-02-13 17:16:13 UTC (rev 8957)
@@ -115,6 +115,9 @@
<a href="javascript:void(0)" class="smallworld_msg_counter" rel="<{$pagename}>" id="<{$post.msg_id}>">MORE</a>
<br><br>
<script type="text/javascript">
-attachAvatarOpen();
+xoops_smallworld(document).ready(function() {
+ smallworldCheckNumDivs();
+ attachAvatarOpen();
+});
</script>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-02-13 16:43:53
|
Revision: 8956
http://xoops.svn.sourceforge.net/xoops/?rev=8956&view=rev
Author: beckmi
Date: 2012-02-13 16:43:44 +0000 (Mon, 13 Feb 2012)
Log Message:
-----------
updating English translations
Modified Paths:
--------------
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/language/english/admin.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/language/english/main.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/language/english/modinfo.php
Modified: XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/language/english/admin.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/language/english/admin.php 2012-02-13 15:09:34 UTC (rev 8955)
+++ XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/language/english/admin.php 2012-02-13 16:43:44 UTC (rev 8956)
@@ -69,7 +69,7 @@
define('_AM_EXTCAL_EVENT_CREATED', 'Event created');
define('_AM_EXTCAL_EVENT_DELETED', 'Event successfully deleted.');
define('_AM_EXTCAL_EVENT_EDITED', 'Event edited');
-define('_AM_EXTCAL_FORMOK', 'Save successful');
+define('_AM_EXTCAL_FORMOK', 'Saved successfully');
define('_AM_EXTCAL_GO_TO_MODULE', 'Go to module');
define('_AM_EXTCAL_GOTO_EVENTS', "Return to events");
define('_AM_EXTCAL_GROUP_NAME', 'Group name');
@@ -116,6 +116,4 @@
define('_AM_EXTCAL_VIEW_PERMISSION', 'View permission');
define('_AM_EXTCAL_VIEW_PERMISSION_DESC', 'Select categories that each group is allowed to view');
define('_AM_EXTCAL_NO_PENDING_EVENT', 'No pending Event');
-define('_AM_EXTCAL_ICONE', 'Icon');
-
-?>
+define('_AM_EXTCAL_ICONE', 'Icon');
\ No newline at end of file
Modified: XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/language/english/main.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/language/english/main.php 2012-02-13 15:09:34 UTC (rev 8955)
+++ XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/language/english/main.php 2012-02-13 16:43:44 UTC (rev 8956)
@@ -36,13 +36,13 @@
define('_MD_EXTCAL_ACTION_COME', "Register");
define('_MD_EXTCAL_ACTION_DELEGATION', "Delegate");
define('_MD_EXTCAL_ACTION_DESINSCRIPTION', "Unregister");
-define('_MD_EXTCAL_ACTION_INSCRIPTION', "Register");
+define('_MD_EXTCAL_ACTION_INSCRIPTION', "has subscribed");
define('_MD_EXTCAL_ACTION_MESSAGE', "Message: ");
-define('_MD_EXTCAL_ACTION_NONE', "Unregister");
+define('_MD_EXTCAL_ACTION_NONE', "No decision");
define('_MD_EXTCAL_ACTION_NOTCOME', "Not coming");
define('_MD_EXTCAL_ADD_ME', 'Add Me');
define('_MD_EXTCAL_ADDRESS', 'Address');
-define('_MD_EXTCAL_ALPHA', 'Alphabetically' );
+define('_MD_EXTCAL_ALPHA', 'Alphabetical' );
define('_MD_EXTCAL_AND', 'And');
define('_MD_EXTCAL_APR', 'Apr');
define('_MD_EXTCAL_AUG', 'Aug');
@@ -55,7 +55,7 @@
define('_MD_EXTCAL_DAY_NUM_MONTH', '(Day number on month)');
define('_MD_EXTCAL_DAYS', 'day(s)');
define('_MD_EXTCAL_DEC', 'Dec');
-define('_MD_EXTCAL_DEL_IMG', 'Delete the \ image');
+define('_MD_EXTCAL_DEL_IMG', 'Delete the image');
define('_MD_EXTCAL_DESCRIPTION', 'Description');
define('_MD_EXTCAL_DEVISE1', "£");
define('_MD_EXTCAL_DEVISE2', "US$");
@@ -122,7 +122,7 @@
define('_MD_EXTCAL_LIB_COME', "Register");
define('_MD_EXTCAL_LIB_NONE', "None");
define('_MD_EXTCAL_LIB_NOTCOME', "Unsubscribe");
-define('_MD_EXTCAL_LOCALISATION', 'Localization');
+define('_MD_EXTCAL_LOCALISATION', 'Location');
define('_MD_EXTCAL_MAR', 'Mar');
define('_MD_EXTCAL_MAX_MEMBER_REACHED', 'Maximum # of participants for this event reached');
define('_MD_EXTCAL_MAY', 'May');
@@ -147,7 +147,7 @@
define('_MD_EXTCAL_NAV_YEAR', 'Year');
define('_MD_EXTCAL_NBMEMBER', 'Member limit');
define('_MD_EXTCAL_NBMEMBER_DESC', '0 = no limit');
-define('_MD_EXTCAL_NO_RECCUR_EVENT', 'Not reoccurring event');
+define('_MD_EXTCAL_NO_RECCUR_EVENT', 'Not recurring event');
define('_MD_EXTCAL_NONE', 'None');
define('_MD_EXTCAL_NOV', 'Nov');
define('_MD_EXTCAL_OCT', 'Oct');
@@ -165,7 +165,7 @@
define('_MD_EXTCAL_PREVIEW', 'Preview');
define('_MD_EXTCAL_PRICE', 'Price');
define('_MD_EXTCAL_RECCUR_POLICY', 'Recurrence policy');
-define('_MD_EXTCAL_RECCUR_RULE', 'Reoccurring rule');
+define('_MD_EXTCAL_RECCUR_RULE', 'Recurring rule');
define('_MD_EXTCAL_REMOVE_ME', 'Remove Me');
define('_MD_EXTCAL_RR_DAILY', 'Each day during %u days');
define('_MD_EXTCAL_RR_MONTHLY', 'Each month, the %s during %u month');
@@ -187,7 +187,7 @@
define('_MD_EXTCAL_SU2', 'Su');
define('_MD_EXTCAL_SUBJECT_0', "Maximum participation reached");
define('_MD_EXTCAL_SUBJECT_1', "Notification of participation");
-define('_MD_EXTCAL_SUBJECT_2', "Cancellation of presence notification");
+define('_MD_EXTCAL_SUBJECT_2', "Cancellation of participation");
define('_MD_EXTCAL_SUBJECT_3', "Notification of absence");
define('_MD_EXTCAL_SUBJECT_4', "Cancellation of the notification of absence");
define('_MD_EXTCAL_SUBJECT_COME', "Registration ");
@@ -195,8 +195,8 @@
define('_MD_EXTCAL_SUBJECT_DESINSCRIPTION', "Unregister ");
define('_MD_EXTCAL_SUBJECT_INSCRIPTION', "Registration ");
define('_MD_EXTCAL_SUBJECT_MESSAGE', "Message ");
-define('_MD_EXTCAL_SUBJECT_NONE', "Unregistration ");
-define('_MD_EXTCAL_SUBJECT_NOTCOME', "Absence de ");
+define('_MD_EXTCAL_SUBJECT_NONE', "Cancellation ");
+define('_MD_EXTCAL_SUBJECT_NOTCOME', "Absence notification");
define('_MD_EXTCAL_SUBMIT_EVENT', 'Submit event');
define('_MD_EXTCAL_SUBMITED_EVENT', 'Submitted event');
define('_MD_EXTCAL_TH2', 'Th');
@@ -225,6 +225,4 @@
define('_MD_EXTCAL_DAY_FRIDAY', 'Friday');
define('_MD_EXTCAL_DAY_SATURDAY', 'Saturday');
define('_MD_EXTCAL_DAY_SUNDAY', 'Sunday');
-define('_MD_EXTCAL_ICONE', 'Icon');
-
-?>
+define('_MD_EXTCAL_ICONE', 'Icon');
\ No newline at end of file
Modified: XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/language/english/modinfo.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/language/english/modinfo.php 2012-02-13 15:09:34 UTC (rev 8955)
+++ XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/language/english/modinfo.php 2012-02-13 16:43:44 UTC (rev 8956)
@@ -3,7 +3,7 @@
define('_MI_EXTCAL_ABOUT', 'About');
-define('_MI_EXTCAL_AFTER', 'After');//Dessous
+define('_MI_EXTCAL_AFTER', 'After');
define('_MI_EXTCAL_AGENDA_END_HOUR', "Agenda: Last hour");
define('_MI_EXTCAL_AGENDA_END_HOUR_DESC', "The last hour to display in the Agenda. The next events are grouped on the last row.");
define('_MI_EXTCAL_AGENDA_NB_DAYS_DAY', "Agenda Days: Number of days");
@@ -15,7 +15,7 @@
define('_MI_EXTCAL_AGENDA_START_HOUR', "Agenda: Starting Hour");
define('_MI_EXTCAL_AGENDA_START_HOUR_DESC', "The first hour to display in the Agenda. The previous events are grouped on the first line '00:00'");
define('_MI_EXTCAL_ASCENDING', 'Ascending');
-define('_MI_EXTCAL_BEFORE', 'Before');//Au dessus
+define('_MI_EXTCAL_BEFORE', 'Before');
define('_MI_EXTCAL_BNAME1', 'Minical');
define('_MI_EXTCAL_BNAME1_DESC', 'Mini calendar block');
define('_MI_EXTCAL_BNAME2', 'Spotlight event');
@@ -42,20 +42,20 @@
define('_MI_EXTCAL_DISP_PAST_E_LIST_DESC', '');
define('_MI_EXTCAL_EB_DATE_PATTERN', 'Event: Block date pattern');
define('_MI_EXTCAL_EB_DATE_PATTERN_DESC', 'See the Date format on http://www.php.net/manual/en/function.date.php');
-define('_MI_EXTCAL_EB_DATE_PATTERN_VALUE', 'j/m/Y');
+define('_MI_EXTCAL_EB_DATE_PATTERN_VALUE', _SHORTDATESTRING);
define('_MI_EXTCAL_ED_DATE_PATTERN', 'Event: Day view date pattern');
define('_MI_EXTCAL_ED_DATE_PATTERN_DESC', 'See the Date format on http://www.php.net/manual/en/function.date.php');
-define('_MI_EXTCAL_ED_DATE_PATTERN_VALUE', 'j/m/Y');
+define('_MI_EXTCAL_ED_DATE_PATTERN_VALUE', _SHORTDATESTRING);
define('_MI_EXTCAL_EE_DATE_PATTERN', 'Event: Event view date pattern');
define('_MI_EXTCAL_EE_DATE_PATTERN_DESC', 'See the Date format on http://www.php.net/manual/en/function.date.php');
define('_MI_EXTCAL_EE_DATE_PATTERN_VALUE', 'l dS \of F Y h:i:s A');
define('_MI_EXTCAL_EM_DATE_PATTERN', 'Event : Month view date pattern');
define('_MI_EXTCAL_EM_DATE_PATTERN_DESC', 'See the Date format on http://www.php.net/manual/en/function.date.php');
-define('_MI_EXTCAL_EM_DATE_PATTERN_VALUE', 'j/m/Y');
-define('_MI_EXTCAL_EMAIL_MODE', 'Sending email');
-define('_MI_EXTCAL_EMAIL_MODE_HTML', 'Emails as HTML');
-define('_MI_EXTCAL_EMAIL_MODE_NONE', 'Pas de mails');
-define('_MI_EXTCAL_EMAIL_MODE_TEXT', 'Emails as text');
+define('_MI_EXTCAL_EM_DATE_PATTERN_VALUE', _SHORTDATESTRING);
+define('_MI_EXTCAL_EMAIL_MODE', 'Email Format');
+define('_MI_EXTCAL_EMAIL_MODE_HTML', 'HTML Format');
+define('_MI_EXTCAL_EMAIL_MODE_NONE', 'No email');
+define('_MI_EXTCAL_EMAIL_MODE_TEXT', 'Plain text');
define('_MI_EXTCAL_ETABLISSEMENT', "Location");
define('_MI_EXTCAL_ETABLISSEMENTS', "Locations");
define('_MI_EXTCAL_EVENT', 'Event');
@@ -63,10 +63,10 @@
define('_MI_EXTCAL_EVENT_NOTIFYDSC', 'Event notification');
define('_MI_EXTCAL_EW_DATE_PATTERN', 'Event : Week view date pattern');
define('_MI_EXTCAL_EW_DATE_PATTERN_DESC', 'See the Date format on http://www.php.net/manual/en/function.date.php');
-define('_MI_EXTCAL_EW_DATE_PATTERN_VALUE', 'j/m/Y');
+define('_MI_EXTCAL_EW_DATE_PATTERN_VALUE', _SHORTDATESTRING);
define('_MI_EXTCAL_EY_DATE_PATTERN', 'Event : Year view date pattern');
define('_MI_EXTCAL_EY_DATE_PATTERN_DESC', 'See the Date format on http://www.php.net/manual/en/function.date.php');
-define('_MI_EXTCAL_EY_DATE_PATTERN_VALUE', 'j/m/Y');
+define('_MI_EXTCAL_EY_DATE_PATTERN_VALUE', _SHORTDATESTRING);
define('_MI_EXTCAL_FILE_EXTENTION', 'Allowed file type');
define('_MI_EXTCAL_FILE_EXTENTION_DESC', 'Select file type who will be allowed to be attached to an event');
define('_MI_EXTCAL_GLOBAL_NOTIFY', 'Global notification');
@@ -75,8 +75,8 @@
define('_MI_EXTCAL_HTML', 'Allow HTML');
define('_MI_EXTCAL_HTML_DESC', 'Allow HTML or not for text field');
define('_MI_EXTCAL_INDEX', 'Home');
-define('_MI_EXTCAL_LIST_POS', 'Selections');
-define('_MI_EXTCAL_LIST_POS_DESC', 'Position of selection lists.<br>0 = above the tabs.<br>1 = below the tabs');
+define('_MI_EXTCAL_LIST_POS', 'Selection list');
+define('_MI_EXTCAL_LIST_POS_DESC', 'Selection lists position.<br>0 = above the tabs.<br>1 = below the tabs');
define('_MI_EXTCAL_NAME', 'eXtCal');
define('_MI_EXTCAL_NAV_AGENDA_DAY', 'Day (Agenda)');
define('_MI_EXTCAL_NAV_AGENDA_WEEK', 'Week (Agenda)');
@@ -109,11 +109,11 @@
define('_MI_EXTCAL_NEW_EVENT_PENDING_NOTIFYCAP', 'Notify me when a new event is posted without approve');
define('_MI_EXTCAL_NEW_EVENT_PENDING_NOTIFYDSC', 'Receive notification when a new event is submitted without approve');
define('_MI_EXTCAL_NEW_EVENT_PENDING_NOTIFYSBJ', "[{X_SITENAME}] {X_MODULE} auto-notify : New event submitted without approve");
-define('_MI_EXTCAL_NM_DATE_PATTERN', 'Navigation: Month view date patern');
+define('_MI_EXTCAL_NM_DATE_PATTERN', 'Navigation: Month view date pattern');
define('_MI_EXTCAL_NM_DATE_PATTERN_DESC', 'See the Date format on http://www.php.net/manual/en/function.date.php');
define('_MI_EXTCAL_NM_DATE_PATTERN_VALUE', 'F Y');
define('_MI_EXTCAL_NOTIFICATIONS', 'Notifications');
-define('_MI_EXTCAL_NW_DATE_PATTERN', 'Navigation: Week view date patern');
+define('_MI_EXTCAL_NW_DATE_PATTERN', 'Navigation: Week view date pattern');
define('_MI_EXTCAL_NW_DATE_PATTERN_DESC', 'See the Date format on http://www.php.net/manual/en/function.date.php');
define('_MI_EXTCAL_NW_DATE_PATTERN_VALUE', 'j F Y');
define('_MI_EXTCAL_OFFSET_MINICAL', 'Month of minical');
@@ -127,7 +127,7 @@
define('_MI_EXTCAL_RSS_NB_EVENT', 'RSS Number event');
define('_MI_EXTCAL_RSS_NB_EVENT_DESC', 'Number of event displayed on RSS pages');
define('_MI_EXTCAL_SHOW_ID', "Show ID");
-define('_MI_EXTCAL_SHOW_ID_DESC', "Yes: show the id in tooltips and the toolstiptext<br />No: Do not show the ID");
+define('_MI_EXTCAL_SHOW_ID_DESC', "Yes: show the ID in tooltips and the toolstip text<br />No: Do not show the ID");
define('_MI_EXTCAL_SHOW_INFOBULLE', "Tooltips");
define('_MI_EXTCAL_SHOW_INFOBULLE_DESC', "yes : In the views 'agenda-day' and 'agenda-week' display a tooltip with more informations<br />no : Display the text of the 'title' attribut");
define('_MI_EXTCAL_SORT_ORDER', 'Event Order');
@@ -144,8 +144,8 @@
define('_MI_EXTCAL_WEEK_START_DAY_DESC', 'Day to start the week in Calendar view');
define('_MI_EXTCAL_WHOS_GOING', "Enable Who's going");
define('_MI_EXTCAL_WHOS_GOING_DESC', "Enable or not the Who's going feature");
-define('_MI_EXTCAL_WHOSNOT_GOING', "Enable Who's not going");
-define('_MI_EXTCAL_WHOSNOT_GOING_DESC', "Enable or not the who's not going feature");
+define('_MI_EXTCAL_WHOSNOT_GOING', "Enable \'Who's not going\' feature");
+define('_MI_EXTCAL_WHOSNOT_GOING_DESC', "Enable or not the \'Who's not going\' feature");
define('_MI_EXTCAL_DAY_MONDAY', 'Monday');
define('_MI_EXTCAL_DAY_TUESDAY', 'Tuesday');
@@ -153,6 +153,4 @@
define('_MI_EXTCAL_DAY_THURSDAY', 'Thursday');
define('_MI_EXTCAL_DAY_FRIDAY', 'Friday');
define('_MI_EXTCAL_DAY_SATURDAY', 'Saturday');
-define('_MI_EXTCAL_DAY_SUNDAY', 'Sunday');
-
-?>
+define('_MI_EXTCAL_DAY_SUNDAY', 'Sunday');
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-02-13 15:09:40
|
Revision: 8955
http://xoops.svn.sourceforge.net/xoops/?rev=8955&view=rev
Author: beckmi
Date: 2012-02-13 15:09:34 +0000 (Mon, 13 Feb 2012)
Log Message:
-----------
adjusting folder structure
Removed Paths:
-------------
XoopsModules/extcal/branches/jjdai/extcal/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-02-13 15:05:22
|
Revision: 8954
http://xoops.svn.sourceforge.net/xoops/?rev=8954&view=rev
Author: beckmi
Date: 2012-02-13 15:05:11 +0000 (Mon, 13 Feb 2012)
Log Message:
-----------
adjusting folder structure
Added Paths:
-----------
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-02-13 14:57:00
|
Revision: 8953
http://xoops.svn.sourceforge.net/xoops/?rev=8953&view=rev
Author: beckmi
Date: 2012-02-13 14:56:52 +0000 (Mon, 13 Feb 2012)
Log Message:
-----------
adding Spin form
Modified Paths:
--------------
XoopsModules/extcal/branches/jjdai/extcal/templates/admin/extcal_admin_cat_list.html
Added Paths:
-----------
XoopsModules/extcal/branches/jjdai/htdocs/
XoopsModules/extcal/branches/jjdai/htdocs/class/
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/formspin.php
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/bleu/
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/bleu/index.html
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/bleu/spinDown0.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/bleu/spinDown1.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/bleu/spinMax0.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/bleu/spinMax1.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/bleu/spinMin0.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/bleu/spinMin1.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/bleu/spinUp0.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/bleu/spinUp1.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/default/
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/default/index.html
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/default/spinDown0.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/default/spinDown1.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/default/spinMax0.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/default/spinMax1.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/default/spinMin0.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/default/spinMin1.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/default/spinUp0.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/default/spinUp1.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond/
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond/index.html
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond/spinDown0.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond/spinDown1.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond/spinMax0.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond/spinMax1.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond/spinMin0.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond/spinMin1.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond/spinUp0.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond/spinUp1.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond2/
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond2/index.html
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond2/spinDown0.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond2/spinDown1.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond2/spinMax0.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond2/spinMax1.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond2/spinMin0.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond2/spinMin1.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond2/spinUp0.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond2/spinUp1.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/index.html
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point/
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point/index.html
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point/spinDown0.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point/spinDown1.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point/spinMax0.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point/spinMax1.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point/spinMin0.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point/spinMin1.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point/spinUp0.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point/spinUp1.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point2/
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point2/index.html
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point2/spinDown0.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point2/spinDown1.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point2/spinMax0.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point2/spinMax1.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point2/spinMin0.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point2/spinMin1.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point2/spinUp0.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point2/spinUp1.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point3/
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point3/index.html
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point3/spinDown0.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point3/spinDown1.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point3/spinMax0.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point3/spinMax1.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point3/spinMin0.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point3/spinMin1.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point3/spinUp0.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point3/spinUp1.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/vert/
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/vert/index.html
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/vert/spinDown0.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/vert/spinDown1.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/vert/spinMax0.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/vert/spinMax1.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/vert/spinMin0.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/vert/spinMin1.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/vert/spinUp0.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/vert/spinUp1.gif
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/index.html
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/js/
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/js/index.html
XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/js/spin.js
XoopsModules/extcal/branches/jjdai/htdocs/modules/
Modified: XoopsModules/extcal/branches/jjdai/extcal/templates/admin/extcal_admin_cat_list.html
===================================================================
--- XoopsModules/extcal/branches/jjdai/extcal/templates/admin/extcal_admin_cat_list.html 2012-02-13 10:35:11 UTC (rev 8952)
+++ XoopsModules/extcal/branches/jjdai/extcal/templates/admin/extcal_admin_cat_list.html 2012-02-13 14:56:52 UTC (rev 8953)
@@ -35,7 +35,7 @@
<{$cat.cat_name}>
</a>
</td>
- <td align='right'>
+ <td align='center'>
<{$cat.cat_weight}>
</td>
@@ -44,7 +44,7 @@
<img src="<{$smarty.const._EXTCAL_PATH_ICONS16}>edit.png" alt="">
</a>
- <a class="tooltip" class="tooltip" href="<{$smarty.const._EXTCAL_PATH_BO}>cat.php?op=delete&cat_id=<{$cat.cat_id}>" title="<{$smarty.const._AM_WAL_DELETE_WALL}>">
+ <a class="tooltip" class="tooltip" href="<{$smarty.const._EXTCAL_PATH_BO}>cat.php?op=delete&cat_id=<{$cat.cat_id}>" title="<{$smarty.const._DELETE}>">
<img src="<{$smarty.const._EXTCAL_PATH_ICONS16}>delete.png" alt="">
</a>
</td>
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/formspin.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/formspin.php (rev 0)
+++ XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/formspin.php 2012-02-13 14:56:52 UTC (rev 8953)
@@ -0,0 +1,512 @@
+<?php
+/**
+ * XoopsFormSpin element - Spin bytton
+ *
+ * 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 kernel
+ * @subpackage form
+ * @since 2.0.0
+ * @author Jean-Jacques DELALANDRE <JJ...@ki...>
+ * @version XoopsFormSpin v 1.2
+ */
+
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
+xoops_load('XoopsFormElement');
+
+/**
+ * A select field
+ *
+ * @author Jean-Jacques DELALANDRE <jj...@ki...>
+ * @copyright JJD http:xoops.kiolo.com
+ * @access public
+ */
+
+
+/*----------------------------------------------------------*/
+/* set here the folder of the clas relative at the root */
+/*----------------------------------------------------------*/
+define('_SPIN_FOLDER','/class/xoopsform/spin/');
+/*----------------------------------------------------------*/
+
+class XoopsFormSpin extends XoopsFormElement
+{
+
+ /**
+ * Value
+ *
+ * @var integer
+ * @access private
+ */
+ var $_value = 0;
+
+ /**
+ * Value minimum
+ *
+ * @var integer
+ * @access private
+ */
+ var $_min = 0;
+
+ /**
+ * Value maximum
+ *
+ * @var integer
+ * @access private
+ */
+ var $_max = 100;
+
+ /**
+ * Small increment
+ *
+ * @var integer
+ * @access private
+ */
+ var $_smallIncrement = 1;
+
+ /**
+ * Large increment
+ *
+ * @var integer
+ * @access private
+ */
+ var $_largeIncrement = 10;
+
+ /**
+ * unite for information on value
+ *
+ * @var string
+ * @access private
+ */
+ var $_unite = '';
+
+ /**
+ * Folder of arrow image
+ *
+ * @var string
+ * @access private
+ */
+ var $_imgFolder = 'default';
+
+ /**
+ * size of input text in nb car
+ *
+ * @var integer
+ * @access private
+ */
+ var $_size = 2;
+
+ /**
+ * minMaxVisible show buttons to go minimum and maximum
+ *
+ * @var integer
+ * @access private
+ */
+ var $_minMaxVisible= true;
+
+ /**
+ * tyleBordure ; style CSS of frame control
+ *
+ * @var string
+ * @access private
+ */
+ var $_styleBordure = "color: #FFFFFF; background-color: #CCCCCC; line-height: 100%;border-width:1px; border-style: solid; border-color: #000000; margin-top: 0; margin-bottom: 0; padding: 0";
+
+ /**
+ * tyleText : style CSS of input text
+ *
+ * @var string
+ * @access private
+ */
+ var $_styleText = "color: #000000; text-align: right; margin-left: 1; margin-right: 2; padding-right: 8";
+
+
+ /**
+ * Allow loading of javascript
+ *
+ * @var bool
+ * @access private
+ */
+ var $_loadJS = true;
+
+ /*---------------------------------------------------------------*/
+ /**
+ * Constructor
+ *
+ * @param string $caption Caption
+ * @param string $name "name" attribute
+ * @param int $value Pre-selected value.
+ * @param int $min value
+ * @param int $max value
+ * @param int $smallIncrement Increment when click on button
+ * @param int $largeIncrement Increment when click on button
+ * @param int $size Number caractere of inputtext
+ * @param string $unite of the value
+ * @param string $imgFolder of image gif for button
+ * @param string $styleText style CSs of text
+ * @param string $styleBordure style CSs of frame
+ * @param bool $minMaxVisible show min and mas buttons
+ *
+ */
+ function XoopsFormSpin($caption, $name, $value = 0,
+ $min = 0, $max=100,
+ $smallIncrement = 1, $largeIncrement = 10,
+ $size = 5, $unite='', $imgFolder='default',
+ $styleText = '', $styleBordure = '',
+ $minMaxVisible = true)
+ {
+ $this->setName($name);
+ $this->setCaption($caption);
+ $this->setValue($value);
+ $this->setMin($min);
+ $this->setMax($max);
+ $this->setSmallIncrement($smallIncrement);
+ $this->setLargeIncrement($largeIncrement);
+ $this->setSize($size);
+ $this->setUnite($unite);
+ $this->setImgFolder($imgFolder);
+ $this->setStyleText($styleText);
+ $this->setStyleBordure($styleBordure);
+ $this->setMinMaxVisible($minMaxVisible);
+ }
+
+ /*-----------------------------------------------------------------*/
+ /**
+ * Get the values
+ */
+ function getValue()
+ {
+ return $this->_value;
+ }
+
+ /**
+ * Set the value
+ *
+ * @param $value int
+ */
+ function setValue($value)
+ {
+ $this->_value = $value;
+ }
+
+
+ /*-----------------------------------------------------------------*/
+ /**
+ * Get the min value
+ */
+ function getMin()
+ {
+ return $this->_min;
+ }
+
+ /**
+ * Set the min value
+ *
+ * @param $min int
+ */
+ function setMin($min)
+ {
+ $this->_min = intval($min);
+ }
+ /*-----------------------------------------------------------------*/
+ /**
+ * Get the max value - must be more great then min
+ */
+ function getMax()
+ {
+ return $this->_max;
+ }
+
+ /**
+ * Set the max value - must be more great then min
+ *
+ * @param $max int
+ */
+ function setMax($max)
+ {
+ $this->_max = intval($max);
+ }
+
+ /*-----------------------------------------------------------------*/
+ /**
+ * Get the small increment when click a short time on up down nutton
+ */
+ function getSmallIncrement()
+ {
+ return $this->_smallIncrement;
+ }
+
+ /**
+ * Set the small increment when click a short time on up down nutton
+ * must be " > 0 "
+ *
+ * @param $value int
+ */
+ function setSmallIncrement($smallIncrement)
+ {
+ $this->_smallIncrement = intval($smallIncrement);
+ if ($this->_smallIncrement == 0) $this->_smallIncrement =1;
+ }
+
+ /*-----------------------------------------------------------------*/
+ /**
+ * Get the large increment when click a long time on up down nutton
+ */
+ function getLargeIncrement()
+ {
+ return $this->_largeIncrement;
+ }
+
+ /**
+ * Set the large increment when click a long time on up down nutton
+ *
+ * @param $largeIncrement int
+ */
+ function setLargeIncrement($largeIncrement)
+ {
+ $this->_largeIncrement = intval($largeIncrement);
+ if ($this->_largeIncrement == 0) $this->_largeIncrement = 10;
+ }
+
+ /*-----------------------------------------------------------------*/
+ /**
+ * Get the size in nb car of the input text for the value
+ */
+ function getSize()
+ {
+ return $this->_size;
+ }
+
+ /**
+ * Set the size in nb car of the input text for the value
+ * must be 2 car min
+ *
+ * @param $size mixed
+ */
+ function setSize($size)
+ {
+ $this->_size = $size;
+ if ($this->_size == 0) $this->_size = 2;
+ }
+ /*-----------------------------------------------------------------*/
+ function getImgFolder()
+ /**
+ * Get the shortname of the folder images
+ */
+ {
+ return $this->_imgFolder;
+ }
+
+ /**
+ * Set the shortname of the folder images
+ *
+ * @param $folder string
+ */
+ function setImgFolder($folder)
+ {
+ if ($folder <> '' ) $this->_imgFolder = $folder;
+ }
+ /*-----------------------------------------------------------------*/
+ /**
+ * Get the label of unites between value and buttons
+ */
+ function getUnite()
+ {
+ return $this->_unite;
+ }
+
+ /**
+ * Set the label of unites between value and buttons
+ *
+ * @param $unite string
+ */
+ function setUnite($unite)
+ {
+ $this->_unite = $unite;
+ }
+ /*-----------------------------------------------------------------*/
+ /**
+ * Get the style CSS of the text
+ */
+ function getStyleText()
+ {
+ return $this->_styleText;
+ }
+
+ /**
+ * Set the style CSS of the text
+ *
+ * @param $style string
+ */
+ function setStyleText($style)
+ {
+ if ($style <> '') $this->_styleText = $style;
+ }
+ /*-----------------------------------------------------------------*/
+ /**
+ * Get the style CSS of the frame
+ */
+ function getStyleBordure()
+ {
+ return $this->_styleBordure;
+ }
+
+ /**
+ * Set the style CSS of the frame
+ *
+ * @param $style string
+ */
+ function setStyleBordure($style)
+ {
+ if ($style <> '') $this->_styleBordure = $style;
+ }
+ /*-----------------------------------------------------------------*/
+ /**
+ * Get MinMaxVisible : show the button to go min and max value
+ */
+ function getMinMaxVisible()
+ {
+ return $this->_minMaxVisible;
+ }
+
+ /**
+ * Set MinMaxVisible : show the button to go min and max value
+ *
+ * @param $visible bool
+ */
+ function setMinMaxVisible($visible)
+ {
+ $this->_minMaxVisible = $visible;
+ }
+ /**********************************************************************/
+
+ /**
+ * Prepare HTML for output
+ *
+ * @return string HTML
+ */
+ function render()
+ {
+ $sSpinFolder = $this->getFolder();
+ $sFolderImg = "{$sSpinFolder}/images/{$this->getImgFolder()}/";
+
+
+ $prefixe = $this->getName();
+ $prefixe2 = 'spin'.$prefixe;
+
+ $smallIncrement = $this->getSmallIncrement();
+ $largeIncrement = $this->getLargeIncrement();
+
+ /*----------------------------------------------*/
+ $delai = 200;
+ $onMouseDown1 = "spinStart(\"{$prefixe}\", \"{$prefixe2}\", {$smallIncrement}, {$largeIncrement}, {$delai}, \"{$sFolderImg}spinUp1.gif\");";
+ $onMouseDown2 = "spinStart(\"{$prefixe}\", \"{$prefixe2}\", -{$smallIncrement}, -{$largeIncrement}, {$delai}, \"{$sFolderImg}spinDown1.gif\");";
+
+ $onMouseUp = "spinStop();";
+ //----------------------------------------------------------------
+ $styleBordure = $this->htmlAddAttribut ('style', $this->getStyleBordure());
+ $styleText = $this->htmlAddAttribut ('style', $this->getStyleText());
+ $styleArrow = "style=\"display: table-cell;vertical-align: middle; text-align: center; line-height: 100%; font-size: 7 pt; margin-top: 0; margin-bottom: 0; padding: 0\"";
+ //----------------------------------------------------------------
+ $t = array();
+
+
+ if ($this->_loadJS) {
+ $js = $sSpinFolder . "/js/spin.js";
+ $t[] = "<script src='{$js}' type='text/javascript'></script>";
+ }
+
+ $t[] = "<div STYLE='width:50px'>";
+ //$t[] = "<table border='0' width='8%' cellpadding='0' cellspacing='0'>";
+ $t[] = "<table border='0' width='8%' cellpadding='0' cellspacing='0' {$styleBordure}>";
+ $t[] = " <tr>";
+ //$t[] = " <td width='60%'>{$Caption}</td>";
+ $t[] = " <td width='60%'>";
+ $t[] = " <INPUT TYPE='hidden' NAME='{$prefixe2}_min' VALUE='{$this->getMin()}'>";
+ $t[] = " <INPUT TYPE='hidden' NAME='{$prefixe2}_max' VALUE='{$this->getMax()}'>";
+ $t[] = " <INPUT TYPE='hidden' NAME='{$prefixe2}_smallIncrement' VALUE='{$this->_smallIncrement}' style='text-align: right'>";
+ $t[] = " <input type='text' name='{$prefixe}' size='{$this->GetSize()}' value='{$this->getValue()}' {$styleText}>";
+ $t[] = " </td>";
+
+ $unite = $this->getUnite();
+ if ($unite <> ''){
+ $t[] = " <td style='display: table-cell;vertical-align: middle; '> {$unite} </td>";
+ }
+ //-------------------------------------------------------
+ if ($this->getMinMaxVisible()){
+ $onMouseDownMin = "spinSetValue(\"{$prefixe}\", \"{$prefixe2}\", \"Min\", {$this->getMin()}, {$delai}, \"{$sFolderImg}spinMin1.gif\");";
+ $t[] = " <td width='63%' align='center' {$styleArrow}>";
+ $t[] = " <img border='0' name='{$prefixe2}_imgMin' src='{$sFolderImg}spinMin0.gif' onmousedown='{$onMouseDownMin}'><br>";
+ $t[] = " </td>";
+ }
+ //-------------------------------------------------------
+ $t[] = " <td width='63%' align='center' {$styleArrow}>";
+
+ $t[] = " <img border='0' name='{$prefixe2}_img0' src='{$sFolderImg}spinUp0.gif' onmousedown='{$onMouseDown1}' onmouseup='{$onMouseUp}' onmouseout='{$onMouseUp}'><br>";
+ $t[] = " <img border='0' name='{$prefixe2}_img1' src='{$sFolderImg}spinDown0.gif' onmousedown='{$onMouseDown2}' onmouseup='{$onMouseUp}' onmouseout='{$onMouseUp}'>";
+
+ $t[] = " </td>";
+
+ //-------------------------------------------------------
+ if ($this->getMinMaxVisible()){
+ $onMouseDownMax = "spinSetValue(\"{$prefixe}\", \"{$prefixe2}\", \"Max\", {$this->getMax()}, {$delai}, \"{$sFolderImg}spinMax1.gif\");";
+ $t[] = " <td width='63%' align='center' {$styleArrow}>";
+ $t[] = " <img border='0' name='{$prefixe2}_imgMax' src='{$sFolderImg}spinMax0.gif' onmousedown='{$onMouseDownMax}'><br>";
+ $t[] = " </td>";
+ }
+ //-------------------------------------------------------
+
+
+ $t[] = " </tr>";
+ $t[] = "</table>"."\n";
+ $t[] = "</div>";
+ //-------------------------------------------
+ $html = implode ("\n", $t);
+ return $html;
+
+}
+
+/**************************************************************************
+ * calcul du dossier du composant
+ *************************************************************************/
+function getFolder (){
+
+ $sSpinFolder = XOOPS_URL . _SPIN_FOLDER;
+ return $sSpinFolder;
+}
+
+/********************************************************************
+ *
+*********************************************************************/
+function htmlAddAttribut($attribut, $value, $default = ''){
+
+ if ($value == ''){$value = $default;}
+
+ if ($value <> ""){
+ if (substr($value,0,strlen($attribut)) <> $attribut){
+ $r ="{$attribut}=\"{$value}\"";
+ }
+ }else{
+ $r = '';
+ }
+
+ return $r;
+
+}
+
+/*-----------------------------------------------*/
+/*--- fin de la classe ---*/
+/*-----------------------------------------------*/
+
+
+}
+
+?>
\ No newline at end of file
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/bleu/index.html
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/bleu/index.html (rev 0)
+++ XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/bleu/index.html 2012-02-13 14:56:52 UTC (rev 8953)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/bleu/spinDown0.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/bleu/spinDown0.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/bleu/spinDown1.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/bleu/spinDown1.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/bleu/spinMax0.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/bleu/spinMax0.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/bleu/spinMax1.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/bleu/spinMax1.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/bleu/spinMin0.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/bleu/spinMin0.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/bleu/spinMin1.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/bleu/spinMin1.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/bleu/spinUp0.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/bleu/spinUp0.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/bleu/spinUp1.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/bleu/spinUp1.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/default/index.html
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/default/index.html (rev 0)
+++ XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/default/index.html 2012-02-13 14:56:52 UTC (rev 8953)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/default/spinDown0.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/default/spinDown0.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/default/spinDown1.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/default/spinDown1.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/default/spinMax0.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/default/spinMax0.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/default/spinMax1.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/default/spinMax1.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/default/spinMin0.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/default/spinMin0.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/default/spinMin1.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/default/spinMin1.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/default/spinUp0.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/default/spinUp0.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/default/spinUp1.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/default/spinUp1.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond/index.html
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond/index.html (rev 0)
+++ XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond/index.html 2012-02-13 14:56:52 UTC (rev 8953)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond/spinDown0.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond/spinDown0.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond/spinDown1.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond/spinDown1.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond/spinMax0.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond/spinMax0.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond/spinMax1.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond/spinMax1.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond/spinMin0.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond/spinMin0.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond/spinMin1.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond/spinMin1.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond/spinUp0.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond/spinUp0.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond/spinUp1.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond/spinUp1.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond2/index.html
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond2/index.html (rev 0)
+++ XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond2/index.html 2012-02-13 14:56:52 UTC (rev 8953)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond2/spinDown0.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond2/spinDown0.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond2/spinDown1.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond2/spinDown1.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond2/spinMax0.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond2/spinMax0.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond2/spinMax1.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond2/spinMax1.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond2/spinMin0.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond2/spinMin0.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond2/spinMin1.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond2/spinMin1.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond2/spinUp0.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond2/spinUp0.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond2/spinUp1.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/demirond2/spinUp1.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/index.html
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/index.html (rev 0)
+++ XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/index.html 2012-02-13 14:56:52 UTC (rev 8953)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point/index.html
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point/index.html (rev 0)
+++ XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point/index.html 2012-02-13 14:56:52 UTC (rev 8953)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point/spinDown0.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point/spinDown0.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point/spinDown1.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point/spinDown1.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point/spinMax0.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point/spinMax0.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point/spinMax1.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point/spinMax1.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point/spinMin0.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point/spinMin0.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point/spinMin1.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point/spinMin1.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point/spinUp0.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point/spinUp0.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point/spinUp1.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point/spinUp1.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point2/index.html
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point2/index.html (rev 0)
+++ XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point2/index.html 2012-02-13 14:56:52 UTC (rev 8953)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point2/spinDown0.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point2/spinDown0.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point2/spinDown1.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point2/spinDown1.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point2/spinMax0.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point2/spinMax0.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point2/spinMax1.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point2/spinMax1.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point2/spinMin0.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point2/spinMin0.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point2/spinMin1.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point2/spinMin1.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point2/spinUp0.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point2/spinUp0.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point2/spinUp1.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point2/spinUp1.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point3/index.html
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point3/index.html (rev 0)
+++ XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point3/index.html 2012-02-13 14:56:52 UTC (rev 8953)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point3/spinDown0.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point3/spinDown0.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point3/spinDown1.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point3/spinDown1.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point3/spinMax0.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point3/spinMax0.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point3/spinMax1.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point3/spinMax1.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point3/spinMin0.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point3/spinMin0.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point3/spinMin1.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point3/spinMin1.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point3/spinUp0.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point3/spinUp0.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point3/spinUp1.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/point3/spinUp1.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/vert/index.html
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/vert/index.html (rev 0)
+++ XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/vert/index.html 2012-02-13 14:56:52 UTC (rev 8953)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/vert/spinDown0.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/vert/spinDown0.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/vert/spinDown1.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/vert/spinDown1.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/vert/spinMax0.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/vert/spinMax0.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/vert/spinMax1.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/vert/spinMax1.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/vert/spinMin0.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/vert/spinMin0.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/vert/spinMin1.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/vert/spinMin1.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/vert/spinUp0.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/vert/spinUp0.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/vert/spinUp1.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/images/vert/spinUp1.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/index.html
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/index.html (rev 0)
+++ XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/index.html 2012-02-13 14:56:52 UTC (rev 8953)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/js/index.html
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/js/index.html (rev 0)
+++ XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/js/index.html 2012-02-13 14:56:52 UTC (rev 8953)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/js/spin.js
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/js/spin.js (rev 0)
+++ XoopsModules/extcal/branches/jjdai/htdocs/class/xoopsform/spin/js/spin.js 2012-02-13 14:56:52 UTC (rev 8953)
@@ -0,0 +1,139 @@
+// ------------------------------------------------------------------------ //
+// JJD-SPIN - Composant spinButton //
+// Copyright (c) 2006 JJ Delalandre //
+// <http://xoops.kiolo.com> //
+// ------------------------------------------------------------------------ //
+/******************************************************************************
+
+
+Copyright (C) 2007 Jean-Jacques DELALANDRE
+Ce programme est libre, vous pouvez le redistribuer et/ou le modifier selon les termes de la Licence Publique G\xE9n\xE9rale GNU publi\xE9e par la Free Software Foundation (version 2 ou bien toute autre version ult\xE9rieure choisie par vous).
+
+Ce programme est distribu\xE9 car potentiellement utile, mais SANS AUCUNE GARANTIE, ni explicite ni implicite, y compris les garanties de commercialisation ou d'adaptation dans un but sp\xE9cifique. Reportez-vous \xE0 la Licence Publique G\xE9n\xE9rale GNU pour plus de d\xE9tails.
+
+Vous devez avoir re\xE7u une copie de la Licence Publique G\xE9n\xE9rale GNU en m\xEAme temps que ce programme ; si ce n'est pas le cas, \xE9crivez \xE0 la Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, +tats-Unis.
+
+Cr\xE9ation avril 2006
+Derni\xE8re modification : septembre 2007
+******************************************************************************/
+
+var spinIdTimer = 0;
+var spinPrefixe = "";
+var spinPrefixe2 = "";
+var spinSmallIncrement = 0;
+var spinLargeIncrement = 0;
+var spinIncrement = 0;
+var spinComteur = 0;
+var spinImg = "";
+var spinSens = 0;
+var spinImgName = "";
+
+
+/****************************************************************************
+ *
+ ***************************************************************************/
+function spinStart(prefixe, prefixe2, smallIncrement, largeIncrement, delai, newImg) {
+
+ spinPrefixe = prefixe;
+ spinPrefixe2 = prefixe2;
+ spinSmallIncrement = smallIncrement;
+ spinLargeIncrement = largeIncrement;
+ spinIncrement = spinSmallIncrement;
+ spinCompteur = 0;
+
+ spinDoIncrement( );
+ //alert ("onSpinStart" + "-" + prefixe + "-" + smallIncrement + "-" + largeIncrement);
+ if (spinIncrement > 0){
+ spinSens = 1;
+ i=0
+ }else{
+ spinSens = -1;
+ i=1
+ };
+
...
[truncated message content] |
|
From: <ma...@us...> - 2012-02-13 10:35:22
|
Revision: 8952
http://xoops.svn.sourceforge.net/xoops/?rev=8952&view=rev
Author: mageg
Date: 2012-02-13 10:35:11 +0000 (Mon, 13 Feb 2012)
Log Message:
-----------
fixed bug ID: 3432275
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pm/language/english/help/help.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/language/english/help/help.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/language/english/help/help.html
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pm/language/english/help/help.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pm/language/english/help/help.html 2012-02-13 10:34:09 UTC (rev 8951)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pm/language/english/help/help.html 2012-02-13 10:35:11 UTC (rev 8952)
@@ -1,39 +1,19 @@
<div id="help-template" class="outer">
- <h1 class="head">Help:
- <a class="ui-corner-all tooltip" href="<{$xoops_url}>/modules/pm/admin/index.php"
- title="Back to the administration of PM"> Private Messaging
- <img src="<{xoAdminIcons home.png}>"
- alt="Back to the Administration of >M"/>
- </a></h1>
- <!-- ===== Help Content ======= -->
-
- <h4 class="odd">Description</h4><br/>
-
- The PM module is for private messaging between users<br/><br/>
- <h4 class="odd">Install/uninstall</h4><br/>
-
- 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. <br/><br/>
- Detailed instructions on installing modules are available in the
- <a href="http://goo.gl/adT2i">XOOPS Operations
- Manual</a><br/><br/>
-
- <h4 class="odd">Operating instructions</h4><br/>
- To set up this module you need to:<br/><br/>
- i) 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 <br/><br/>
- ii) Configure your preferences for the module (see ‘Preferences’) and
- optionally the PM block if you intend to
- use it (see ‘Blocks’)<br/><br/>
- iii) You can do mass deleting of your messages by using the "Prune Messages"
- tab<br/><br/>
- <h4 class="odd">Tutorial</h4><br/>
-
-
- Tutorial coming soon.<br/>
-
- <!-- ===== Help Content ======= -->
-
+ <h1 class="head">Help: <a class="ui-corner-all tooltip" href="<{$xoops_url}>/modules/pm/admin/admin.php" title="Back to the administration of PM"> Private Messaging <img src="<{xoAdminIcons home.png}>" alt="Back to the administration of PM"/></a></h1>
+ <!-- -----Help Content ---------- -->
+ <h4 class="odd">Description</h4>
+ <p class="even">The PM module is for private messaging between users</p>
+ <h4 class="odd">Install/uninstall</h4>
+ <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>
+ <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>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>
+ <!-- -----Help Content ---------- -->
</div>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/language/english/help/help.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/language/english/help/help.html 2012-02-13 10:34:09 UTC (rev 8951)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/language/english/help/help.html 2012-02-13 10:35:11 UTC (rev 8952)
@@ -1,36 +1,21 @@
<div id="help-template" class="outer">
- <h1 class="head">Help:
- <a class="ui-corner-all tooltip" href="<{$xoops_url}>/modules/profile/admin/index.php"
- title="Back to the administration of User Profile"> Profile <img src="<{xoAdminIcons home.png}>"
- alt="Back to the Administration of Profile"/>
- </a></h1>
- <!-- ===== Help Content ======= -->
-
- <h4 class="odd">Description</h4><br/>
-
-
- The Profile module is for managing custom user profile fields.<br/><br/>
- <h4 class="odd">Install/uninstall</h4><br/>
-
- No special measures necessary, follow the standard installation process – extract the xoopspartners folder into the
- ../modules directory. Install the module through Admin -> System Module -> Modules. <br/><br/>
- Detailed instructions on installing modules are available in the <a href="http://goo.gl/adT2i">XOOPS Operations
- Manual</a><br/><br/>
-
-
- <h4 class="odd">Operating instructions</h4><br/>
- To set up this module you need to:<br/><br/>
- i) Configure your preferences for the module (see ‘Preferences’) and optionally the Partners block if you intend to
- use it (see ‘Blocks’)<br/><br/>
- ii) Edit existing Categories or add new ones.<br/><br/>
- iii) Edit existing Fields or add new ones. Here you can specify which fields will be visible in which category, and if they will be visible during user registration<br/><br/>
- iv) Define the order of Registration steps <br/><br/>
- v) And finally, you can set permissions for individual fields - which ones are editable, which ones are searchable<br/><br/>
- <h4 class="odd">Tutorial</h4><br/>
-
-
- A Tutorial is coming soon. <br/><br/>
-
- <!-- ===== Help Content ======= -->
-
+ <h1 class="head">Help: <a class="ui-corner-all tooltip" href="<{$xoops_url}>/modules/profile/admin/index.php" title="Back to the Administration of Profile"> Profile <img src="<{xoAdminIcons home.png}>" alt="Back to the Administration of Profile"/></a></h1>
+ <!-- -----Help Content ---------- -->
+ <h4 class="odd">Description</h4>
+ <p class="even">The Profile module is for managing custom user profile fields.</p>
+ <h4 class="odd">Install/uninstall</h4>
+ <p>No special measures necessary, follow the standard installation process – extract the /profile 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>
+ <p class="even">To set up this module you need to:</p>
+ <ul>
+ <li>Configure your preferences for the module (see ‘Preferences’) and optionally the Profile block if you intend to use it (see ‘Blocks’).</li>
+ <li>Edit existing Categories or add new ones.</li>
+ <li>Edit existing Fields or add new ones. Here you can specify which fields will be visible in which category, and if they will be visible during user registration.</li>
+ <li>Define the order of Registration steps.</li>
+ <li>And finally, you can set permissions for individual fields - which ones are editable, which ones are searchable.</li>
+ </ul>
+ <h4 class="odd">Tutorial</h4>
+ <p class="even">Tutorial coming soon.</p>
+ <!-- -----Help Content ---------- -->
</div>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/language/english/help/help.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/language/english/help/help.html 2012-02-13 10:34:09 UTC (rev 8951)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/language/english/help/help.html 2012-02-13 10:35:11 UTC (rev 8952)
@@ -1,78 +1,68 @@
<div id="help-template" class="outer">
- <h1 class="head">Help:
- <a class="ui-corner-all tooltip" href="<{$xoops_url}>/modules/protector/admin/index.php"
- title="Back to the administration of Protector"> Protector
- <img src="<{xoAdminIcons home.png}>"
- alt="Back to the Administration of Protector"/>
- </a></h1>
- <!-- ===== Help Content ======= -->
-
- <h4 class="odd">Description</h4><br/>
-
- Protector is a module to defend your XOOPS CMS from various malicious attacks.<br/><br/>
- <h4 class="odd">Install/uninstall</h4><br/>
-
- First, define XOOPS_TRUST_PATH into mainfile.php if you've never done it
- yet.<br/><br/>
-
- Copy html/modules/protector in the archive into your
- XOOPS_ROOT_PATH/modules/<br/>
- Copy xoops_trust_path/modules/protector in the archive into your
- XOOPS_TRUST_PATH/modules/<br/><br/>
-
- Turn permission of XOOPS_TRUST_PATH/modules/protector/configs writable<br/><br/>
-
- <h4 class="odd">= How to rescue =</h4><br/>
- <br/>If you've been banned from Protector, just delete files under
- XOOPS_TRUST_PATH/modules/protector/configs/<br/><br/>
-
- <h4 class="odd">Introduction for filter-plugins in this archive.</h4><br/>
- - postcommon_post_deny_by_rbl.php<br/>
- an anti-SPAM plugin.<br/>
- All of Post from IP registered in RBL will be rejected.<br/>
- This plugin can slow the performance of Post, especially chat
- modules.<br/><br/>
-
- - postcommon_post_deny_by_httpbl.php<br/>
- an anti-SPAM plugin.<br/>
- All of Post from IP registered in http:BL will be rejected.<br/>
- Before using it, get HTTPBL_KEY from http://www.projecthoneypot.org/ and set
- it into the filter file.<br/>
- define( 'PROTECTOR_HTTPBL_KEY' , '............' ) ;<br/><br/>
-
- - postcommon_post_need_multibyte.php<br/>
- an anti-SPAM plugin.<br/>
- Post without multi-byte characters will be rejected.<br/>
- This plugin is only for sites of japanese, tchinese, schinese, and
- korean.<br/><br/>
-
- -postcommon_post_htmlpurify4guest.php<br/>
- All post data sent by guests will be purified by HTMLPurifier.<br/>
- If you allow guests posting HTML, I strongly recommend you to enable
- it.<br/><br/>
-
- -postcommon_register_insert_js_check.php<br/>
- This plugin prevents your site from robot's user registering.<br/>
- Required JavaScript working on the vistors browser.<br/><br/>
-
- -bruteforce_overrun_message.php<br/>
- Specify a message for visitors tried wrong passwords more than the specified
- times.<br/>
- All plugins named *_message.php specifys the message for rejected
- accesses.<br/><br/>
-
- -precommon_bwlimit_errorlog.php<br/>
- When band width limitaion works unfortunately, this plugin logs it into
- Apache's error_log.<br/><br/>
- All plugins named *_errorlog.php log some informations into Apaches
- error_log.<br/>
-
-
- <h4 class="odd">Tutorial</h4><br/>
-
-
- Tutorials is coming soon<br/><br/>
-
- <!-- ===== Help Content ======= -->
-
+ <h1 class="head">Help: <a class="ui-corner-all tooltip" href="<{$xoops_url}>/modules/protector/admin/index.php" title="Back to the administration of Protector"> Protector <img src="<{xoAdminIcons home.png}>" alt="Back to the administration of Protector"/></a></h1>
+ <!-- -----Help Content ---------- -->
+ <h4 class="odd">Description</h4>
+ <p class="even">Protector is a module to defend your XOOPS CMS from various malicious attacks.</p>
+ <h4 class="odd">Install/uninstall</h4>
+ <p>First, define XOOPS_TRUST_PATH into mainfile.php if you've never done it yet.</p>
+ <br />
+ <p>Copy html/modules/protector in the archive into your XOOPS_ROOT_PATH/modules/</p>
+ <p>Copy xoops_trust_path/modules/protector in the archive into your XOOPS_TRUST_PATH/modules/</p>
+ <br />
+ <p>Turn permission of XOOPS_TRUST_PATH/modules/protector/configs writable</p>
+ <h4 class="odd">= How to rescue =</h4>
+ <p class="even">If you've been banned from Protector, just delete files under XOOPS_TRUST_PATH/modules/protector/configs/</p>
+ <h4 class="odd">Introduction for filter-plugins in this archive.</h4>
+ <p class="even">- postcommon_post_deny_by_rbl.php
+ <br />
+ an anti-SPAM plugin.
+ <br />
+ All of Post from IP registered in RBL will be rejected.
+ <br />
+ This plugin can slow the performance of Post, especially chat modules.
+ </p>
+ <p>- postcommon_post_deny_by_httpbl.php
+ <br />
+ an anti-SPAM plugin.
+ <br />
+ All of Post from IP registered in http:BL will be rejected.
+ <br />
+ Before using it, get HTTPBL_KEY from http://www.projecthoneypot.org/ and set it into the filter file.
+ <br />
+ define( 'PROTECTOR_HTTPBL_KEY' , '............' ) ;
+ </p>
+ <p class="even">- postcommon_post_need_multibyte.php
+ <br />
+ an anti-SPAM plugin.
+ <br />
+ Post without multi-byte characters will be rejected.
+ <br />
+ This plugin is only for sites of japanese, tchinese, schinese, and korean.
+ </p>
+ <p>- postcommon_post_htmlpurify4guest.php
+ <br />
+ All post data sent by guests will be purified by HTMLPurifier.
+ <br />
+ If you allow guests posting HTML, I strongly recommend you to enable it.
+ </p>
+ <p class="even">-postcommon_register_insert_js_check.php
+ <br />
+ This plugin prevents your site from robot's user registering.
+ <br />
+ Required JavaScript working on the vistors browser.
+ </p>
+ <p>- bruteforce_overrun_message.php
+ <br />
+ Specify a message for visitors tried wrong passwords more than the specified times.
+ <br />
+ All plugins named *_message.php specifys the message for rejected accesses.
+ </p>
+ <p class="even">- precommon_bwlimit_errorlog.php
+ <br />
+ When band width limitaion works unfortunately, this plugin logs it into Apache's error_log.
+ </p>
+ <p>All plugins named *_errorlog.php log some informations into Apaches error_log.</p>
+ <h4 class="odd">Tutorial</h4>
+ <p class="even">Tutorial coming soon.</p>
+ <!-- -----Help Content ---------- -->
</div>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-02-13 10:34:20
|
Revision: 8951
http://xoops.svn.sourceforge.net/xoops/?rev=8951&view=rev
Author: mageg
Date: 2012-02-13 10:34:09 +0000 (Mon, 13 Feb 2012)
Log Message:
-----------
Fixed bug ID: 3201929
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/install/sql/mysql.structure.sql
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/include/install.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/install/sql/mysql.structure.sql
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/install/sql/mysql.structure.sql 2012-02-13 10:33:32 UTC (rev 8950)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/install/sql/mysql.structure.sql 2012-02-13 10:34:09 UTC (rev 8951)
@@ -34,7 +34,7 @@
CREATE TABLE banner (
bid smallint(5) unsigned NOT NULL auto_increment,
cid tinyint(3) unsigned NOT NULL default '0',
- imptotal mediumint(8) unsigned NOT NULL default '0',
+ imptotal int(10) unsigned NOT NULL default '0',
impmade mediumint(8) unsigned NOT NULL default '0',
clicks mediumint(8) unsigned NOT NULL default '0',
imageurl varchar(255) NOT NULL default '',
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/include/install.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/include/install.php 2012-02-13 10:33:32 UTC (rev 8950)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/include/install.php 2012-02-13 10:34:09 UTC (rev 8951)
@@ -69,6 +69,11 @@
$xoops->db->queryF($sql);
$sql = "DELETE FROM " . $xoops->db->prefix("config") . " WHERE `conf_name` = 'my_ip'";
$xoops->db->queryF($sql);
+
+ // change 'imptotal'
+ $sql = "ALTER TABLE " . $xoops->db->prefix("banner") . " CHANGE `imptotal` `imptotal` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'";
+ $xoops->db->queryF($sql);
+
// move file
// Get banners handler
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-02-13 10:33:43
|
Revision: 8950
http://xoops.svn.sourceforge.net/xoops/?rev=8950&view=rev
Author: mageg
Date: 2012-02-13 10:33:32 +0000 (Mon, 13 Feb 2012)
Log Message:
-----------
i forgot something
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/protector/language/english/help/help.html
Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/protector/language/english/help/help.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/protector/language/english/help/help.html 2012-02-13 10:28:25 UTC (rev 8949)
+++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/protector/language/english/help/help.html 2012-02-13 10:33:32 UTC (rev 8950)
@@ -65,87 +65,4 @@
<h4 class="odd">Tutorial</h4>
<p class="even">Tutorial coming soon.</p>
<!-- -----Help Content ---------- -->
-</div>
-
-
-
-
-
-<div id="help-template" class="outer">
- <h1 class="head">Help:
- <a class="ui-corner-all tooltip" href="<{$xoops_url}>/modules/protector/admin/index.php"
- title="Back to the administration of Protector"> Protector
- <img src="<{xoAdminIcons home.png}>"
- alt="Back to the Administration of Protector"/>
- </a></h1>
- <!-- ===== Help Content ======= -->
-
- <h4 class="odd">Description</h4><br/>
-
- Protector is a module to defend your XOOPS CMS from various malicious attacks.<br/><br/>
- <h4 class="odd">Install/uninstall</h4><br/>
-
- First, define XOOPS_TRUST_PATH into mainfile.php if you've never done it
- yet.<br/><br/>
-
- Copy html/modules/protector in the archive into your
- XOOPS_ROOT_PATH/modules/<br/>
- Copy xoops_trust_path/modules/protector in the archive into your
- XOOPS_TRUST_PATH/modules/<br/><br/>
-
- Turn permission of XOOPS_TRUST_PATH/modules/protector/configs writable<br/><br/>
-
- <h4 class="odd">= How to rescue =</h4><br/>
- <br/>If you've been banned from Protector, just delete files under
- XOOPS_TRUST_PATH/modules/protector/configs/<br/><br/>
-
- <h4 class="odd">Introduction for filter-plugins in this archive.</h4><br/>
- - postcommon_post_deny_by_rbl.php<br/>
- an anti-SPAM plugin.<br/>
- All of Post from IP registered in RBL will be rejected.<br/>
- This plugin can slow the performance of Post, especially chat
- modules.<br/><br/>
-
- - postcommon_post_deny_by_httpbl.php<br/>
- an anti-SPAM plugin.<br/>
- All of Post from IP registered in http:BL will be rejected.<br/>
- Before using it, get HTTPBL_KEY from http://www.projecthoneypot.org/ and set
- it into the filter file.<br/>
- define( 'PROTECTOR_HTTPBL_KEY' , '............' ) ;<br/><br/>
-
- - postcommon_post_need_multibyte.php<br/>
- an anti-SPAM plugin.<br/>
- Post without multi-byte characters will be rejected.<br/>
- This plugin is only for sites of japanese, tchinese, schinese, and
- korean.<br/><br/>
-
- -postcommon_post_htmlpurify4guest.php<br/>
- All post data sent by guests will be purified by HTMLPurifier.<br/>
- If you allow guests posting HTML, I strongly recommend you to enable
- it.<br/><br/>
-
- -postcommon_register_insert_js_check.php<br/>
- This plugin prevents your site from robot's user registering.<br/>
- Required JavaScript working on the vistors browser.<br/><br/>
-
- -bruteforce_overrun_message.php<br/>
- Specify a message for visitors tried wrong passwords more than the specified
- times.<br/>
- All plugins named *_message.php specifys the message for rejected
- accesses.<br/><br/>
-
- -precommon_bwlimit_errorlog.php<br/>
- When band width limitaion works unfortunately, this plugin logs it into
- Apache's error_log.<br/><br/>
- All plugins named *_errorlog.php log some informations into Apaches
- error_log.<br/>
-
-
- <h4 class="odd">Tutorial</h4><br/>
-
-
- Tutorials is coming soon<br/><br/>
-
- <!-- ===== Help Content ======= -->
-
</div>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
8 messages has been excluded from this view by a project administrator.
