Menu
▾
▴
xoops-svn — All SVN commits will be posted to this ML
You can subscribe to this list here.
| 2012 |
Jan
|
Feb
(214) |
Mar
(139) |
Apr
(198) |
May
(187) |
Jun
(151) |
Jul
(210) |
Aug
(169) |
Sep
(58) |
Oct
(53) |
Nov
(54) |
Dec
(301) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2013 |
Jan
(348) |
Feb
(178) |
Mar
(219) |
Apr
(154) |
May
(117) |
Jun
(194) |
Jul
(61) |
Aug
(132) |
Sep
(121) |
Oct
(110) |
Nov
(11) |
Dec
(18) |
| 2014 |
Jan
(34) |
Feb
(50) |
Mar
(82) |
Apr
(98) |
May
(39) |
Jun
(111) |
Jul
(67) |
Aug
(36) |
Sep
(33) |
Oct
(26) |
Nov
(53) |
Dec
(44) |
| 2015 |
Jan
(29) |
Feb
(47) |
Mar
(25) |
Apr
(19) |
May
(23) |
Jun
(20) |
Jul
(49) |
Aug
(7) |
Sep
(10) |
Oct
(10) |
Nov
(4) |
Dec
(25) |
| 2016 |
Jan
(8) |
Feb
(7) |
Mar
(1) |
Apr
|
May
(3) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(7) |
Dec
(5) |
| 2017 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(15) |
Jun
|
Jul
(18) |
Aug
(24) |
Sep
|
Oct
(14) |
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
(22) |
Mar
|
Apr
(11) |
May
(1) |
Jun
(17) |
Jul
(2) |
Aug
(2) |
Sep
|
Oct
(6) |
Nov
(5) |
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
| 2025 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <be...@us...> - 2012-12-12 22:08:24
|
Revision: 10372
http://sourceforge.net/p/xoops/svn/10372
Author: beckmi
Date: 2012-12-12 22:08:20 +0000 (Wed, 12 Dec 2012)
Log Message:
-----------
updating phpThumb config
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt
XoopsCore/branches/2.5.x/2.5.6/htdocs/include/version.php
XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/class/thumbs/phpThumb.config.php
Modified: XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2012-12-12 21:06:40 UTC (rev 10371)
+++ XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2012-12-12 22:08:20 UTC (rev 10372)
@@ -1,7 +1,7 @@
XOOPS 2.5.x Changelog (Language changes: see: /docs/lang_diff.txt)
===============================
-2012/08/06: Version 2.5.6 Alpha
+2012/12/12: Version 2.5.6 Beta
===============================
Security fixes:
- XSS (Cross Site Scripting) vulnerability in Maintenance (Dingjie Yang,Qualys/trabis)
@@ -13,7 +13,6 @@
- TinyMCE to 3.5.8 (mamba)
- Smarty to 2.6.27 (mamba)
-
===============================
2012/04/15: Version 2.5.5 Final
===============================
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/include/version.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/include/version.php 2012-12-12 21:06:40 UTC (rev 10371)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/include/version.php 2012-12-12 22:08:20 UTC (rev 10372)
@@ -30,6 +30,6 @@
/**
* Define XOOPS version
*/
-define('XOOPS_VERSION', 'XOOPS 2.5.6 Alpha');
+define('XOOPS_VERSION', 'XOOPS 2.5.6 Beta');
?>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/class/thumbs/phpThumb.config.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/class/thumbs/phpThumb.config.php 2012-12-12 21:06:40 UTC (rev 10371)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/class/thumbs/phpThumb.config.php 2012-12-12 22:08:20 UTC (rev 10372)
@@ -78,8 +78,8 @@
//$PHPTHUMB_CONFIG['cache_default_only_suffix'] = '*_thumb'; // cache 'pic.jpg' becomes 'pic_thumb.jpg' (or 'pic_thumb.png' if PNG output is selected, etc)
//$PHPTHUMB_CONFIG['cache_default_only_suffix'] = 'small-*'; // cache 'pic.jpg' becomes 'small-pic.jpg' (or 'small-pic.png' if PNG output is selected, etc)
-$PHPTHUMB_CONFIG['cache_prefix'] = 'phpThumb_cache_'.str_replace('www.', '', @$_SERVER['SERVER_NAME']);
-//$PHPTHUMB_CONFIG['cache_prefix'] = 'phpThumb_cache'; // allow phpThumb to share 1 set of cached files even if accessed under different servername/domains on same server
+$PHPTHUMB_CONFIG['cache_prefix'] = 'phpThumb_cache_'.(isset($_SERVER['SERVER_NAME']) ? str_replace('www.', '', $_SERVER['SERVER_NAME']).'_' : ''); // keep cache file separate by domain
+//$PHPTHUMB_CONFIG['cache_prefix'] = 'phpThumb_cache'; // allow phpThumb to share 1 set of cached files even if accessed under different servername/domains on same server
$PHPTHUMB_CONFIG['cache_force_passthru'] = true; // if true, cached image data will always be passed to browser; if false, HTTP redirect will be used instead
@@ -191,9 +191,9 @@
// * Security configuration
-$PHPTHUMB_CONFIG['high_security_enabled'] = false; // if enabled, requires 'high_security_password' set to at least 5 characters, and requires the use of phpThumbURL() function (at the bottom of phpThumb.config.php) to generate hashed URLs
-$PHPTHUMB_CONFIG['high_security_password'] = ''; // required if 'high_security_enabled' is true, must be at least 5 characters long
-$PHPTHUMB_CONFIG['disable_debug'] = true; // prevent phpThumb from displaying any information about your system. If true, phpThumbDebug and error messages will be disabled
+$PHPTHUMB_CONFIG['high_security_enabled'] = false; // if enabled, requires 'high_security_password' set to be set and requires the use of phpThumbURL() function (at the bottom of phpThumb.config.php) to generate hashed URLs
+$PHPTHUMB_CONFIG['high_security_password'] = ''; // required if 'high_security_enabled' is true, and must be at complex (uppercase, lowercase, numbers, punctuation, etc -- punctuation is strongest, lowercase is weakest; see PasswordStrength() in phpThumb.php). You can use a password generator like http://silisoftware.com/tools/password-random.php to generate a strong password
+$PHPTHUMB_CONFIG['disable_debug'] = true; // prevent phpThumb from displaying any information about your system. If true, phpThumbDebug and error messages will be disabled
$PHPTHUMB_CONFIG['allow_src_above_docroot'] = true; // if true, allow src to be anywhere in filesystem; if false (default) only allow src within document_root
$PHPTHUMB_CONFIG['allow_src_above_phpthumb'] = true; // if true (default), allow src to be anywhere in filesystem; if false only allow src within sub-directory of phpThumb installation
$PHPTHUMB_CONFIG['allow_parameter_file'] = false; // if true, allow use of 'file' parameter; if false (default) the 'file' parameter is disabled/ignored
|
|
From: <be...@us...> - 2012-12-12 21:06:46
|
Revision: 10371
http://sourceforge.net/p/xoops/svn/10371
Author: beckmi
Date: 2012-12-12 21:06:40 +0000 (Wed, 12 Dec 2012)
Log Message:
-----------
Updating elRTE to 1.3 (Kris_fr)
Modified Paths:
--------------
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/elrte/elrte/Changelog
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/elrte/elrte/README
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/elrte/elrte/css/elrte-inner.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/elrte/elrte/css/elrte.full.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/elrte/elrte/css/elrte.min.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/elrte/elrte/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/elrte/elrte/js/elrte.min.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/elrte/formelrte.php
Added Paths:
-----------
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/elrte/elrte/css/smoothness/jquery-ui-1.8.13.custom.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/elrte/language/french.php
Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/elrte/elrte/Changelog
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/elrte/elrte/Changelog 2012-12-12 13:46:57 UTC (rev 10370)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/elrte/elrte/Changelog 2012-12-12 21:06:40 UTC (rev 10371)
@@ -1,3 +1,30 @@
+2011-06-22 Troex Nevelin <tr...@fu...>
+
+ * elRTE (1.3):
+ - [feature] jQuery 1.6.1, jQuery UI 1.8.13
+ - [feature] file manager callback now used to insert link
+ - [feature] EOL in panels, next panel is started on new line
+ - [feature] better XHTML support
+ - [feature] ID attribute in class/style dialog
+ - [feature] .elrte('destroy') method to completely remove elRTE
+ - [bugfix] JavaScript code cut
+ - [bugfix] instead space in Opera 11+
+ - [bugfix] correctly return empty editor contents
+ - [bugfix] background image cut
+ - [bugfix] link dialog tabs "Popup" and "Even"
+ - [bugfix] image dialog size not detected in Safari 5
+ - [bugfix] image dialog broken with jQuery 1.6+
+ - [bugfix] image dialog case not preserved in title and alt attributes
+ - [bugfix] CSS fixes for Drupal 7
+ - [bugfix] colorpicker hide in IE7
+ - [translation] Catalan, Maria Consuelo Bravo <con...@gm...>
+ - [translation] Danish, Steen Rabol <ste...@gm...>
+ - [translation] German, Daniel Holzmann <d...@ve...>
+ - [translation] Croatian, Guerilla Team <in...@gu...>
+ - [translation] Slovak, Lubos Voros <lu...@si...>
+ - [translation] Vietnamese, babycntt
+
+
2010-12-12 Troex Nevelin <tr...@fu...>
* elRTE (1.2):
@@ -30,8 +57,7 @@
2010-09-20 Troex Nevelin <tr...@fu...>
* elRTE (1.1):
- - [feature] TAB now key inserts '\t' instead switch to next element in
- source view
+ - [feature] TAB now key inserts '\t' instead switch to next element in source view
- [feature] completed RTL support
- [feature] pagebreak button added
- [feature] smileys button added
@@ -65,8 +91,7 @@
- [bugfix] textarea not posted without name #189
- [translation] Latvian, Uldis Plotiņš <uld...@gm...>
- [translation] Spanish, Ricardo Obregón <rob...@gm...>
- - [translation] Japanese, Tomoaki Yoshida <in...@yo...>
- http://yoshida-studio.jp/rakugakis/
+ - [translation] Japanese, Tomoaki Yoshida <in...@yo...> http://yoshida-studio.jp/rakugakis/
2010-03-29 Dmitry Levashov <di...@st...>
@@ -92,8 +117,7 @@
- [bugfix] insert new row in table now works
- [bugfix] fixed undo/redo
- [bugfix] enter/shift+enter fixed in Safari
- - [bugfix] jquery plugin now contains new commands (open, close,
- updateSource, val)
+ - [bugfix] jquery plugin now contains new commands (open, close, updateSource, val)
2009-11-09 Dmitry Levashov <di...@st...>
Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/elrte/elrte/README
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/elrte/elrte/README 2012-12-12 13:46:57 UTC (rev 10370)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/elrte/elrte/README 2012-12-12 21:06:40 UTC (rev 10371)
@@ -40,12 +40,12 @@
* Lightweight, fast and easy to integrate
* Interface appearance is configured from one CSS file
* No templates used
- * i18n. The editor can be easily localized into any language. Currently
- available in English, German, Japanese, Latvian, Spanish, Russian and
- Ukrainian languages
- * Designed to work with elFinder file manager (http://elrte.org/elfinder),
- but also can be used with any other
+ * i18n. The editor can be easily localized into any language. More than 20
+ languages already included, check js/i18n directory
+ * Designed to work with elFinder (http://elrte.org/elfinder), but also can be
+ used with any other file manager
* Flexible for extensions
+ * Community supported
Requirements
@@ -58,7 +58,7 @@
Documentation
=============
-http://elrte.org/redmine/wiki/elrte
+http://elrte.org/redmine/projects/elrte/wiki
Authors
@@ -70,33 +70,6 @@
RTL Support: Tawfek Daghistani <taw...@gm...>
-Translators
-===========
-
-Arabic: Tawfek Daghistani <taw...@gm...>
-Brazilian Portuguese: Jairo Moreno <mas...@gm...>
-Czech: Michal Marek <mic...@gm...>
-Dutch: Kurt Aerts http://ilabsolutions.net/
-English: Dmitry "dio" Levashov <di...@st...>
-French: Francois Mazerolle <fm...@gm...>
-German: Vasiliy Razumnyh <rv...@st...>
-Hungarian: Viktor Tamas <tam...@to...>
-Italian: Ugo Punzolo <sad...@gm...>
-Japanese: Tomoaki Yoshida <in...@yo...>
-Korean: DominicKesler <Dom...@gm...>
-Latvian: Uldis Plotiņš <uld...@gm...>
-Persian (Farsi): Saleh soozanchi <in...@so...>
-Polish: Andrzej Borowicz http://borowicz.info/
-Russian: Dmitry "dio" Levashov <di...@st...>
-Simplified Chinese: Lee Chenhwa <lee...@gm...>
-Spanish: Ricardo Obregón <rob...@gm...>
-Thai: Anusuk Sangubon <jai...@gm...>
-Traditional Chinese: Tad <ta...@gm...>
- T.C. Chou <tc...@tc...>
-Turkish: Özgür Çakırca <dij...@gm...>
-Ukranian: Artem Vasilyev
-
-
We hope our tools will be helpful for you.
Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/elrte/elrte/css/elrte-inner.css
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/elrte/elrte/css/elrte-inner.css 2012-12-12 13:46:57 UTC (rev 10370)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/elrte/elrte/css/elrte-inner.css 2012-12-12 21:06:40 UTC (rev 10371)
@@ -2,7 +2,7 @@
body.el-rte-rtl, body.el-rte-rtl * { direction:rtl; }
body.el-rte-structure blockquote { border:1px dotted #ccc; }
-body.el-rte-structure span { background-color:#f5f5f5; }
+body.el-rte-structure span { outline:1px solid #ccc; }
body.el-rte-structure table { border:1px dotted #aaa; }
body.el-rte-structure caption,
body.el-rte-structure td,
Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/elrte/elrte/css/elrte.full.css
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/elrte/elrte/css/elrte.full.css 2012-12-12 13:46:57 UTC (rev 10370)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/elrte/elrte/css/elrte.full.css 2012-12-12 21:06:40 UTC (rev 10371)
@@ -1,9 +1,9 @@
/*!
* elRTE WYSIWYG HTML-editor
- * Version 1.2 (2010-12-12)
+ * Version 1.3 (2011-06-23)
* http://elrte.org
*
- * Copyright 2010, Studio 42 Ltd.
+ * Copyright 2009-2011, Studio 42 Ltd.
* Licensed under a 3 clauses BSD license
*/
@@ -51,7 +51,7 @@
border:1px solid #ccc;
background:#fff;
padding:3px 2px 3px 3px;
- z-index:10000; /* fight with ui.dialog 0_o */
+ z-index:99000; /* fight with ui.dialog 0_o */
position:absolute;
top:16px;
left:0;
@@ -233,7 +233,6 @@
white-space:nowrap;
display:block;
}
-
/* контейнер */
.el-rte {
font-family: Trebuchet MS, Verdana, Geneva,sans-serif;
@@ -247,7 +246,7 @@
top:0;
left:0;
margin:0;
-/* z-index:101;*/
+ z-index:10;
}
.elrte-swf-placeholder {
@@ -297,13 +296,15 @@
padding:0; /* Joomla 1.6 compat */
background:url('../images/elrte-toolbar.png') no-repeat;
border:1px solid #ccc;
+ z-index:100;
+
}
/* активная и подсвеченная и неактивная кнопка */
.el-rte .toolbar ul li.hover { border:1px solid #54b9bf; }
.el-rte .toolbar ul li.active { background-color:#c3dbef; border:1px solid #fff; }
.el-rte .toolbar ul li.disabled { opacity:alpha(0.3); opacity: 0.3; filter:Alpha(Opacity=30);}
/* кнопки */
-.el-rte .toolbar ul li.about {background-position:-829px -5px;}
+.el-rte .toolbar ul li.about {background-position:-829px -5px;}
.el-rte .toolbar ul li.save {background-position:-30px -2px;}
.el-rte .toolbar ul li.new {background-position:-55px -2px}
.el-rte .toolbar ul li.copy {background-position:-78px -2px}
@@ -460,22 +461,20 @@
.el-rte-rtl .toolbar ul li div.color-indicator {
margin:16px 2px 2px 0;
}
+.el-rte .toolbar .panel-format { z-index: 10; }
+
/* colors palette */
.el-palette { top:20px; }
-.el-dialogform, .el-dialogform td { font-size:.9em; }
-.el-dialogform select { font-size:.9em;}
-.ui-dialog .ui-dialog-buttonpane { padding: .4em, 1em;}
+.el-dialogform, .el-dialogform td { font-size:.9em; }
+.el-dialogform select { font-size:.9em;}
+.ui-dialog .ui-dialog-buttonpane { padding: .4em, 1em;}
.ui-dialog .ui-dialog-buttonpane button { margin: .3em .4em .1em 0; font-size:.9em;}
-.ui-dialog .ui-dialog-titlebar { padding: .3em 1em .3em; }
+.ui-dialog .ui-dialog-titlebar { padding: .3em 1em .3em; }
/*.ui-dialog-buttonset { padding:0; background-color:#333;}*/
/* диалоговые окна */
-.el-dialogform label {
- display:block;
-}
-.el-dialogform label input {
- margin-right:2px;
-}
+.el-dialogform label { display:block; }
+.el-dialogform label input { margin-right:2px; }
.el-dialogform iframe.el-rte-preview {
width : 100%;
height : 235px;
@@ -495,9 +494,8 @@
border:1px solid #ccc;
background-color: #eee;
}
-.el-dialogform p { padding:.2em .3em;}
+.el-dialogform p { padding:.2em .3em;}
.el-dialogform h3 { color:#555; padding:1.2em 0 0 0; margin:0; font-size:1.2em; }
-
.el-dialogform h4 { color:#555;font-size:1em; padding:0; margin: 3px 9px; }
.elrte-logo {
@@ -507,10 +505,11 @@
margin:.5em 1em;
background:url('../images/elrte-toolbar.png') -880px -7px no-repeat;
}
-.elrte-ver { font-size:.9em; padding-left:.7em;}
-.elrte-copy { font-size:.9em; padding-left:.3em;}
-table.elrte-authors { margin-bottom:1em;}
-table.elrte-authors td { border-bottom:1px solid #eee;}
+.elrte-ver { font-size:.9em; padding-left:.7em; }
+.elrte-copy { font-size:.9em; padding-left:.3em; }
+table.elrte-authors { margin-bottom:1em; }
+table.elrte-authors td { border-bottom:1px solid #eee; }
+
/* widgets */
.el-borderselect {}
.el-borderselect table { margin:0; }
@@ -523,6 +522,15 @@
.el-rte-smiley { margin:5px; }
-.panel-format {
- z-index: 1000;
+.elrte-image-src-fm .ui-state-default {
+ float:right;
}
+.el-dialogform-rtl .elrte-image-src-fm .ui-state-default { float:left;}
+
+.elrte-image-preview {
+ font-size:.7em;
+ overflow:auto;
+ height:240px;
+ width:480px;
+}
+
Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/elrte/elrte/css/elrte.min.css
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/elrte/elrte/css/elrte.min.css 2012-12-12 13:46:57 UTC (rev 10370)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/elrte/elrte/css/elrte.min.css 2012-12-12 21:06:40 UTC (rev 10371)
@@ -1,164 +1,174 @@
-/*!* elRTE WYSIWYG HTML-editor * Version 1.2(2010-12-12) * http://elrte.org * * Copyright 2010,Studio 42 Ltd. * Licensed under a 3 clauses BSD license */ @charset "UTF-8";a{outline:none;}
-.clearfix:after{content:".";display:block;font-size:0;height:0;clear:both;visibility:hidden;}
-.clearfix{display:block;}
-.rounded-2{-moz-border-radius:2px;-webkit-border-radius:2px;border-radius:2px;}
-.rounded-3{-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;}
-.rounded-4{-moz-border-radius:4px;-webkit-border-radius:4px;border-radius:4px;}
-.rounded-5{-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;}
-.rounded-6{-moz-border-radius:6px;-webkit-border-radius:5px;border-radius:6px;}
-.rounded-7{-moz-border-radius:7px;-webkit-border-radius:7px;border-radius:7px;}
-.rounded-left-3{-moz-border-radius-topleft:3px;-webkit-border-top-left-radius:3px;-moz-border-radius-bottomleft:3px;-webkit-border-bottom-left-radius:3px;}
-.rounded-bottom-7{-moz-border-radius-bottomleft:7px;-moz-border-radius-bottomright:7px;-webkit-border-bottom-left-radius:7px;-webkit-border-bottom-right-radius:7px;border-bottom-left-radius:7px;border-bottom-right-radius:7px;}
-.ui-widget{font-size:.9em;}
-.ui-dialog .ui-dialog-buttonpane button{padding:.1em .6em .2em .6em;}
-.el-colorpicker{width:16px;height:16px;border:1px solid #ccc;position:relative;cursor:default;}
-.el-palette{width:182px;border:1px solid #ccc;background:#fff;padding:3px 2px 3px 3px;z-index:10000;position:absolute;top:16px;left:0;}
-.el-palette .color{float:left;width:14px;height:14px;line-height:1px;border-top:1px solid #eee;border-left:1px solid #eee;}
-.el-palette .panel{border-top:1px solid #ccc;margin-top:7px;padding:5px 3px 5px 3px;}
-.el-palette .panel .preview{float:right;width:18px;height:18px;border:1px solid #ccc;}
-.el-palette .panel input{border:1px solid #ccc;}
-.ui-widget .el-dialogform{padding:5px 3px;}
-.ui-widget .el-dialogform-rtl{direction:rtl;}
-.ui-widget .el-dialogform-rtl .ui-tabs-nav li{float:right;}
-.el-dialogform div.tab:hover{background:transparent;}
-.ui-dialog .ui-dialog-title,.ui-dialog .ui-dialog-content{font-size:.9em;}
-.ui-tabs .ui-tabs-nav li a{padding:.2em .7em;}
-.el-dialogform .tab{padding:5px 0 12px 0;border:none;}
-.el-dialogform .separator{border-top:1px solid #ccc;margin:5px 2px;}
-.el-dialogform table{width:100%;border:none;}
-.el-dialogform table td{padding:2px;}
-.el-dialogform input,.el-dialogform textarea{border:1px solid #ccc;}
-.el-dialogform select{padding:0;}
-.el-dialogform .spinner{background:url(../images/loading.gif) 50% 50% no-repeat;text-align:center;width:150px;height:50px;margin:10px auto;padding-top:33px;font-weight:bold;}
-.el-dialogform-error{background:#fee;color:#f00;border:2px #844 solid;padding:10px;margin-bottom:1em 0;}
-.el-dialogform-message{background:#efe;color:#040;border:2px #484 solid;padding:10px;margin-bottom:1em 0;}
-.el-dialogform table td .el-borderselect table{width:auto;}
-.el-dialogform table td .el-borderselect table td{padding-left:0;padding-right:2px;}
-.el-paddinginput{display:block;white-space:nowrap;}
-.el-paddinginput input{margin:0 1px 0 0;border:1px solid #ccc;}
-.el-paddinginput select{padding:0;}
-.el-select{height:17px;width:110px;border:1px solid #ccc;cursor:default;position:relative;}
-.el-select.hover{background-color:#eee;}
-.el-select label{height:17px;line-height:17px;padding:0 5px;margin:0 12px 0 0;display:block;white-space:nowrap;overflow:hidden;background:#fff;border-right:1px solid #ccc;}
-.el-select .list{border:1px solid #ccc;display:block;position:absolute;overflow:auto;background:#fff;z-index:1000;}
-.el-select .list div{position:relative;padding:3px 25px 3px 7px;border-bottom:1px solid #eee;}
-.el-select .list .hover{background:#efefef;}
-.el-select .list .active{background-color:#c3dbef;}
-.el-select .list div *{padding:0;margin:0;border:none;white-space:nowrap;display:block;}
-.el-rte{font-family:Trebuchet MS,Verdana,Geneva,sans-serif;overflow:hidden;}
-.el-rte.el-fullscreen{position:absolute;width:99%;top:0;left:0;margin:0;}
-.elrte-swf-placeholder{width:1px;background:url('../images/swf.png') 0 0 no-repeat;}
-.elrtetesturl{color:red;background-image:url(../images/pixel.gif);}
-.el-rte .toolbar{background-color:#eee;padding:3px 7px 2px 7px;border:1px solid #ccc;white-space:normal;}
-.el-rte-rtl .toolbar{direction:rtl;}
-.el-rte .toolbar ul{position:relative;display:inline-block;display:-moz-inline-stack;display:inline-block;vertical-align:top;zoom:1;*display:inline;margin:0;list-style:none;padding:0 2px 0 5px;background:url('../images/elrte-toolbar.png') -934px -2px no-repeat;}
-.el-rte .toolbar ul.first{background:transparent;padding-left:0;}
-.el-rte .toolbar ul li{display:inline-block;display:-moz-inline-stack;display:inline-block;height:22px;width:22px;vertical-align:top;zoom:1;*display:inline;margin:1px 1px;padding:0;background:url('../images/elrte-toolbar.png') no-repeat;border:1px solid #ccc;}
-.el-rte .toolbar ul li.hover{border:1px solid #54b9bf;}
-.el-rte .toolbar ul li.active{background-color:#c3dbef;border:1px solid #fff;}
-.el-rte .toolbar ul li.disabled{opacity:alpha(0.3);opacity:.3;filter:Alpha(Opacity=30);}
-.el-rte .toolbar ul li.about{background-position:-829px -5px;}
-.el-rte .toolbar ul li.save{background-position:-30px -2px;}
-.el-rte .toolbar ul li.new{background-position:-55px -2px;}
-.el-rte .toolbar ul li.copy{background-position:-78px -2px;}
-.el-rte .toolbar ul li.css{background-position:-801px -5px;}
-.el-rte .toolbar ul li.cut{background-position:-104px -2px;}
-.el-rte .toolbar ul li.paste{background-position:-128px -2px;}
-.el-rte .toolbar ul li.pastetext{background-position:-534px -2px;}
-.el-rte .toolbar ul li.pasteformattext{background-position:-154px -2px;}
-.el-rte .toolbar ul li.removeformat{background-position:-180px -2px;}
-.el-rte .toolbar ul li.docstructure{background-position:-712px -4px;}
-.el-rte .toolbar ul li.undo{background-position:-205px -2px;}
-.el-rte .toolbar ul li.redo{background-position:-230px -2px;}
-.el-rte .toolbar ul li.bold{background-position:-252px -2px;}
-.el-rte .toolbar ul li.italic{background-position:-270px -2px;}
-.el-rte .toolbar ul li.underline{background-position:-290px -2px;}
-.el-rte .toolbar ul li.strikethrough{background-position:-149px -29px;}
-.el-rte .toolbar ul li.subscript{background-position:-54px -29px;}
-.el-rte .toolbar ul li.superscript{background-position:-76px -29px;}
-.el-rte .toolbar ul li.justifyleft{background-position:-311px -2px;}
-.el-rte .toolbar ul li.justifycenter{background-position:-335px -2px;}
-.el-rte .toolbar ul li.justifyright{background-position:-360px -2px;}
-.el-rte .toolbar ul li.justifyfull{background-position:-174px -29px;}
-.el-rte .toolbar ul li.insertunorderedlist{background-position:-100px -29px;}
-.el-rte .toolbar ul li.insertorderedlist{background-position:-124px -29px;}
-.el-rte .toolbar ul li.outdent{background-position:-6px -29px;}
-.el-rte .toolbar ul li.indent{background-position:-32px -29px;}
-.el-rte .toolbar ul li.blockquote{background-position:-220px -30px;}
-.el-rte .toolbar ul li.div{background-position:-655px -29px;}
-.el-rte .toolbar ul li.stopfloat{background-position:-771px -5px;}
-.el-rte .toolbar ul li.nbsp{background-position:-580px -2px;}
-.el-rte .toolbar ul li.forecolor{background-position:-372px -30px;}
-.el-rte .toolbar ul li.hilitecolor{background-position:-395px -30px;}
-.el-rte .toolbar ul li.link{background-position:-244px -29px;}
-.el-rte .toolbar ul li.unlink{background-position:-270px -29px;}
-.el-rte .toolbar ul li.anchor{background-position:-296px -30px;}
-.el-rte .toolbar ul li.image{background-position:-384px -2px;}
-.el-rte .toolbar ul li.flash{background-position:-410px -2px;}
-.el-rte .toolbar ul li.file{background-position:-436px -3px;}
-.el-rte .toolbar ul li.table{background-position:-421px -30px;}
-.el-rte .toolbar ul li.tableprops{background-position:-602px -29px;}
-.el-rte .toolbar ul li.tbcellprops{background-position:-806px -27px;}
-.el-rte .toolbar ul li.tablerm{background-position:-461px -2px;}
-.el-rte .toolbar ul li.tbrowbefore{background-position:-683px -4px;}
-.el-rte .toolbar ul li.tbrowafter{background-position:-654px -4px;}
-.el-rte .toolbar ul li.tbrowrm{background-position:-500px -30px;}
-.el-rte .toolbar ul li.tbcolbefore{background-position:-741px -27px;}
-.el-rte .toolbar ul li.tbcolafter{background-position:-772px -27px;}
-.el-rte .toolbar ul li.tbcolrm{background-position:-526px -30px;}
-.el-rte .toolbar ul li.tbcellsmerge{background-position:-552px -30px;}
-.el-rte .toolbar ul li.tbcellsplit{background-position:-629px -29px;}
-.el-rte .toolbar ul li.smiley{background-position:-322px -29px;}
-.el-rte .toolbar ul li.spec-text{background-position:-487px -2px;}
-.el-rte .toolbar ul li.print{background-position:-509px -2px;}
-.el-rte .toolbar ul li.horizontalrule{background-position:-199px -29px;}
-.el-rte .toolbar ul li.fullscreen{background-position:-348px -30px;}
-.el-rte .toolbar ul li.elfinder{background-position:-436px -2px;}
-.el-rte .toolbar ul li.ltr{background-position:-855px -27px;}
-.el-rte .toolbar ul li.rtl{background-position:-855px -3px;}
-.el-rte .toolbar ul li.pagebreak{background-position:-711px -28px;}
-.el-rte .workzone{border:1px solid #eee;border-top:none;height:400px;overflow:hidden;}
-.el-rte.small .workzone{min-height:250px;}
-.el-rte textarea{width:100%;height:100%;border:none;zoom:1;padding:0;outline:none;}
-.el-rte.small textarea{min-height:250px;}
-.el-rte iframe{width:100%;height:400px;display:block;outline:none;border:0 solid;padding:0;margin:0;background:#fff;}
-.el-rte.small iframe{min-height:250px;}
-.el-rte .statusbar{height:21px;padding:0 9px;font:11px/21px 'monaco','andale mono','lucida console',monospace;background-color:#eee;border-top:1px solid #ccc;border-top:none;}
-.el-rte-rtl .statusbar{direction:rtl;}
-.el-rte .tabsbar{display:block;}
-.el-rte .tabsbar .tab{float:left;margin-right:2px;padding:6px 17px;font-size:.82em;font-weight:bold;color:#777;text-align:center;border:1px solid #eee;border-top:none;background:#fff;cursor:default;}
-.el-rte .tabsbar div.active{background:#eee;color:#444;}
-.el-rte-rtl .tabsbar .tab{float:right;}
-.el-rte .toolbar ul li.el-select{height:22px;width:120px;border:1px solid #ccc;font-size:.82em;cursor:default;background-position:-475px -30px;}
-.el-rte .toolbar ul li.el-select.hover{background-color:#fefefe;}
-.el-rte .toolbar ul li.el-select label{height:19px;padding:3px 5px 0 5px;float:none;width:96px;}
-.el-rte-paste-input{width:99%;height:250px;border:1px solid #ccc;padding:0;margin:0;outline:none;}
-.el-rte .toolbar ul li div.color-indicator{width:18px;height:4px;margin:16px 0 2px 2px;background-color:#000;}
-.el-rte-rtl .toolbar ul li div.color-indicator{margin:16px 2px 2px 0;}
-.el-palette{top:20px;}
-.el-dialogform,.el-dialogform td{font-size:.9em;}
-.el-dialogform select{font-size:.9em;}
-.ui-dialog .ui-dialog-buttonpane{padding:.4em,1em;}
-.ui-dialog .ui-dialog-buttonpane button{margin:.3em .4em .1em 0;font-size:.9em;}
-.ui-dialog .ui-dialog-titlebar{padding:.3em 1em .3em;}
-.el-dialogform label{display:block;}
-.el-dialogform label input{margin-right:2px;}
-.el-dialogform iframe.el-rte-preview{width:100%;height:235px;margin:0;padding:0;outline:none;border:none;}
-.el-dialogform fieldset{border:1px solid #ccc;padding:0;}
-.el-dialogform fieldset legend{font-size:.9em;padding:.1em .5em;margin:0 0 5px 1em;border:1px solid #ccc;background-color:#eee;}
-.el-dialogform p{padding:.2em .3em;}
-.el-dialogform h3{color:#555;padding:1.2em 0 0 0;margin:0;font-size:1.2em;}
-.el-dialogform h4{color:#555;font-size:1em;padding:0;margin:3px 9px;}
-.elrte-logo{width:48px;height:46px;float:left;margin:.5em 1em;background:url('../images/elrte-toolbar.png') -880px -7px no-repeat;}
-.elrte-ver{font-size:.9em;padding-left:.7em;}
-.elrte-copy{font-size:.9em;padding-left:.3em;}
-table.elrte-authors{margin-bottom:1em;}
-table.elrte-authors td{border-bottom:1px solid #eee;}
-.el-borderselect table{margin:0;}
-.el-borderselect table td{padding:0 2px 0 0;vertical-align:middle;}
-.el-borderselect input{margin:0;border:1px solid #ccc;}
-.el-paddinginput{display:block;white-space:nowrap;}
-.el-paddinginput input{margin:0 1px 0 0;border:1px solid #ccc;}
-.el-paddinginput select{padding:0;}
-.el-rte-smiley{margin:5px;}
-.panel-format{z-index:1000;}
\ No newline at end of file
+@charset "UTF-8";/*!
+ * elRTE WYSIWYG HTML-editor
+ * Version 1.3 (2011-06-23)
+ * http://elrte.org
+ *
+ * Copyright 2009-2011, Studio 42 Ltd.
+ * Licensed under a 3 clauses BSD license
+ */ a{outline:0}
+.clearfix:after{content:".";display:block;font-size:0;height:0;clear:both;visibility:hidden}
+.clearfix{display:block}
+.rounded-2{-moz-border-radius:2px;-webkit-border-radius:2px;border-radius:2px}
+.rounded-3{-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px}
+.rounded-4{-moz-border-radius:4px;-webkit-border-radius:4px;border-radius:4px}
+.rounded-5{-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px}
+.rounded-6{-moz-border-radius:6px;-webkit-border-radius:5px;border-radius:6px}
+.rounded-7{-moz-border-radius:7px;-webkit-border-radius:7px;border-radius:7px}
+.rounded-left-3{-moz-border-radius-topleft:3px;-webkit-border-top-left-radius:3px;-moz-border-radius-bottomleft:3px;-webkit-border-bottom-left-radius:3px}
+.rounded-bottom-7{-moz-border-radius-bottomleft:7px;-moz-border-radius-bottomright:7px;-webkit-border-bottom-left-radius:7px;-webkit-border-bottom-right-radius:7px;border-bottom-left-radius:7px;border-bottom-right-radius:7px}
+.ui-widget{font-size:.9em}
+.ui-dialog .ui-dialog-buttonpane button{padding:.1em .6em .2em .6em}
+.el-colorpicker{width:16px;height:16px;border:1px solid #ccc;position:relative;cursor:default}
+.el-palette{width:182px;border:1px solid #ccc;background:#fff;padding:3px 2px 3px 3px;z-index:99000;position:absolute;top:16px;left:0}
+.el-palette .color{float:left;width:14px;height:14px;line-height:1px;border-top:1px solid #eee;border-left:1px solid #eee}
+.el-palette .panel{border-top:1px solid #ccc;margin-top:7px;padding:5px 3px 5px 3px}
+.el-palette .panel .preview{float:right;width:18px;height:18px;border:1px solid #ccc}
+.el-palette .panel input{border:1px solid #ccc}
+.ui-widget .el-dialogform{padding:5px 3px}
+.ui-widget .el-dialogform-rtl{direction:rtl}
+.ui-widget .el-dialogform-rtl .ui-tabs-nav li{float:right}
+.el-dialogform div.tab:hover{background:transparent}
+.ui-dialog .ui-dialog-title,.ui-dialog .ui-dialog-content{font-size:.9em}
+.ui-tabs .ui-tabs-nav li a{padding:.2em .7em}
+.el-dialogform .tab{padding:5px 0 12px 0;border:0}
+.el-dialogform .separator{border-top:1px solid #ccc;margin:5px 2px}
+.el-dialogform table{width:100%;border:0}
+.el-dialogform table td{padding:2px}
+.el-dialogform input,.el-dialogform textarea{border:1px solid #ccc}
+.el-dialogform select{padding:0}
+.el-dialogform .spinner{background:url(../images/loading.gif) 50% 50% no-repeat;text-align:center;width:150px;height:50px;margin:10px auto;padding-top:33px;font-weight:bold}
+.el-dialogform-error{background:#fee;color:#f00;border:2px #844 solid;padding:10px;margin-bottom:1em 0}
+.el-dialogform-message{background:#efe;color:#040;border:2px #484 solid;padding:10px;margin-bottom:1em 0}
+.el-dialogform table td .el-borderselect table{width:auto}
+.el-dialogform table td .el-borderselect table td{padding-left:0;padding-right:2px}
+.el-paddinginput{display:block;white-space:nowrap}
+.el-paddinginput input{margin:0 1px 0 0;border:1px solid #ccc}
+.el-paddinginput select{padding:0}
+.el-select{height:17px;width:110px;border:1px solid #ccc;cursor:default;position:relative}
+.el-select.hover{background-color:#eee}
+.el-select label{height:17px;line-height:17px;padding:0 5px;margin:0 12px 0 0;display:block;white-space:nowrap;overflow:hidden;background:#fff;border-right:1px solid #ccc}
+.el-select .list{border:1px solid #ccc;display:block;position:absolute;overflow:auto;background:#fff;z-index:1000}
+.el-select .list div{position:relative;padding:3px 25px 3px 7px;border-bottom:1px solid #eee}
+.el-select .list .hover{background:#efefef}
+.el-select .list .active{background-color:#c3dbef}
+.el-select .list div *{padding:0;margin:0;border:0;white-space:nowrap;display:block}
+.el-rte{font-family:Trebuchet MS,Verdana,Geneva,sans-serif;overflow:hidden}
+.el-rte.el-fullscreen{position:absolute;width:99%;top:0;left:0;margin:0;z-index:10}
+.elrte-swf-placeholder{width:1px;background:url('../images/swf.png') 0 0 no-repeat}
+.elrtetesturl{color:red;background-image:url(../images/pixel.gif)}
+.el-rte .toolbar{background-color:#eee;padding:3px 7px 2px 7px;border:1px solid #ccc;white-space:normal}
+.el-rte-rtl .toolbar{direction:rtl}
+.el-rte .toolbar ul{position:relative;display:inline-block;display:-moz-inline-stack;display:inline-block;vertical-align:top;zoom:1;*display:inline;margin:0;list-style:none;padding:0 2px 0 5px;background:url('../images/elrte-toolbar.png') -934px -2px no-repeat}
+.el-rte .toolbar ul.first{background:transparent;padding-left:0}
+.el-rte .toolbar ul li{display:inline-block;display:-moz-inline-stack;display:inline-block;height:22px;width:22px;vertical-align:top;zoom:1;*display:inline;margin:1px 1px;padding:0;background:url('../images/elrte-toolbar.png') no-repeat;border:1px solid #ccc;z-index:100}
+.el-rte .toolbar ul li.hover{border:1px solid #54b9bf}
+.el-rte .toolbar ul li.active{background-color:#c3dbef;border:1px solid #fff}
+.el-rte .toolbar ul li.disabled{opacity:alpha(0.3);opacity:.3;filter:Alpha(Opacity=30)}
+.el-rte .toolbar ul li.about{background-position:-829px -5px}
+.el-rte .toolbar ul li.save{background-position:-30px -2px}
+.el-rte .toolbar ul li.new{background-position:-55px -2px}
+.el-rte .toolbar ul li.copy{background-position:-78px -2px}
+.el-rte .toolbar ul li.css{background-position:-801px -5px}
+.el-rte .toolbar ul li.cut{background-position:-104px -2px}
+.el-rte .toolbar ul li.paste{background-position:-128px -2px}
+.el-rte .toolbar ul li.pastetext{background-position:-534px -2px}
+.el-rte .toolbar ul li.pasteformattext{background-position:-154px -2px}
+.el-rte .toolbar ul li.removeformat{background-position:-180px -2px}
+.el-rte .toolbar ul li.docstructure{background-position:-712px -4px}
+.el-rte .toolbar ul li.undo{background-position:-205px -2px}
+.el-rte .toolbar ul li.redo{background-position:-230px -2px}
+.el-rte .toolbar ul li.bold{background-position:-252px -2px}
+.el-rte .toolbar ul li.italic{background-position:-270px -2px}
+.el-rte .toolbar ul li.underline{background-position:-290px -2px}
+.el-rte .toolbar ul li.strikethrough{background-position:-149px -29px}
+.el-rte .toolbar ul li.subscript{background-position:-54px -29px}
+.el-rte .toolbar ul li.superscript{background-position:-76px -29px}
+.el-rte .toolbar ul li.justifyleft{background-position:-311px -2px}
+.el-rte .toolbar ul li.justifycenter{background-position:-335px -2px}
+.el-rte .toolbar ul li.justifyright{background-position:-360px -2px}
+.el-rte .toolbar ul li.justifyfull{background-position:-174px -29px}
+.el-rte .toolbar ul li.insertunorderedlist{background-position:-100px -29px}
+.el-rte .toolbar ul li.insertorderedlist{background-position:-124px -29px}
+.el-rte .toolbar ul li.outdent{background-position:-6px -29px}
+.el-rte .toolbar ul li.indent{background-position:-32px -29px}
+.el-rte .toolbar ul li.blockquote{background-position:-220px -30px}
+.el-rte .toolbar ul li.div{background-position:-655px -29px}
+.el-rte .toolbar ul li.stopfloat{background-position:-771px -5px}
+.el-rte .toolbar ul li.nbsp{background-position:-580px -2px}
+.el-rte .toolbar ul li.forecolor{background-position:-372px -30px}
+.el-rte .toolbar ul li.hilitecolor{background-position:-395px -30px}
+.el-rte .toolbar ul li.link{background-position:-244px -29px}
+.el-rte .toolbar ul li.unlink{background-position:-270px -29px}
+.el-rte .toolbar ul li.anchor{background-position:-296px -30px}
+.el-rte .toolbar ul li.image{background-position:-384px -2px}
+.el-rte .toolbar ul li.flash{background-position:-410px -2px}
+.el-rte .toolbar ul li.file{background-position:-436px -3px}
+.el-rte .toolbar ul li.table{background-position:-421px -30px}
+.el-rte .toolbar ul li.tableprops{background-position:-602px -29px}
+.el-rte .toolbar ul li.tbcellprops{background-position:-806px -27px}
+.el-rte .toolbar ul li.tablerm{background-position:-461px -2px}
+.el-rte .toolbar ul li.tbrowbefore{background-position:-683px -4px}
+.el-rte .toolbar ul li.tbrowafter{background-position:-654px -4px}
+.el-rte .toolbar ul li.tbrowrm{background-position:-500px -30px}
+.el-rte .toolbar ul li.tbcolbefore{background-position:-741px -27px}
+.el-rte .toolbar ul li.tbcolafter{background-position:-772px -27px}
+.el-rte .toolbar ul li.tbcolrm{background-position:-526px -30px}
+.el-rte .toolbar ul li.tbcellsmerge{background-position:-552px -30px}
+.el-rte .toolbar ul li.tbcellsplit{background-position:-629px -29px}
+.el-rte .toolbar ul li.smiley{background-position:-322px -29px}
+.el-rte .toolbar ul li.spec-text{background-position:-487px -2px}
+.el-rte .toolbar ul li.print{background-position:-509px -2px}
+.el-rte .toolbar ul li.horizontalrule{background-position:-199px -29px}
+.el-rte .toolbar ul li.fullscreen{background-position:-348px -30px}
+.el-rte .toolbar ul li.elfinder{background-position:-436px -2px}
+.el-rte .toolbar ul li.ltr{background-position:-855px -27px}
+.el-rte .toolbar ul li.rtl{background-position:-855px -3px}
+.el-rte .toolbar ul li.pagebreak{background-position:-711px -28px}
+.el-rte .workzone{border:1px solid #eee;border-top:0;height:400px;overflow:hidden}
+.el-rte.small .workzone{min-height:250px}
+.el-rte textarea{width:100%;height:100%;border:0;zoom:1;padding:0;outline:0}
+.el-rte.small textarea{min-height:250px}
+.el-rte iframe{width:100%;height:400px;display:block;outline:0;border:0 solid;padding:0;margin:0;background:#fff}
+.el-rte.small iframe{min-height:250px}
+.el-rte .statusbar{height:21px;padding:0 9px;font:11px/21px 'monaco','andale mono','lucida console',monospace;background-color:#eee;border-top:1px solid #ccc;border-top:0}
+.el-rte-rtl .statusbar{direction:rtl}
+.el-rte .tabsbar{display:block}
+.el-rte .tabsbar .tab{float:left;margin-right:2px;padding:6px 17px;font-size:.82em;font-weight:bold;color:#777;text-align:center;border:1px solid #eee;border-top:0;background:#fff;cursor:default}
+.el-rte .tabsbar div.active{background:#eee;color:#444}
+.el-rte-rtl .tabsbar .tab{float:right}
+.el-rte .toolbar ul li.el-select{height:22px;width:120px;border:1px solid #ccc;font-size:.82em;cursor:default;background-position:-475px -30px}
+.el-rte .toolbar ul li.el-select.hover{background-color:#fefefe}
+.el-rte .toolbar ul li.el-select label{height:19px;padding:3px 5px 0 5px;float:none;width:96px}
+.el-rte-paste-input{width:99%;height:250px;border:1px solid #ccc;padding:0;margin:0;outline:0}
+.el-rte .toolbar ul li div.color-indicator{width:18px;height:4px;margin:16px 0 2px 2px;background-color:#000}
+.el-rte-rtl .toolbar ul li div.color-indicator{margin:16px 2px 2px 0}
+.el-rte .toolbar .panel-format{z-index:10}
+.el-palette{top:20px}
+.el-dialogform,.el-dialogform td{font-size:.9em}
+.el-dialogform select{font-size:.9em}
+.ui-dialog .ui-dialog-buttonpane{padding:.4em,1em}
+.ui-dialog .ui-dialog-buttonpane button{margin:.3em .4em .1em 0;font-size:.9em}
+.ui-dialog .ui-dialog-titlebar{padding:.3em 1em .3em}
+.el-dialogform label{display:block}
+.el-dialogform label input{margin-right:2px}
+.el-dialogform iframe.el-rte-preview{width:100%;height:235px;margin:0;padding:0;outline:0;border:0}
+.el-dialogform fieldset{border:1px solid #ccc;padding:0}
+.el-dialogform fieldset legend{font-size:.9em;padding:.1em .5em;margin:0 0 5px 1em;border:1px solid #ccc;background-color:#eee}
+.el-dialogform p{padding:.2em .3em}
+.el-dialogform h3{color:#555;padding:1.2em 0 0 0;margin:0;font-size:1.2em}
+.el-dialogform h4{color:#555;font-size:1em;padding:0;margin:3px 9px}
+.elrte-logo{width:48px;height:46px;float:left;margin:.5em 1em;background:url('../images/elrte-toolbar.png') -880px -7px no-repeat}
+.elrte-ver{font-size:.9em;padding-left:.7em}
+.elrte-copy{font-size:.9em;padding-left:.3em}
+table.elrte-authors{margin-bottom:1em}
+table.elrte-authors td{border-bottom:1px solid #eee}
+.el-borderselect table{margin:0}
+.el-borderselect table td{padding:0 2px 0 0;vertical-align:middle}
+.el-borderselect input{margin:0;border:1px solid #ccc}
+.el-paddinginput{display:block;white-space:nowrap}
+.el-paddinginput input{margin:0 1px 0 0;border:1px solid #ccc}
+.el-paddinginput select{padding:0}
+.el-rte-smiley{margin:5px}
+.elrte-image-src-fm .ui-state-default{float:right}
+.el-dialogform-rtl .elrte-image-src-fm .ui-state-default{float:left}
+.elrte-image-preview{font-size:.7em;overflow:auto;height:240px;width:480px}
\ No newline at end of file
Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/elrte/elrte/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
===================================================================
(Binary files differ)
Added: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/elrte/elrte/css/smoothness/jquery-ui-1.8.13.custom.css
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/elrte/elrte/css/smoothness/jquery-ui-1.8.13.custom.css (rev 0)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/elrte/elrte/css/smoothness/jquery-ui-1.8.13.custom.css 2012-12-12 21:06:40 UTC (rev 10371)
@@ -0,0 +1,578 @@
+/*
+ * jQuery UI CSS Framework 1.8.13
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Theming/API
+ */
+
+/* Layout helpers
+----------------------------------*/
+.ui-helper-hidden { display: none; }
+.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
+.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
+.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
+.ui-helper-clearfix { display: inline-block; }
+/* required comment for clearfix to work in Opera \*/
+* html .ui-helper-clearfix { height:1%; }
+.ui-helper-clearfix { display:block; }
+/* end clearfix */
+.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
+
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-disabled { cursor: default !important; }
+
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Overlays */
+.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+
+
+/*
+ * jQuery UI CSS Framework 1.8.13
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Theming/API
+ *
+ * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana,Arial,sans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=03_highlight_soft.png&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=01_flat.png&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=02_glass.png&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=02_glass.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
+ */
+
+
+/* Component containers
+----------------------------------*/
+.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; }
+.ui-widget .ui-widget { font-size: 1em; }
+.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
+.ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; }
+.ui-widget-content a { color: #222222; }
+.ui-widget-header { border: 1px solid #aaaaaa; background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; }
+.ui-widget-header a { color: #222222; }
+
+/* Interaction states
+----------------------------------*/
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d3d3d3; background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #555555; }
+.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555; text-decoration: none; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #999999; background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
+.ui-state-hover a, .ui-state-hover a:hover { color: #212121; text-decoration: none; }
+.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
+.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121; text-decoration: none; }
+.ui-widget :active { outline: none; }
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #fcefa1; background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x; color: #363636; }
+.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
+.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; color: #cd0a0a; }
+.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a; }
+.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a; }
+.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
+.ui-priority-secondary, .ui-widget-content .ui-priority-secondary, .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
+.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-widget-header .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-state-default .ui-icon { background-image: url(images/ui-icons_888888_256x240.png); }
+.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); }
+.ui-state-active .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); }
+.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png); }
+.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png); }
+
+/* positioning */
+.ui-icon-carat-1-n { background-position: 0 0; }
+.ui-icon-carat-1-ne { background-position: -16px 0; }
+.ui-icon-carat-1-e { background-position: -32px 0; }
+.ui-icon-carat-1-se { background-position: -48px 0; }
+.ui-icon-carat-1-s { background-position: -64px 0; }
+.ui-icon-carat-1-sw { background-position: -80px 0; }
+.ui-icon-carat-1-w { background-position: -96px 0; }
+.ui-icon-carat-1-nw { background-position: -112px 0; }
+.ui-icon-carat-2-n-s { background-position: -128px 0; }
+.ui-icon-carat-2-e-w { background-position: -144px 0; }
+.ui-icon-triangle-1-n { background-position: 0 -16px; }
+.ui-icon-triangle-1-ne { background-position: -16px -16px; }
+.ui-icon-triangle-1-e { background-position: -32px -16px; }
+.ui-icon-triangle-1-se { background-position: -48px -16px; }
+.ui-icon-triangle-1-s { background-position: -64px -16px; }
+.ui-icon-triangle-1-sw { background-position: -80px -16px; }
+.ui-icon-triangle-1-w { background-position: -96px -16px; }
+.ui-icon-triangle-1-nw { background-position: -112px -16px; }
+.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
+.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
+.ui-icon-arrow-1-n { background-position: 0 -32px; }
+.ui-icon-arrow-1-ne { background-position: -16px -32px; }
+.ui-icon-arrow-1-e { background-position: -32px -32px; }
+.ui-icon-arrow-1-se { background-position: -48px -32px; }
+.ui-icon-arrow-1-s { background-position: -64px -32px; }
+.ui-icon-arrow-1-sw { background-position: -80px -32px; }
+.ui-icon-arrow-1-w { background-position: -96px -32px; }
+.ui-icon-arrow-1-nw { background-position: -112px -32px; }
+.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
+.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
+.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
+.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
+.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
+.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
+.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
+.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
+.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
+.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
+.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
+.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
+.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
+.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
+.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
+.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
+.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
+.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
+.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
+.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
+.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
+.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
+.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
+.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
+.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
+.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
+.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
+.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
+.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
+.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
+.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
+.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
+.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
+.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
+.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
+.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
+.ui-icon-arrow-4 { background-position: 0 -80px; }
+.ui-icon-arrow-4-diag { background-position: -16px -80px; }
+.ui-icon-extlink { background-position: -32px -80px; }
+.ui-icon-newwin { background-position: -48px -80px; }
+.ui-icon-refresh { background-position: -64px -80px; }
+.ui-icon-shuffle { background-position: -80px -80px; }
+.ui-icon-transfer-e-w { background-position: -96px -80px; }
+.ui-icon-transferthick-e-w { background-position: -112px -80px; }
+.ui-icon-folder-collapsed { background-position: 0 -96px; }
+.ui-icon-folder-open { background-position: -16px -96px; }
+.ui-icon-document { background-position: -32px -96px; }
+.ui-icon-document-b { background-position: -48px -96px; }
+.ui-icon-note { background-position: -64px -96px; }
+.ui-icon-mail-closed { background-position: -80px -96px; }
+.ui-icon-mail-open { background-position: -96px -96px; }
+.ui-icon-suitcase { background-position: -112px -96px; }
+.ui-icon-comment { background-position: -128px -96px; }
+.ui-icon-person { background-position: -144px -96px; }
+.ui-icon-print { background-position: -160px -96px; }
+.ui-icon-trash { background-position: -176px -96px; }
+.ui-icon-locked { background-position: -192px -96px; }
+.ui-icon-unlocked { background-position: -208px -96px; }
+.ui-icon-bookmark { background-position: -224px -96px; }
+.ui-icon-tag { background-position: -240px -96px; }
+.ui-icon-home { background-position: 0 -112px; }
+.ui-icon-flag { background-position: -16px -112px; }
+.ui-icon-calendar { background-position: -32px -112px; }
+.ui-icon-cart { background-position: -48px -112px; }
+.ui-icon-pencil { background-position: -64px -112px; }
+.ui-icon-clock { background-position: -80px -112px; }
+.ui-icon-disk { background-position: -96px -112px; }
+.ui-icon-calculator { background-position: -112px -112px; }
+.ui-icon-zoomin { background-position: -128px -112px; }
+.ui-icon-zoomout { background-position: -144px -112px; }
+.ui-icon-search { background-position: -160px -112px; }
+.ui-icon-wrench { background-position: -176px -112px; }
+.ui-icon-gear { background-position: -192px -112px; }
+.ui-icon-heart { background-position: -208px -112px; }
+.ui-icon-star { background-position: -224px -112px; }
+.ui-icon-link { background-position: -240px -112px; }
+.ui-icon-cancel { background-position: 0 -128px; }
+.ui-icon-plus { background-position: -16px -128px; }
+.ui-icon-plusthick { background-position: -32px -128px; }
+.ui-icon-minus { background-position: -48px -128px; }
+.ui-icon-minusthick { background-position: -64px -128px; }
+.ui-icon-close { background-position: -80px -128px; }
+.ui-icon-closethick { background-position: -96px -128px; }
+.ui-icon-key { background-position: -112px -128px; }
+.ui-icon-lightbulb { background-position: -128px -128px; }
+.ui-icon-scissors { background-position: -144px -128px; }
+.ui-icon-clipboard { background-position: -160px -128px; }
+.ui-icon-copy { background-position: -176px -128px; }
+.ui-icon-contact { background-position: -192px -128px; }
+.ui-icon-image { background-position: -208px -128px; }
+.ui-icon-video { background-position: -224px -128px; }
+.ui-icon-script { background-position: -240px -128px; }
+.ui-icon-alert { background-position: 0 -144px; }
+.ui-icon-info { background-position: -16px -144px; }
+.ui-icon-notice { background-position: -32px -144px; }
+.ui-icon-help { background-position: -48px -144px; }
+.ui-icon-check { background-position: -64px -144px; }
+.ui-icon-bullet { background-position: -80px -144px; }
+.ui-icon-radio-off { background-position: -96px -144px; }
+.ui-icon-radio-on { background-position: -112px -144px; }
+.ui-icon-pin-w { background-position: -128px -144px; }
+.ui-icon-pin-s { background-position: -144px -144px; }
+.ui-icon-play { background-position: 0 -160px; }
+.ui-icon-pause { background-position: -16px -160px; }
+.ui-icon-seek-next { background-position: -32px -160px; }
+.ui-icon-seek-prev { background-position: -48px -160px; }
+.ui-icon-seek-end { background-position: -64px -160px; }
+.ui-icon-seek-start { background-position: -80px -160px; }
+/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
+.ui-icon-seek-first { background-position: -80px -160px; }
+.ui-icon-stop { background-position: -96px -160px; }
+.ui-icon-eject { background-position: -112px -160px; }
+.ui-icon-volume-off { background-position: -128px -160px; }
+.ui-icon-volume-on { background-position: -144px -160px; }
+.ui-icon-power { background-position: 0 -176px; }
+.ui-icon-signal-diag { background-position: -16px -176px; }
+.ui-icon-signal { background-position: -32px -176px; }
+.ui-icon-battery-0 { background-position: -48px -176px; }
+.ui-icon-battery-1 { background-position: -64px -176px; }
+.ui-icon-battery-2 { background-position: -80px -176px; }
+.ui-icon-battery-3 { background-position: -96px -176px; }
+.ui-icon-circle-plus { background-position: 0 -192px; }
+.ui-icon-circle-minus { background-position: -16px -192px; }
+.ui-icon-circle-close { background-position: -32px -192px; }
+.ui-icon-circle-triangle-e { background-position: -48px -192px; }
+.ui-icon-circle-triangle-s { background-position: -64px -192px; }
+.ui-icon-circle-triangle-w { background-position: -80px -192px; }
+.ui-icon-circle-triangle-n { background-position: -96px -192px; }
+.ui-icon-circle-arrow-e { background-position: -112px -192px; }
+.ui-icon-circle-arrow-s { background-position: -128px -192px; }
+.ui-icon-circle-arrow-w { background-position: -144px -192px; }
+.ui-icon-circle-arrow-n { background-position: -160px -192px; }
+.ui-icon-circle-zoomin { background-position: -176px -192px; }
+.ui-icon-circle-zoomout { background-position: -192px -192px; }
+.ui-icon-circle-check { background-position: -208px -192px; }
+.ui-icon-circlesmall-plus { background-position: 0 -208px; }
+.ui-icon-circlesmall-minus { background-position: -16px -208px; }
+.ui-icon-circlesmall-close { background-position: -32px -208px; }
+.ui-icon-squaresmall-plus { background-position: -48px -208px; }
+.ui-icon-squaresmall-minus { background-position: -64px -208px; }
+.ui-icon-squaresmall-close { background-position: -80px -208px; }
+.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
+.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
+.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
+.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
+.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
+.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Corner radius */
+.ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; }
+.ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; }
+.ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
+.ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
+.ui-corner-top { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; }
+.ui-corner-bottom { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
+.ui-corner-right { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
+.ui-corner-left { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
+.ui-corner-all { -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; }
+
+/* Overlays */
+.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); }
+.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/*
+ * jQuery UI Resizable 1.8.13
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Resizable#theming
+ */
+.ui-resizable { position: relative;}
+.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block;
+ /* http://bugs.jqueryui.com/ticket/7233
+ - Resizable: resizable handles fail to work in IE if transparent and content overlaps
+ */
+ background-image:url(data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs=);
+}
+.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
+.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
+.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; }
+.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; }
+.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; }
+.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
+.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
+.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
+.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/*
+ * jQuery UI Selectable 1.8.13
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Selectable#theming
+ */
+.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; }
+/*
+ * jQuery UI Accordion 1.8.13
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Accordion#theming
+ */
+/* IE/Win - Fix animation bug - #4615 */
+.ui-accordion { width: 100%; }
+.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
+.ui-accordion .ui-accordion-li-fix { display: inline; }
+.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
+.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em .7em; }
+.ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; }
+.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
+.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; }
+.ui-accordio...
[truncated message content] |
|
From: <du...@us...> - 2012-12-12 13:47:00
|
Revision: 10370
http://sourceforge.net/p/xoops/svn/10370
Author: dugris
Date: 2012-12-12 13:46:57 +0000 (Wed, 12 Dec 2012)
Log Message:
-----------
fix Users Synchronize post for installed modules
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/xoops_version.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/users/jquery.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/users/users.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/xoops_version.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/xoops_version.php 2012-12-12 12:59:08 UTC (rev 10369)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/xoops_version.php 2012-12-12 13:46:57 UTC (rev 10370)
@@ -168,4 +168,9 @@
$modversion['config'][$i]['formtype'] = 'select';
$modversion['config'][$i]['valuetype'] = 'text';
$modversion['config'][$i]['options'] = array(date('H:i') => 'H:i', date('H:i:s') => 'H:i:s', date('H:i A') => 'H:i A' , date('H:i:s A ') => 'H:i:s A');
-$modversion['config'][$i]['default'] = 'H:i:s';
\ No newline at end of file
+$modversion['config'][$i]['default'] = 'H:i:s';
+
+// Users Synchronize post
+$modversion['sync']['table_name'] = 'page_content';
+$modversion['sync']['uid_column'] = 'content_author';
+$modversion['sync']['criteria'] = new Criteria('content_status', 1);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/users/jquery.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/users/jquery.php 2012-12-12 12:59:08 UTC (rev 10369)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/users/jquery.php 2012-12-12 13:46:57 UTC (rev 10370)
@@ -51,10 +51,16 @@
'table_name' => 'xoopscomments', 'uid_column' => 'com_uid',
'criteria' => new Criteria('com_status', XOOPS_COMMENT_ACTIVE)
);
- // Count forum posts
- if ($module_handler->getByDirname("newbb")) {
- $tables[] = array('table_name' => 'bb_posts', 'uid_column' => 'uid');
+
+ $system_module = new SystemModule();
+ $list = $system_module->getModuleList();
+ foreach ($list as $k => $v) {
+ $sync = $v->getInfo('sync');
+ if ( isset($sync) && count($sync) >= 2 ) {
+ $tables[] = $sync;
+ }
}
+
$uid = $system->cleanVars($_REQUEST, 'uid', 'int');
$total_posts = 0;
foreach ($tables as $table) {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/users/users.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/users/users.php 2012-12-12 12:59:08 UTC (rev 10369)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/users/users.php 2012-12-12 13:46:57 UTC (rev 10370)
@@ -54,14 +54,15 @@
'table_name' => 'xoopscomments', 'uid_column' => 'com_uid',
'criteria' => new Criteria('com_status', XOOPS_COMMENT_ACTIVE)
);
- // Count Content posts
- if ($module_handler->getByDirname("fmcontent")) {
- $tables[] = array('table_name' => 'fmcontent_content', 'uid_column' => 'content_uid');
+
+ $system_module = new SystemModule();
+ $list = $system_module->getModuleList();
+ foreach ($list as $k => $v) {
+ $sync = $v->getInfo('sync');
+ if ( isset($sync) && count($sync) >= 2 ) {
+ $tables[] = $sync;
+ }
}
- // Count forum posts
- if ($module_handler->getByDirname("newbb")) {
- $tables[] = array('table_name' => 'bb_posts', 'uid_column' => 'uid');
- }
switch ($type) {
case 'user':
|
|
From: <du...@us...> - 2012-12-12 12:59:11
|
Revision: 10369
http://sourceforge.net/p/xoops/svn/10369
Author: dugris
Date: 2012-12-12 12:59:08 +0000 (Wed, 12 Dec 2012)
Log Message:
-----------
Fix search
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/search.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/search.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/search.php 2012-12-12 12:38:22 UTC (rev 10368)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/search.php 2012-12-12 12:59:08 UTC (rev 10369)
@@ -187,7 +187,7 @@
}
$res[$i]['title'] = $myts->htmlspecialchars($results[$i]['title']);
$res[$i]['title_highligh'] = preg_replace( $queries_pattern, "<span class='searchHighlight'>$1</span>", $myts->htmlspecialchars($results[$i]['title']));
- if ( !empty($results[$i]['uid']) ) {
+ if ( !empty($results[$i]['uid']) ) {
$res[$i]['uid'] = intval($results[$i]['uid']);
$res[$i]['uname'] = XoopsUser::getUnameFromId($results[$i]['uid'], true);
}
@@ -250,9 +250,15 @@
$res[$i]['link'] = 'modules/' . $module->getVar('dirname') . '/' . $results[$i]['link'];
}
$res[$i]['title'] = $myts->htmlspecialchars($results[$i]['title']);
- $res[$i]['title_highligh'] = preg_replace( $queries_pattern, "<span class='searchHighlight'>$1</span>", $myts->htmlspecialchars($results[$i]['title']));
- $res[$i]['uid'] = @intval($results[$i]['uid']);
- $res[$i]['uname'] = XoopsUser::getUnameFromId($results[$i]['uid'], true);
+ if (isset($queries_pattern)) {
+ $res[$i]['title_highligh'] = preg_replace( $queries_pattern, "<span class='searchHighlight'>$1</span>", $myts->htmlspecialchars($results[$i]['title']));
+ } else {
+ $res[$i]['title_highligh'] = $myts->htmlspecialchars($results[$i]['title']);
+ }
+ if ( !empty($results[$i]['uid']) ) {
+ $res[$i]['uid'] = @intval($results[$i]['uid']);
+ $res[$i]['uname'] = XoopsUser::getUnameFromId($results[$i]['uid'], true);
+ }
$res[$i]['time'] = !empty($results[$i]['time']) ? " (" . XoopsLocal::formatTimestamp(intval($results[$i]['time'])) . ")" : "";
$res[$i]['content'] = empty($results[$i]['content']) ? "" : preg_replace( $queries_pattern, "<span class='searchHighlight'>$1</span>", $results[$i]['content']);
}
|
|
From: <du...@us...> - 2012-12-12 12:38:25
|
Revision: 10368
http://sourceforge.net/p/xoops/svn/10368
Author: dugris
Date: 2012-12-12 12:38:22 +0000 (Wed, 12 Dec 2012)
Log Message:
-----------
Fix : userinfo search post
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_userinfo.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/userinfo.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_userinfo.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_userinfo.html 2012-12-12 06:28:17 UTC (rev 10367)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_userinfo.html 2012-12-12 12:38:22 UTC (rev 10368)
@@ -190,7 +190,9 @@
<li>
<img src="<{$result.image}>" alt="<{$module.name}>" />
<strong><a href="<{$result.link}>" title="<{$result.title}>"><{$result.title}></a></strong><br />
+ <{if $result.time}>
<span class="x-small">(<{$result.time}>)</span>
+ <{/if}>
</li>
<{/foreach}>
<!-- end results item loop -->
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/userinfo.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/userinfo.php 2012-12-12 06:28:17 UTC (rev 10367)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/userinfo.php 2012-12-12 12:38:22 UTC (rev 10368)
@@ -184,7 +184,9 @@
}
$results[$i]['title'] = $myts->htmlspecialchars($results[$i]['title']);
- $results[$i]['time'] = $results[$i]['time'] ? XoopsLocal::formatTimestamp($results[$i]['time']) : '';
+ if (!empty($results[$i]['time'])) {
+ $results[$i]['time'] = $results[$i]['time'] ? XoopsLocal::formatTimestamp($results[$i]['time']) : '';
+ }
}
if ($count == 5) {
$showall_link = '<a href="search.php?action=showallbyuser&mid=' . $mid . '&uid=' . $thisUser->getVar('uid') . '">' . _US_SHOWALL . '</a>';
|
|
From: <be...@us...> - 2012-12-12 06:28:20
|
Revision: 10367
http://sourceforge.net/p/xoops/svn/10367
Author: beckmi
Date: 2012-12-12 06:28:17 +0000 (Wed, 12 Dec 2012)
Log Message:
-----------
updating phpThumb from version 1.7.9 to version 1.7.11
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/thumbs/phpThumb.config.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/thumbs/phpThumb.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/thumbs/phpthumb.class.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/thumbs/phpthumb.filters.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/thumbs/phpthumb.functions.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/thumbs/phpthumb.unsharp.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/thumbs/phpThumb.config.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/thumbs/phpThumb.config.php 2012-12-12 00:09:45 UTC (rev 10366)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/thumbs/phpThumb.config.php 2012-12-12 06:28:17 UTC (rev 10367)
@@ -78,8 +78,8 @@
//$PHPTHUMB_CONFIG['cache_default_only_suffix'] = '*_thumb'; // cache 'pic.jpg' becomes 'pic_thumb.jpg' (or 'pic_thumb.png' if PNG output is selected, etc)
//$PHPTHUMB_CONFIG['cache_default_only_suffix'] = 'small-*'; // cache 'pic.jpg' becomes 'small-pic.jpg' (or 'small-pic.png' if PNG output is selected, etc)
-$PHPTHUMB_CONFIG['cache_prefix'] = 'phpThumb_cache_'.str_replace('www.', '', @$_SERVER['SERVER_NAME']);
-//$PHPTHUMB_CONFIG['cache_prefix'] = 'phpThumb_cache'; // allow phpThumb to share 1 set of cached files even if accessed under different servername/domains on same server
+$PHPTHUMB_CONFIG['cache_prefix'] = 'phpThumb_cache_'.(isset($_SERVER['SERVER_NAME']) ? str_replace('www.', '', $_SERVER['SERVER_NAME']).'_' : ''); // keep cache file separate by domain
+//$PHPTHUMB_CONFIG['cache_prefix'] = 'phpThumb_cache'; // allow phpThumb to share 1 set of cached files even if accessed under different servername/domains on same server
$PHPTHUMB_CONFIG['cache_force_passthru'] = true; // if true, cached image data will always be passed to browser; if false, HTTP redirect will be used instead
@@ -191,9 +191,9 @@
// * Security configuration
-$PHPTHUMB_CONFIG['high_security_enabled'] = false; // if enabled, requires 'high_security_password' set to at least 5 characters, and requires the use of phpThumbURL() function (at the bottom of phpThumb.config.php) to generate hashed URLs
-$PHPTHUMB_CONFIG['high_security_password'] = ''; // required if 'high_security_enabled' is true, must be at least 5 characters long
-$PHPTHUMB_CONFIG['disable_debug'] = true; // prevent phpThumb from displaying any information about your system. If true, phpThumbDebug and error messages will be disabled
+$PHPTHUMB_CONFIG['high_security_enabled'] = false; // if enabled, requires 'high_security_password' set to be set and requires the use of phpThumbURL() function (at the bottom of phpThumb.config.php) to generate hashed URLs
+$PHPTHUMB_CONFIG['high_security_password'] = ''; // required if 'high_security_enabled' is true, and must be at complex (uppercase, lowercase, numbers, punctuation, etc -- punctuation is strongest, lowercase is weakest; see PasswordStrength() in phpThumb.php). You can use a password generator like http://silisoftware.com/tools/password-random.php to generate a strong password
+$PHPTHUMB_CONFIG['disable_debug'] = true; // prevent phpThumb from displaying any information about your system. If true, phpThumbDebug and error messages will be disabled
$PHPTHUMB_CONFIG['allow_src_above_docroot'] = true; // if true, allow src to be anywhere in filesystem; if false (default) only allow src within document_root
$PHPTHUMB_CONFIG['allow_src_above_phpthumb'] = true; // if true (default), allow src to be anywhere in filesystem; if false only allow src within sub-directory of phpThumb installation
$PHPTHUMB_CONFIG['allow_parameter_file'] = false; // if true, allow use of 'file' parameter; if false (default) the 'file' parameter is disabled/ignored
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/thumbs/phpThumb.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/thumbs/phpThumb.php 2012-12-12 00:09:45 UTC (rev 10366)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/thumbs/phpThumb.php 2012-12-12 06:28:17 UTC (rev 10367)
@@ -12,7 +12,7 @@
error_reporting(E_ALL);
ini_set('display_errors', '1');
ini_set('magic_quotes_runtime', '0');
-if (@ini_get('magic_quotes_runtime')) {
+if (ini_get('magic_quotes_runtime')) {
die('"magic_quotes_runtime" is set in php.ini, cannot run phpThumb with this enabled');
}
$starttime = array_sum(explode(' ', microtime()));
@@ -23,6 +23,88 @@
$_GET = $HTTP_GET_VARS;
}
+function SendSaveAsFileHeaderIfNeeded() {
+ if (headers_sent()) {
+ return false;
+ }
+ global $phpThumb;
+ $downloadfilename = phpthumb_functions::SanitizeFilename(@$_GET['sia'] ? $_GET['sia'] : (@$_GET['down'] ? $_GET['down'] : 'phpThumb_generated_thumbnail'.(@$_GET['f'] ? $_GET['f'] : 'jpg')));
+ if (@$downloadfilename) {
+ $phpThumb->DebugMessage('SendSaveAsFileHeaderIfNeeded() sending header: Content-Disposition: '.(@$_GET['down'] ? 'attachment' : 'inline').'; filename="'.$downloadfilename.'"', __FILE__, __LINE__);
+ header('Content-Disposition: '.(@$_GET['down'] ? 'attachment' : 'inline').'; filename="'.$downloadfilename.'"');
+ }
+ return true;
+}
+
+function PasswordStrength($password) {
+ $strength = 0;
+ $strength += strlen(preg_replace('#[^a-z]#', '', $password)) * 0.5; // lowercase characters are weak
+ $strength += strlen(preg_replace('#[^A-Z]#', '', $password)) * 0.8; // uppercase characters are somewhat better
+ $strength += strlen(preg_replace('#[^0-9]#', '', $password)) * 1.0; // numbers are somewhat better
+ $strength += strlen(preg_replace('#[a-zA-Z0-9]#', '', $password)) * 2.0; // other non-alphanumeric characters are best
+ return $strength;
+}
+
+function RedirectToCachedFile() {
+ global $phpThumb, $PHPTHUMB_CONFIG;
+
+ $nice_cachefile = str_replace(DIRECTORY_SEPARATOR, '/', $phpThumb->cache_filename);
+ $nice_docroot = str_replace(DIRECTORY_SEPARATOR, '/', rtrim($PHPTHUMB_CONFIG['document_root'], '/\\'));
+
+ $parsed_url = phpthumb_functions::ParseURLbetter(@$_SERVER['HTTP_REFERER']);
+
+ $nModified = filemtime($phpThumb->cache_filename);
+
+ if ($phpThumb->config_nooffsitelink_enabled && @$_SERVER['HTTP_REFERER'] && !in_array(@$parsed_url['host'], $phpThumb->config_nooffsitelink_valid_domains)) {
+
+ $phpThumb->DebugMessage('Would have used cached (image/'.$phpThumb->thumbnailFormat.') file "'.$phpThumb->cache_filename.'" (Last-Modified: '.gmdate('D, d M Y H:i:s', $nModified).' GMT), but skipping because $_SERVER[HTTP_REFERER] ('.@$_SERVER['HTTP_REFERER'].') is not in $phpThumb->config_nooffsitelink_valid_domains ('.implode(';', $phpThumb->config_nooffsitelink_valid_domains).')', __FILE__, __LINE__);
+
+ } elseif ($phpThumb->phpThumbDebug) {
+
+ $phpThumb->DebugTimingMessage('skipped using cached image', __FILE__, __LINE__);
+ $phpThumb->DebugMessage('Would have used cached file, but skipping due to phpThumbDebug', __FILE__, __LINE__);
+ $phpThumb->DebugMessage('* Would have sent headers (1): Last-Modified: '.gmdate('D, d M Y H:i:s', $nModified).' GMT', __FILE__, __LINE__);
+ if ($getimagesize = @GetImageSize($phpThumb->cache_filename)) {
+ $phpThumb->DebugMessage('* Would have sent headers (2): Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($getimagesize[2]), __FILE__, __LINE__);
+ }
+ if (preg_match('#^'.preg_quote($nice_docroot).'(.*)$#', $nice_cachefile, $matches)) {
+ $phpThumb->DebugMessage('* Would have sent headers (3): Location: '.dirname($matches[1]).'/'.urlencode(basename($matches[1])), __FILE__, __LINE__);
+ } else {
+ $phpThumb->DebugMessage('* Would have sent data: readfile('.$phpThumb->cache_filename.')', __FILE__, __LINE__);
+ }
+
+ } else {
+
+ if (headers_sent()) {
+ $phpThumb->ErrorImage('Headers already sent ('.basename(__FILE__).' line '.__LINE__.')');
+ exit;
+ }
+ SendSaveAsFileHeaderIfNeeded();
+
+ header('Last-Modified: '.gmdate('D, d M Y H:i:s', $nModified).' GMT');
+ if (@$_SERVER['HTTP_IF_MODIFIED_SINCE'] && ($nModified == strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE'])) && @$_SERVER['SERVER_PROTOCOL']) {
+ header($_SERVER['SERVER_PROTOCOL'].' 304 Not Modified');
+ exit;
+ }
+
+ if ($getimagesize = @GetImageSize($phpThumb->cache_filename)) {
+ header('Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($getimagesize[2]));
+ } elseif (preg_match('#\\.ico$#i', $phpThumb->cache_filename)) {
+ header('Content-Type: image/x-icon');
+ }
+ if (!@$PHPTHUMB_CONFIG['cache_force_passthru'] && preg_match('#^'.preg_quote($nice_docroot).'(.*)$#', $nice_cachefile, $matches)) {
+ header('Location: '.dirname($matches[1]).'/'.urlencode(basename($matches[1])));
+ } else {
+ @readfile($phpThumb->cache_filename);
+ }
+ exit;
+
+ }
+ return true;
+}
+
+
+
// instantiate a new phpThumb() object
ob_start();
if (!include_once(dirname(__FILE__).'/phpthumb.class.php')) {
@@ -48,16 +130,19 @@
// great
} else {
ob_end_flush();
+ $phpThumb->config_disable_debug = false; // otherwise error message won't print
$phpThumb->ErrorImage('failed to include_once('.dirname(__FILE__).'/phpThumb.config.php) - realpath="'.realpath(dirname(__FILE__).'/phpThumb.config.php').'"');
}
ob_end_clean();
} elseif (file_exists(dirname(__FILE__).'/phpThumb.config.php.default')) {
+ $phpThumb->config_disable_debug = false; // otherwise error message won't print
$phpThumb->ErrorImage('Please rename "phpThumb.config.php.default" to "phpThumb.config.php"');
} else {
+ $phpThumb->config_disable_debug = false; // otherwise error message won't print
$phpThumb->ErrorImage('failed to include_once('.dirname(__FILE__).'/phpThumb.config.php) - realpath="'.realpath(dirname(__FILE__).'/phpThumb.config.php').'"');
}
-if (!@$PHPTHUMB_CONFIG['disable_pathinfo_parsing'] && (empty($_GET) || isset($_GET['phpThumbDebug'])) && !empty($_SERVER['PATH_INFO'])) {
+if (empty($PHPTHUMB_CONFIG['disable_pathinfo_parsing']) && (empty($_GET) || isset($_GET['phpThumbDebug'])) && !empty($_SERVER['PATH_INFO'])) {
$_SERVER['PHP_SELF'] = str_replace($_SERVER['PATH_INFO'], '', @$_SERVER['PHP_SELF']);
$args = explode(';', substr($_SERVER['PATH_INFO'], 1));
@@ -65,12 +150,12 @@
if (!empty($args)) {
$_GET['src'] = @$args[count($args) - 1];
$phpThumb->DebugMessage('PATH_INFO."src" = "'.$_GET['src'].'"', __FILE__, __LINE__);
- if (eregi('^new\=([a-z0-9]+)', $_GET['src'], $matches)) {
+ if (preg_match('#^new\=([a-z0-9]+)#i', $_GET['src'], $matches)) {
unset($_GET['src']);
$_GET['new'] = $matches[1];
}
}
- if (eregi('^([0-9]*)x?([0-9]*)$', @$args[count($args) - 2], $matches)) {
+ if (preg_match('#^([0-9]*)x?([0-9]*)$#i', @$args[count($args) - 2], $matches)) {
$_GET['w'] = $matches[1];
$_GET['h'] = $matches[2];
$phpThumb->DebugMessage('PATH_INFO."w"x"h" set to "'.$_GET['w'].'"x"'.$_GET['h'].'"', __FILE__, __LINE__);
@@ -88,12 +173,16 @@
}
}
-if (@$PHPTHUMB_CONFIG['high_security_enabled']) {
- if (!@$_GET['hash']) {
+if (!empty($PHPTHUMB_CONFIG['high_security_enabled'])) {
+ if (empty($_GET['hash'])) {
+ $phpThumb->config_disable_debug = false; // otherwise error message won't print
$phpThumb->ErrorImage('ERROR: missing hash');
- } elseif (strlen($PHPTHUMB_CONFIG['high_security_password']) < 5) {
- $phpThumb->ErrorImage('ERROR: strlen($PHPTHUMB_CONFIG[high_security_password]) < 5');
+ } elseif (PasswordStrength($PHPTHUMB_CONFIG['high_security_password']) < 20) {
+ $phpThumb->config_disable_debug = false; // otherwise error message won't print
+ $phpThumb->ErrorImage('ERROR: $PHPTHUMB_CONFIG[high_security_password] is not complex enough');
} elseif ($_GET['hash'] != md5(str_replace('&hash='.$_GET['hash'], '', $_SERVER['QUERY_STRING']).$PHPTHUMB_CONFIG['high_security_password'])) {
+ sleep(10); // deliberate delay to discourage password-guessing
+ $phpThumb->config_disable_debug = false; // otherwise error message won't print
$phpThumb->ErrorImage('ERROR: invalid hash');
}
}
@@ -101,7 +190,7 @@
////////////////////////////////////////////////////////////////
// Debug output, to try and help me diagnose problems
$phpThumb->DebugTimingMessage('phpThumbDebug[0]', __FILE__, __LINE__);
-if (@$_GET['phpThumbDebug'] == '0') {
+if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '0')) {
$phpThumb->phpThumbDebug();
}
////////////////////////////////////////////////////////////////
@@ -121,12 +210,13 @@
}
}
-if (!@$_SERVER['PATH_INFO'] && !@$_SERVER['QUERY_STRING']) {
- $phpThumb->ErrorImage('phpThumb() v'.$phpThumb->phpthumb_version.'<br><a href="http://phpthumb.sourceforge.net">http://phpthumb.sourceforge.net</a><br><br>ERROR: no parameters specified');
+if (empty($_SERVER['PATH_INFO']) && empty($_SERVER['QUERY_STRING'])) {
+ $phpThumb->config_disable_debug = false; // otherwise error message won't print
+ $phpThumb->ErrorImage('ERROR: no parameters specified');
}
if (@$_GET['src'] && isset($_GET['md5s']) && empty($_GET['md5s'])) {
- if (eregi('^(f|ht)tps?://', $_GET['src'])) {
+ if (preg_match('#^(f|ht)tps?://#i', $_GET['src'])) {
if ($rawImageData = phpthumb_functions::SafeURLread($_GET['src'], $error, $phpThumb->config_http_fopen_timeout, $phpThumb->config_http_follow_redirect)) {
$md5s = md5($rawImageData);
}
@@ -149,7 +239,7 @@
foreach ($PHPTHUMB_CONFIG as $key => $value) {
$keyname = 'config_'.$key;
$phpThumb->setParameter($keyname, $value);
- if (!eregi('password|mysql', $key)) {
+ if (!preg_match('#(password|mysql)#i', $key)) {
$phpThumb->DebugMessage('setParameter('.$keyname.', '.$phpThumb->phpThumbDebugVarDump($value).')', __FILE__, __LINE__);
}
}
@@ -157,14 +247,14 @@
$phpThumb->DebugMessage('$PHPTHUMB_CONFIG is empty', __FILE__, __LINE__);
}
-if (@$_GET['src'] && !@$PHPTHUMB_CONFIG['allow_local_http_src'] && eregi('^http://'.@$_SERVER['HTTP_HOST'].'(.+)', @$_GET['src'], $matches)) {
+if (@$_GET['src'] && !@$PHPTHUMB_CONFIG['allow_local_http_src'] && preg_match('#^http://'.@$_SERVER['HTTP_HOST'].'(.+)#i', @$_GET['src'], $matches)) {
$phpThumb->ErrorImage('It is MUCH better to specify the "src" parameter as "'.$matches[1].'" instead of "'.$matches[0].'".'."\n\n".'If you really must do it this way, enable "allow_local_http_src" in phpThumb.config.php');
}
////////////////////////////////////////////////////////////////
// Debug output, to try and help me diagnose problems
$phpThumb->DebugTimingMessage('phpThumbDebug[1]', __FILE__, __LINE__);
-if (@$_GET['phpThumbDebug'] == '1') {
+if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '1')) {
$phpThumb->phpThumbDebug();
}
////////////////////////////////////////////////////////////////
@@ -174,7 +264,7 @@
$phpThumb->ErrorImage('config_nooffsitelink_require_refer enabled and '.(@$parsed_url_referer['host'] ? '"'.$parsed_url_referer['host'].'" is not an allowed referer' : 'no HTTP_REFERER exists'));
}
$parsed_url_src = phpthumb_functions::ParseURLbetter(@$_GET['src']);
-if ($phpThumb->config_nohotlink_enabled && $phpThumb->config_nohotlink_erase_image && eregi('^(f|ht)tps?://', @$_GET['src']) && !in_array(@$parsed_url_src['host'], $phpThumb->config_nohotlink_valid_domains)) {
+if ($phpThumb->config_nohotlink_enabled && $phpThumb->config_nohotlink_erase_image && preg_match('#^(f|ht)tps?://#i', @$_GET['src']) && !in_array(@$parsed_url_src['host'], $phpThumb->config_nohotlink_valid_domains)) {
$phpThumb->ErrorImage($phpThumb->config_nohotlink_text_message);
}
@@ -211,7 +301,7 @@
////////////////////////////////////////////////////////////////
// Debug output, to try and help me diagnose problems
$phpThumb->DebugTimingMessage('phpThumbDebug[2]', __FILE__, __LINE__);
-if (@$_GET['phpThumbDebug'] == '2') {
+if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '2')) {
$phpThumb->phpThumbDebug();
}
////////////////////////////////////////////////////////////////
@@ -231,7 +321,7 @@
// deprecated: 'err', 'file', 'goto',
$allowedGETparameters = array('src', 'new', 'w', 'h', 'wp', 'hp', 'wl', 'hl', 'ws', 'hs', 'f', 'q', 'sx', 'sy', 'sw', 'sh', 'zc', 'bc', 'bg', 'bgt', 'fltr', 'xto', 'ra', 'ar', 'aoe', 'far', 'iar', 'maxb', 'down', 'phpThumbDebug', 'hash', 'md5s', 'sfn', 'dpi', 'sia', 'nocache');
foreach ($_GET as $key => $value) {
- if (@$PHPTHUMB_DEFAULTS_DISABLEGETPARAMS && ($key != 'src')) {
+ if (!empty($PHPTHUMB_DEFAULTS_DISABLEGETPARAMS) && ($key != 'src')) {
// disabled, do not set parameter
$phpThumb->DebugMessage('ignoring $_GET['.$key.'] because of $PHPTHUMB_DEFAULTS_DISABLEGETPARAMS', __FILE__, __LINE__);
} elseif (in_array($key, $allowedGETparameters)) {
@@ -245,7 +335,7 @@
////////////////////////////////////////////////////////////////
// Debug output, to try and help me diagnose problems
$phpThumb->DebugTimingMessage('phpThumbDebug[3]', __FILE__, __LINE__);
-if (@$_GET['phpThumbDebug'] == '3') {
+if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '3')) {
$phpThumb->phpThumbDebug();
}
////////////////////////////////////////////////////////////////
@@ -266,14 +356,17 @@
$CanPassThroughDirectly = true;
if ($phpThumb->rawImageData) {
// data from SQL, should be fine
-} elseif (eregi('^http\://.+\.(jpe?g|gif|png)$', $phpThumb->src)) {
+} elseif (preg_match('#^http\://[^\\?&]+\\.(jpe?g|gif|png)$#i', $phpThumb->src)) {
// assume is ok to passthru if no other parameters specified
-} elseif (!@is_file($phpThumb->sourceFilename)) {
- $phpThumb->DebugMessage('$CanPassThroughDirectly=false because !@is_file('.$phpThumb->sourceFilename.')', __FILE__, __LINE__);
+} elseif (preg_match('#^(f|ht)tp\://#i', $phpThumb->src)) {
+ $phpThumb->DebugMessage('$CanPassThroughDirectly=false because preg_match("#^(f|ht)tp\://#i", '.$phpThumb->src.')', __FILE__, __LINE__);
$CanPassThroughDirectly = false;
} elseif (!@is_readable($phpThumb->sourceFilename)) {
$phpThumb->DebugMessage('$CanPassThroughDirectly=false because !@is_readable('.$phpThumb->sourceFilename.')', __FILE__, __LINE__);
$CanPassThroughDirectly = false;
+} elseif (!@is_file($phpThumb->sourceFilename)) {
+ $phpThumb->DebugMessage('$CanPassThroughDirectly=false because !@is_file('.$phpThumb->sourceFilename.')', __FILE__, __LINE__);
+ $CanPassThroughDirectly = false;
}
foreach ($_GET as $key => $value) {
switch ($key) {
@@ -284,7 +377,7 @@
case 'w':
case 'h':
// might be OK if exactly matches original
- if (eregi('^http\://.+\.(jpe?g|gif|png)$', $phpThumb->src)) {
+ if (preg_match('#^http\://[^\\?&]+\\.(jpe?g|gif|png)$#i', $phpThumb->src)) {
// assume it is not ok for direct-passthru of remote image
$CanPassThroughDirectly = false;
}
@@ -309,29 +402,16 @@
////////////////////////////////////////////////////////////////
// Debug output, to try and help me diagnose problems
$phpThumb->DebugTimingMessage('phpThumbDebug[4]', __FILE__, __LINE__);
-if (@$_GET['phpThumbDebug'] == '4') {
+if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '4')) {
$phpThumb->phpThumbDebug();
}
////////////////////////////////////////////////////////////////
-function SendSaveAsFileHeaderIfNeeded() {
- if (headers_sent()) {
- return false;
- }
- global $phpThumb;
- $downloadfilename = phpthumb_functions::SanitizeFilename(@$_GET['sia'] ? $_GET['sia'] : (@$_GET['down'] ? $_GET['down'] : 'phpThumb_generated_thumbnail'.(@$_GET['f'] ? $_GET['f'] : 'jpg')));
- if (@$downloadfilename) {
- $phpThumb->DebugMessage('SendSaveAsFileHeaderIfNeeded() sending header: Content-Disposition: '.(@$_GET['down'] ? 'attachment' : 'inline').'; filename="'.$downloadfilename.'"', __FILE__, __LINE__);
- header('Content-Disposition: '.(@$_GET['down'] ? 'attachment' : 'inline').'; filename="'.$downloadfilename.'"');
- }
- return true;
-}
-
$phpThumb->DebugMessage('$CanPassThroughDirectly="'.intval($CanPassThroughDirectly).'" && $phpThumb->src="'.$phpThumb->src.'"', __FILE__, __LINE__);
while ($CanPassThroughDirectly && $phpThumb->src) {
// no parameters set, passthru
- if (eregi('^http\://.+\.(jpe?g|gif|png)$', $phpThumb->src)) {
+ if (preg_match('#^http\://[^\\?&]+\.(jpe?g|gif|png)$#i', $phpThumb->src)) {
$phpThumb->DebugMessage('Passing HTTP source through directly as Location: redirect ('.$phpThumb->src.')', __FILE__, __LINE__);
header('Location: '.$phpThumb->src);
exit;
@@ -346,7 +426,7 @@
if (!@$_GET['w'] && !@$_GET['wp'] && !@$_GET['wl'] && !@$_GET['ws'] && !@$_GET['h'] && !@$_GET['hp'] && !@$_GET['hl'] && !@$_GET['hs']) {
// no resizing needed
$phpThumb->DebugMessage('Passing "'.$SourceFilename.'" through directly, no resizing required ("'.$phpThumb->getimagesizeinfo[0].'"x"'.$phpThumb->getimagesizeinfo[1].'")', __FILE__, __LINE__);
- } elseif ((($phpThumb->getimagesizeinfo[0] <= @$_GET['w']) || ($phpThumb->getimagesizeinfo[1] <= @$_GET['h'])) && ((@$_GET['w'] == $phpThumb->getimagesizeinfo[0]) || (@$_GET['h'] == $phpThumb->getimagesizeinfo[1]))) {
+ } elseif (($phpThumb->getimagesizeinfo[0] <= @$_GET['w']) && ($phpThumb->getimagesizeinfo[1] <= @$_GET['h']) && ((@$_GET['w'] == $phpThumb->getimagesizeinfo[0]) || (@$_GET['h'] == $phpThumb->getimagesizeinfo[1]))) {
// image fits into 'w'x'h' box, and at least one dimension matches exactly, therefore no resizing needed
$phpThumb->DebugMessage('Passing "'.$SourceFilename.'" through directly, no resizing required ("'.$phpThumb->getimagesizeinfo[0].'"x"'.$phpThumb->getimagesizeinfo[1].'" fits inside "'.@$_GET['w'].'"x"'.@$_GET['h'].'")', __FILE__, __LINE__);
} else {
@@ -407,72 +487,14 @@
////////////////////////////////////////////////////////////////
// Debug output, to try and help me diagnose problems
$phpThumb->DebugTimingMessage('phpThumbDebug[5]', __FILE__, __LINE__);
-if (@$_GET['phpThumbDebug'] == '5') {
+if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '5')) {
$phpThumb->phpThumbDebug();
}
////////////////////////////////////////////////////////////////
-function RedirectToCachedFile() {
- global $phpThumb, $PHPTHUMB_CONFIG;
-
- $nice_cachefile = str_replace(DIRECTORY_SEPARATOR, '/', $phpThumb->cache_filename);
- $nice_docroot = str_replace(DIRECTORY_SEPARATOR, '/', rtrim($PHPTHUMB_CONFIG['document_root'], '/\\'));
-
- $parsed_url = phpthumb_functions::ParseURLbetter(@$_SERVER['HTTP_REFERER']);
-
- $nModified = filemtime($phpThumb->cache_filename);
-
- if ($phpThumb->config_nooffsitelink_enabled && @$_SERVER['HTTP_REFERER'] && !in_array(@$parsed_url['host'], $phpThumb->config_nooffsitelink_valid_domains)) {
-
- $phpThumb->DebugMessage('Would have used cached (image/'.$phpThumb->thumbnailFormat.') file "'.$phpThumb->cache_filename.'" (Last-Modified: '.gmdate('D, d M Y H:i:s', $nModified).' GMT), but skipping because $_SERVER[HTTP_REFERER] ('.@$_SERVER['HTTP_REFERER'].') is not in $phpThumb->config_nooffsitelink_valid_domains ('.implode(';', $phpThumb->config_nooffsitelink_valid_domains).')', __FILE__, __LINE__);
-
- } elseif ($phpThumb->phpThumbDebug) {
-
- $phpThumb->DebugTimingMessage('skipped using cached image', __FILE__, __LINE__);
- $phpThumb->DebugMessage('Would have used cached file, but skipping due to phpThumbDebug', __FILE__, __LINE__);
- $phpThumb->DebugMessage('* Would have sent headers (1): Last-Modified: '.gmdate('D, d M Y H:i:s', $nModified).' GMT', __FILE__, __LINE__);
- if ($getimagesize = @GetImageSize($phpThumb->cache_filename)) {
- $phpThumb->DebugMessage('* Would have sent headers (2): Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($getimagesize[2]), __FILE__, __LINE__);
- }
- if (ereg('^'.preg_quote($nice_docroot).'(.*)$', $nice_cachefile, $matches)) {
- $phpThumb->DebugMessage('* Would have sent headers (3): Location: '.dirname($matches[1]).'/'.urlencode(basename($matches[1])), __FILE__, __LINE__);
- } else {
- $phpThumb->DebugMessage('* Would have sent data: readfile('.$phpThumb->cache_filename.')', __FILE__, __LINE__);
- }
-
- } else {
-
- if (headers_sent()) {
- $phpThumb->ErrorImage('Headers already sent ('.basename(__FILE__).' line '.__LINE__.')');
- exit;
- }
- SendSaveAsFileHeaderIfNeeded();
-
- header('Last-Modified: '.gmdate('D, d M Y H:i:s', $nModified).' GMT');
- if (@$_SERVER['HTTP_IF_MODIFIED_SINCE'] && ($nModified == strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE'])) && @$_SERVER['SERVER_PROTOCOL']) {
- header($_SERVER['SERVER_PROTOCOL'].' 304 Not Modified');
- exit;
- }
-
- if ($getimagesize = @GetImageSize($phpThumb->cache_filename)) {
- header('Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($getimagesize[2]));
- } elseif (eregi('\.ico$', $phpThumb->cache_filename)) {
- header('Content-Type: image/x-icon');
- }
- if (!@$PHPTHUMB_CONFIG['cache_force_passthru'] && ereg('^'.preg_quote($nice_docroot).'(.*)$', $nice_cachefile, $matches)) {
- header('Location: '.dirname($matches[1]).'/'.urlencode(basename($matches[1])));
- } else {
- @readfile($phpThumb->cache_filename);
- }
- exit;
-
- }
- return true;
-}
-
// check to see if file already exists in cache, and output it with no processing if it does
$phpThumb->SetCacheFilename();
-if (@is_file($phpThumb->cache_filename)) {
+if (@is_readable($phpThumb->cache_filename)) {
RedirectToCachedFile();
} else {
$phpThumb->DebugMessage('Cached file "'.$phpThumb->cache_filename.'" does not exist, processing as normal', __FILE__, __LINE__);
@@ -481,7 +503,7 @@
////////////////////////////////////////////////////////////////
// Debug output, to try and help me diagnose problems
$phpThumb->DebugTimingMessage('phpThumbDebug[6]', __FILE__, __LINE__);
-if (@$_GET['phpThumbDebug'] == '6') {
+if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '6')) {
$phpThumb->phpThumbDebug();
}
////////////////////////////////////////////////////////////////
@@ -490,7 +512,7 @@
// great
-} elseif (@$_GET['new']) {
+} elseif (!empty($_GET['new'])) {
// generate a blank image resource of the specified size/background color/opacity
if (($phpThumb->w <= 0) || ($phpThumb->h <= 0)) {
@@ -518,7 +540,7 @@
$phpThumb->ErrorImage('Usage: '.$_SERVER['PHP_SELF'].'?src=/path/and/filename.jpg'."\n".'read Usage comments for details');
-} elseif (eregi('^(f|ht)tp\://', $phpThumb->src)) {
+} elseif (preg_match('#^(f|ht)tp\://#i', $phpThumb->src)) {
$phpThumb->DebugMessage('$phpThumb->src ('.$phpThumb->src.') is remote image, attempting to download', __FILE__, __LINE__);
if ($phpThumb->config_http_user_agent) {
@@ -541,7 +563,7 @@
////////////////////////////////////////////////////////////////
// Debug output, to try and help me diagnose problems
$phpThumb->DebugTimingMessage('phpThumbDebug[7]', __FILE__, __LINE__);
-if (@$_GET['phpThumbDebug'] == '7') {
+if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '7')) {
$phpThumb->phpThumbDebug();
}
////////////////////////////////////////////////////////////////
@@ -551,28 +573,19 @@
////////////////////////////////////////////////////////////////
// Debug output, to try and help me diagnose problems
$phpThumb->DebugTimingMessage('phpThumbDebug[8]', __FILE__, __LINE__);
-if (@$_GET['phpThumbDebug'] == '8') {
+if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '8')) {
$phpThumb->phpThumbDebug();
}
////////////////////////////////////////////////////////////////
-if ($phpThumb->config_allow_parameter_file && $phpThumb->file) {
+if (!empty($PHPTHUMB_CONFIG['high_security_enabled']) && !empty($_GET['nocache'])) {
- $phpThumb->RenderToFile($phpThumb->ResolveFilenameToAbsolute($phpThumb->file));
- if ($phpThumb->config_allow_parameter_goto && $phpThumb->goto && eregi('^(f|ht)tps?://', $phpThumb->goto)) {
- // redirect to another URL after image has been rendered to file
- header('Location: '.$phpThumb->goto);
- exit;
- }
-
-} elseif (@$PHPTHUMB_CONFIG['high_security_enabled'] && @$_GET['nocache']) {
-
// cache disabled, don't write cachefile
} else {
phpthumb_functions::EnsureDirectoryExists(dirname($phpThumb->cache_filename));
- if ((file_exists($phpThumb->cache_filename) && is_writable($phpThumb->cache_filename)) || is_writable(dirname($phpThumb->cache_filename))) {
+ if (is_writable(dirname($phpThumb->cache_filename)) || (file_exists($phpThumb->cache_filename) && is_writable($phpThumb->cache_filename))) {
$phpThumb->CleanUpCacheDirectory();
if ($phpThumb->RenderToFile($phpThumb->cache_filename) && is_readable($phpThumb->cache_filename)) {
@@ -593,7 +606,7 @@
////////////////////////////////////////////////////////////////
// Debug output, to try and help me diagnose problems
$phpThumb->DebugTimingMessage('phpThumbDebug[9]', __FILE__, __LINE__);
-if (@$_GET['phpThumbDebug'] == '9') {
+if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '9')) {
$phpThumb->phpThumbDebug();
}
////////////////////////////////////////////////////////////////
@@ -605,7 +618,7 @@
////////////////////////////////////////////////////////////////
// Debug output, to try and help me diagnose problems
$phpThumb->DebugTimingMessage('phpThumbDebug[10]', __FILE__, __LINE__);
-if (@$_GET['phpThumbDebug'] == '10') {
+if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '10')) {
$phpThumb->phpThumbDebug();
}
////////////////////////////////////////////////////////////////
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/thumbs/phpthumb.class.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/thumbs/phpthumb.class.php 2012-12-12 00:09:45 UTC (rev 10366)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/thumbs/phpthumb.class.php 2012-12-12 06:28:17 UTC (rev 10367)
@@ -138,11 +138,9 @@
// * Security
var $config_high_security_enabled = false;
var $config_high_security_password = null;
- var $config_disable_debug = false;
+ var $config_disable_debug = true;
var $config_allow_src_above_docroot = false;
var $config_allow_src_above_phpthumb = true;
- var $config_allow_parameter_file = false;
- var $config_allow_parameter_goto = false;
// * HTTP fopen
var $config_http_fopen_timeout = 10;
@@ -199,14 +197,16 @@
var $thumbnail_image_width = null;
var $thumbnail_image_height = null;
- var $cache_filename = null;
+ var $tempFilesToDelete = array();
+ var $cache_filename = null;
var $AlphaCapableFormats = array('png', 'ico', 'gif');
var $is_alpha = false;
- var $iswindows = null;
+ var $iswindows = null;
+ var $issafemode = null;
- var $phpthumb_version = '1.7.9-200805132119';
+ var $phpthumb_version = '1.7.11-201108081537';
//////////////////////////////////////////////////////////////////////
@@ -215,17 +215,36 @@
$this->DebugTimingMessage('phpThumb() constructor', __FILE__, __LINE__);
$this->DebugMessage('phpThumb() v'.$this->phpthumb_version, __FILE__, __LINE__);
$this->config_max_source_pixels = round(max(intval(ini_get('memory_limit')), intval(get_cfg_var('memory_limit'))) * 1048576 * 0.20); // 20% of memory_limit
- $this->iswindows = (bool) (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN');
- $this->config_document_root = (@$_SERVER['DOCUMENT_ROOT'] ? $_SERVER['DOCUMENT_ROOT'] : $this->config_document_root);
- $this->config_cache_prefix = 'phpThumb_cache_'.@$_SERVER['SERVER_NAME'];
+ $this->iswindows = (bool) (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN');
+ $this->issafemode = (bool) preg_match('#(1|ON)#i', ini_get('safe_mode'));
+ $this->config_document_root = (!empty($_SERVER['DOCUMENT_ROOT']) ? $_SERVER['DOCUMENT_ROOT'] : $this->config_document_root);
+ $this->config_cache_prefix = ( isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'].'_' : '');
+ $this->purgeTempFiles(); // purge existing temp files if re-initializing object
+
$php_sapi_name = strtolower(function_exists('php_sapi_name') ? php_sapi_name() : '');
if ($php_sapi_name == 'cli') {
$this->config_allow_src_above_docroot = true;
}
}
+ function __destruct() {
+ $this->purgeTempFiles();
+ }
+
// public:
+ function purgeTempFiles() {
+ foreach ($this->tempFilesToDelete as $tempFileToDelete) {
+ if (file_exists($tempFileToDelete)) {
+ $this->DebugMessage('Deleting temp file "'.$tempFileToDelete.'"', __FILE__, __LINE__);
+ @unlink($tempFileToDelete);
+ }
+ }
+ $this->tempFilesToDelete = array();
+ return true;
+ }
+
+ // public:
function setSourceFilename($sourceFilename) {
//$this->resetObject();
//$this->rawImageData = null;
@@ -233,7 +252,7 @@
$this->src = $sourceFilename;
if (is_null($this->config_output_format)) {
$sourceFileExtension = strtolower(substr(strrchr($sourceFilename, '.'), 1));
- if (ereg('^[a-z]{3,4}$', $sourceFileExtension)) {
+ if (preg_match('#^[a-z]{3,4}$#', $sourceFileExtension)) {
$this->config_output_format = $sourceFileExtension;
$this->DebugMessage('setSourceFilename('.$sourceFilename.') set $this->config_output_format to "'.$sourceFileExtension.'"', __FILE__, __LINE__);
} else {
@@ -364,7 +383,7 @@
// $borderThickness = 0;
// if (!empty($this->fltr)) {
// foreach ($this->fltr as $key => $value) {
-// if (ereg('^bord\|([0-9]+)', $value, $matches)) {
+// if (preg_match('#^bord\|([0-9]+)#', $value, $matches)) {
// $borderThickness = $matches[1];
// break;
// }
@@ -517,7 +536,7 @@
// public:
function RenderToFile($filename) {
- if (eregi('^(f|ht)tps?\://', $filename)) {
+ if (preg_match('#^(f|ht)tps?\://#i', $filename)) {
$this->DebugMessage('RenderToFile() failed because $filename ('.$filename.') is a URL', __FILE__, __LINE__);
return false;
}
@@ -553,6 +572,8 @@
// public:
function OutputThumbnail() {
+ $this->purgeTempFiles();
+
if (!$this->useRawIMoutput && !is_resource($this->gdimg_output)) {
$this->DebugMessage('OutputThumbnail() failed because !is_resource($this->gdimg_output)', __FILE__, __LINE__);
return false;
@@ -649,7 +670,21 @@
// public:
function CleanUpCacheDirectory() {
- $this->DebugMessage('skipping CleanUpCacheDirectory() set to purge ('.number_format($this->config_cache_maxage / 86400, 1).' days; '.number_format($this->config_cache_maxsize / 1048576, 2).'MB; '.number_format($this->config_cache_maxfiles).' files)', __FILE__, __LINE__);
+ $this->DebugMessage('CleanUpCacheDirectory() set to purge ('.(is_null($this->config_cache_maxage) ? 'NULL' : number_format($this->config_cache_maxage / 86400, 1)).' days; '.(is_null($this->config_cache_maxsize) ? 'NULL' : number_format($this->config_cache_maxsize / 1048576, 2)).' MB; '.(is_null($this->config_cache_maxfiles) ? 'NULL' : number_format($this->config_cache_maxfiles)).' files)', __FILE__, __LINE__);
+
+ if (!is_writable($this->config_cache_directory)) {
+ $this->DebugMessage('CleanUpCacheDirectory() skipped because "'.$this->config_cache_directory.'" is not writable', __FILE__, __LINE__);
+ return true;
+ }
+
+ // cache status of cache directory for 1 hour to avoid hammering the filesystem functions
+ $phpThumbCacheStats_filename = $this->config_cache_directory.DIRECTORY_SEPARATOR.'phpThumbCacheStats.txt';
+ if (file_exists($phpThumbCacheStats_filename) && is_readable($phpThumbCacheStats_filename) && (filemtime($phpThumbCacheStats_filename) >= (time() - 3600))) {
+ $this->DebugMessage('CleanUpCacheDirectory() skipped because "'.$phpThumbCacheStats_filename.'" is recently modified', __FILE__, __LINE__);
+ return true;
+ }
+ touch($phpThumbCacheStats_filename);
+
$DeletedKeys = array();
$AllFilesInCacheDirectory = array();
if (($this->config_cache_maxage > 0) || ($this->config_cache_maxsize > 0) || ($this->config_cache_maxfiles > 0)) {
@@ -657,7 +692,7 @@
$CacheDirOldFilesSize = array();
$AllFilesInCacheDirectory = phpthumb_functions::GetAllFilesInSubfolders($this->config_cache_directory);
foreach ($AllFilesInCacheDirectory as $fullfilename) {
- if (eregi('^phpThumb_cache_', basename($fullfilename)) && file_exists($fullfilename)) {
+ if (preg_match('#^'.preg_quote($this->config_cache_prefix).'#i', $fullfilename) && file_exists($fullfilename)) {
$CacheDirOldFilesAge[$fullfilename] = @fileatime($fullfilename);
if ($CacheDirOldFilesAge[$fullfilename] == 0) {
$CacheDirOldFilesAge[$fullfilename] = @filemtime($fullfilename);
@@ -792,7 +827,7 @@
$class_vars = get_class_vars(get_class($this));
foreach ($class_vars as $key => $value) {
// do not clobber debug or config info
- if (!eregi('^(config_|debug|fatalerror)', $key)) {
+ if (!preg_match('#^(config_|debug|fatalerror)#i', $key)) {
$this->$key = $value;
}
}
@@ -823,7 +858,7 @@
}
if ($this->iswindows && ((substr($this->sourceFilename, 0, 2) == '//') || (substr($this->sourceFilename, 0, 2) == '\\\\'))) {
// Windows \\share\filename.ext
- } elseif (eregi('^(f|ht)tps?\://', $this->sourceFilename)) {
+ } elseif (preg_match('#^(f|ht)tps?\://#i', $this->sourceFilename)) {
// URL
if ($this->config_http_user_agent) {
ini_set('user_agent', $this->config_http_user_agent);
@@ -887,7 +922,7 @@
$AvailableImageOutputFormats = array_unique($AvailableImageOutputFormats);
$this->DebugMessage('$AvailableImageOutputFormats = array('.implode(';', $AvailableImageOutputFormats).')', __FILE__, __LINE__);
- $this->f = ereg_replace('[^a-z]', '', strtolower($this->f));
+ $this->f = preg_replace('#[^a-z]#', '', strtolower($this->f));
if (strtolower($this->config_output_format) == 'jpg') {
$this->config_output_format = 'jpeg';
}
@@ -912,7 +947,7 @@
// for JPEG images, quality 1 (worst) to 99 (best)
// quality < 25 is nasty, with not much size savings - not recommended
// problems with 100 - invalid JPEG?
- $this->thumbnailQuality = max(1, min(99, ($this->q ? $this->q : 75)));
+ $this->thumbnailQuality = max(1, min(99, ($this->q ? intval($this->q) : 75)));
$this->DebugMessage('$this->thumbnailQuality set to "'.$this->thumbnailQuality.'"', __FILE__, __LINE__);
return true;
@@ -922,7 +957,7 @@
// resolve cache directory to absolute pathname
$this->DebugMessage('setCacheDirectory() starting with config_cache_directory = "'.$this->config_cache_directory.'"', __FILE__, __LINE__);
if (substr($this->config_cache_directory, 0, 1) == '.') {
- if (eregi('^(f|ht)tps?\://', $this->src)) {
+ if (preg_match('#^(f|ht)tps?\://#i', $this->src)) {
if (!$this->config_cache_disable_warning) {
$this->ErrorImage('$this->config_cache_directory ('.$this->config_cache_directory.') cannot be used for remote images. Adjust "cache_directory" or "cache_disable_warning" in phpThumb.config.php');
}
@@ -972,12 +1007,11 @@
function ResolveFilenameToAbsolute($filename) {
- if (!$filename) {
+ if (empty($filename)) {
return false;
}
- //if (eregi('^(f|ht)tps?\://', $filename)) {
- if (eregi('^[a-z0-9]+\:/{1,2}', $filename)) {
+ if (preg_match('#^[a-z0-9]+\:/{1,2}#i', $filename)) {
// eg: http://host/path/file.jpg (HTTP URL)
// eg: ftp://host/path/file.jpg (FTP URL)
// eg: data1:/path/file.jpg (Netware path)
@@ -985,7 +1019,7 @@
//$AbsoluteFilename = $filename;
return $filename;
- } elseif ($this->iswindows && ($filename{1} == ':')) {
+ } elseif ($this->iswindows && isset($filename{1}) && ($filename{1} == ':')) {
// absolute pathname (Windows)
$AbsoluteFilename = $filename;
@@ -1002,7 +1036,7 @@
// absolute filename (*nix)
$AbsoluteFilename = $filename;
- } elseif ($filename{1} == '~') {
+ } elseif (isset($filename{1}) && ($filename{1} == '~')) {
// /~user/path
if ($ApacheLookupURIarray = phpthumb_functions::ApacheLookupURIarray($filename)) {
@@ -1021,7 +1055,7 @@
} else {
// relative filename (any OS)
- if (ereg('^'.preg_quote($this->config_document_root), $filename)) {
+ if (preg_match('#^'.preg_quote($this->config_document_root).'#', $filename)) {
$AbsoluteFilename = $filename;
$this->DebugMessage('ResolveFilenameToAbsolute() NOT prepending $this->config_document_root ('.$this->config_document_root.') to $filename ('.$filename.') resulting in ($AbsoluteFilename = "'.$AbsoluteFilename.'")', __FILE__, __LINE__);
} else {
@@ -1034,7 +1068,9 @@
} else {
// relative to current directory (any OS)
- $AbsoluteFilename = $this->config_document_root.dirname(@$_SERVER['PHP_SELF']).DIRECTORY_SEPARATOR.$filename;
+ //$AbsoluteFilename = $this->config_document_root.preg_replace('#[/\\\\]#', DIRECTORY_SEPARATOR, dirname(@$_SERVER['PHP_SELF'])).DIRECTORY_SEPARATOR.preg_replace('#[/\\\\]#', DIRECTORY_SEPARATOR, $filename);
+ $AbsoluteFilename = dirname(__FILE__).DIRECTORY_SEPARATOR.preg_replace('#[/\\\\]#', DIRECTORY_SEPARATOR, $filename);
+
//if (!@file_exists($AbsoluteFilename) && @file_exists(realpath($this->DotPadRelativeDirectoryPath($filename)))) {
// $AbsoluteFilename = realpath($this->DotPadRelativeDirectoryPath($filename));
//}
@@ -1063,20 +1099,40 @@
$AbsoluteFilename = realpath($AbsoluteFilename);
}
if ($this->iswindows) {
- $AbsoluteFilename = eregi_replace('^'.preg_quote(realpath($this->config_document_root)), realpath($this->config_document_root), $AbsoluteFilename);
+ $AbsoluteFilename = preg_replace('#^'.preg_quote(realpath($this->config_document_root)).'#i', realpath($this->config_document_root), $AbsoluteFilename);
$AbsoluteFilename = str_replace(DIRECTORY_SEPARATOR, '/', $AbsoluteFilename);
}
- if (!$this->config_allow_src_above_docroot && !ereg('^'.preg_quote(str_replace(DIRECTORY_SEPARATOR, '/', realpath($this->config_document_root))), $AbsoluteFilename)) {
+ if (!$this->config_allow_src_above_docroot && !preg_match('#^'.preg_quote(str_replace(DIRECTORY_SEPARATOR, '/', realpath($this->config_document_root))).'#', $AbsoluteFilename)) {
$this->DebugMessage('!$this->config_allow_src_above_docroot therefore setting "'.$AbsoluteFilename.'" (outside "'.realpath($this->config_document_root).'") to null', __FILE__, __LINE__);
return false;
}
- if (!$this->config_allow_src_above_phpthumb && !ereg('^'.preg_quote(str_replace(DIRECTORY_SEPARATOR, '/', dirname(__FILE__))), $AbsoluteFilename)) {
+ if (!$this->config_allow_src_above_phpthumb && !preg_match('#^'.preg_quote(str_replace(DIRECTORY_SEPARATOR, '/', dirname(__FILE__))).'#', $AbsoluteFilename)) {
$this->DebugMessage('!$this->config_allow_src_above_phpthumb therefore setting "'.$AbsoluteFilename.'" (outside "'.dirname(__FILE__).'") to null', __FILE__, __LINE__);
return false;
}
return $AbsoluteFilename;
}
+ function file_exists_ignoreopenbasedir($filename, $cached=true) {
+ static $open_basedirs = null;
+ static $file_exists_cache = array();
+ if (!$cached || !isset($file_exists_cache[$filename])) {
+ if (is_null($open_basedirs)) {
+ $open_basedirs = explode(';', ini_get('open_basedir'));
+ }
+ if (empty($open_basedirs) || in_array(dirname($filename), $open_basedirs)) {
+ $file_exists_cache[$filename] = file_exists($filename);
+ } elseif ($this->iswindows) {
+ $ls_filename = trim(phpthumb_functions::SafeExec('dir '.escapeshellarg($filename)));
+ $file_exists_cache[$filename] = !preg_match('#File Not Found#i', $ls_filename);
+ } else {
+ $ls_filename = trim(phpthumb_functions::SafeExec('ls '.escapeshellarg($filename)));
+ $file_exists_cache[$filename] = ($ls_filename == $filename);
+ }
+ }
+ return $file_exists_cache[$filename];
+ }
+
function ImageMagickWhichConvert() {
static $WhichConvert = null;
if (is_null($WhichConvert)) {
@@ -1092,6 +1148,10 @@
function ImageMagickCommandlineBase() {
static $commandline = null;
if (is_null($commandline)) {
+ if ($this->issafemode) {
+ $commandline = '';
+ return $commandline;
+ }
$commandline = (!is_null($this->config_imagemagick_path) ? $this->config_imagemagick_path : '');
if ($this->config_imagemagick_path && ($this->config_imagemagick_path != realpath($this->config_imagemagick_path))) {
@@ -1102,14 +1162,17 @@
$this->DebugMessage('Leaving $this->config_imagemagick_path as ('.$this->config_imagemagick_path.') because !is_execuatable(realpath($this->config_imagemagick_path)) ('.realpath($this->config_imagemagick_path).')', __FILE__, __LINE__);
}
}
- $this->DebugMessage(' file_exists('.$this->config_imagemagick_path.') = '.intval( @file_exists($this->config_imagemagick_path)), __FILE__, __LINE__);
- $this->DebugMessage('is_executable('.$this->config_imagemagick_path.') = '.intval(@is_executable($this->config_imagemagick_path)), __FILE__, __LINE__);
- if (@file_exists($this->config_imagemagick_path)) {
+ $this->DebugMessage(' file_exists('.$this->config_imagemagick_path.') = '.intval( @file_exists($this->config_imagemagick_path)), __FILE__, __LINE__);
+ $this->DebugMessage('file_exists_ignoreopenbasedir('.$this->config_imagemagick_path.') = '.intval($this->file_exists_ignoreopenbasedir($this->config_imagemagick_path)), __FILE__, __LINE__);
+ $this->DebugMessage(' is_file('.$this->config_imagemagick_path.') = '.intval( @is_file($this->config_imagemagick_path)), __FILE__, __LINE__);
+ $this->DebugMessage(' is_executable('.$this->config_imagemagick_path.') = '.intval( @is_executable($this->config_imagemagick_path)), __FILE__, __LINE__);
+
+ if ($this->file_exists_ignoreopenbasedir($this->config_imagemagick_path)) {
$this->DebugMessage('using ImageMagick path from $this->config_imagemagick_path ('.$this->config_imagemagick_path.')', __FILE__, __LINE__);
if ($this->iswindows) {
- $commandline = substr($this->config_imagemagick_path, 0, 2).' && cd "'.str_replace('/', DIRECTORY_SEPARATOR, substr(dirname($this->config_imagemagick_path), 2)).'" && '.basename($this->config_imagemagick_path);
+ $commandline = substr($this->config_imagemagick_path, 0, 2).' && cd '.escapeshellarg(str_replace('/', DIRECTORY_SEPARATOR, substr(dirname($this->config_imagemagick_path), 2))).' && '.escapeshellarg(basename($this->config_imagemagick_path));
} else {
- $commandline = '"'.$this->config_imagemagick_path.'"';
+ $commandline = escapeshellarg($this->config_imagemagick_path);
}
return $commandline;
}
@@ -1117,7 +1180,7 @@
$which_convert = $this->ImageMagickWhichConvert();
$IMversion = $this->ImageMagickVersion();
- if ($which_convert && ($which_convert{0} == '/') && @file_exists($which_convert)) {
+ if ($which_convert && ($which_convert{0} == '/') && $this->file_exists_ignoreopenbasedir($which_convert)) {
// `which convert` *should* return the path if "convert" exist, or nothing if it doesn't
// other things *may* get returned, like "sh: convert: not found" or "no convert in /usr/local/bin /usr/sbin /usr/bin /usr/ccs/bin"
@@ -1143,24 +1206,24 @@
function ImageMagickVersion($returnRAW=false) {
static $versionstring = null;
if (is_null($versionstring)) {
+ $versionstring = array(0=>false, 1=>false);
$commandline = $this->ImageMagickCommandlineBase();
$commandline = (!is_null($commandline) ? $commandline : '');
- $versionstring = array(0=>'', 1=>'');
if ($commandline) {
$commandline .= ' --version';
$this->DebugMessage('ImageMagick version checked with "'.$commandline.'"', __FILE__, __LINE__);
$versionstring[1] = trim(phpthumb_functions::SafeExec($commandline));
- if (eregi('^Version: [^0-9]*([ 0-9\\.\\:Q/]+) (http|file)\:', $versionstring[1], $matches)) {
+ if (preg_match('#^Version: [^0-9]*([ 0-9\\.\\:Q/\\-]+) (http|file)\:#i', $versionstring[1], $matches)) {
$versionstring[0] = $matches[1];
} else {
$versionstring[0] = false;
$this->DebugMessage('ImageMagick did not return recognized version string ('.$versionstring[1].')', __FILE__, __LINE__);
}
- $this->DebugMessage('ImageMagick convert --version says "'.$matches[0].'"', __FILE__, __LINE__);
+ $this->DebugMessage('ImageMagick convert --version says "'.@$matches[0].'"', __FILE__, __LINE__);
}
}
- return @$versionstring[intval($returnRAW)];
+ return $versionstring[intval($returnRAW)];
}
function ImageMagickSwitchAvailable($switchname) {
@@ -1172,7 +1235,7 @@
$commandline .= ' -help';
$IMhelp_lines = explode("\n", phpthumb_functions::SafeExec($commandline));
foreach ($IMhelp_lines as $line) {
- if (ereg('^[\+\-]([a-z\-]+) ', trim($line), $matches)) {
+ if (preg_match('#^[\\+\\-]([a-z\\-]+) #', trim($line), $matches)) {
$IMoptions[$matches[1]] = true;
}
}
@@ -1288,14 +1351,26 @@
}
}
+ // http://freealter.org/doc_distrib/ImageMagick-5.1.1/www/convert.html
if (!$this->sourceFilename && $this->rawImageData) {
- !$this->SourceDataToTempFile();
+ $this->SourceDataToTempFile();
}
if (!$this->sourceFilename) {
$this->DebugMessage('ImageMagickThumbnailToGD() aborting because $this->sourceFilename is empty', __FILE__, __LINE__);
$this->useRawIMoutput = false;
return false;
}
+ if ($this->issafemode) {
+ $this->DebugMessage('ImageMagickThumbnailToGD() aborting because safe_mode is enabled', __FILE__, __LINE__);
+ $this->useRawIMoutput = false;
+ return false;
+ }
+// TO BE FIXED
+//if (true) {
+// $this->DebugMessage('ImageMagickThumbnailToGD() aborting it is broken right now', __FILE__, __LINE__);
+// $this->useRawIMoutput = false;
+// return false;
+//}
$commandline = $this->ImageMagickCommandlineBase();
if ($commandline) {
@@ -1309,9 +1384,9 @@
$IMresizeParameter = 'resize';
// some (older? around 2002) versions of IM won't accept "-resize 100x" but require "-resize 100x100"
- $commandline_test = $this->ImageMagickCommandlineBase().' logo: -resize 1x "'.$IMtempfilename.'" 2>&1';
+ $commandline_test = $this->ImageMagickCommandlineBase().' logo: -resize 1x '.escapeshellarg($IMtempfilename).' 2>&1';
$IMresult_test = phpthumb_functions::SafeExec($commandline_test);
- $IMuseExplicitImageOutputDimensions = eregi('image dimensions are zero', $IMresult_test);
+ $IMuseExplicitImageOutputDimensions = preg_match('#image dimensions are zero#i', $IMresult_test);
$this->DebugMessage('IMuseExplicitImageOutputDimensions = '.intval($IMuseExplicitImageOutputDimensions), __FILE__, __LINE__);
if ($fp_im_temp = @fopen($IMtempfilename, 'wb')) {
// erase temp image so ImageMagick logo doesn't get output if other processing fails
@@ -1322,7 +1397,7 @@
if (!is_null($this->dpi) && $this->ImageMagickSwitchAvailable('density')) {
// for raster source formats only (WMF, PDF, etc)
- $commandline .= ' -density '.$this->dpi;
+ $commandline .= ' -density '.escapeshellarg($this->dpi);
}
ob_start();
$getimagesize = GetImageSize($this->sourceFilename);
@@ -1340,16 +1415,14 @@
$this->DebugMessage('source dimensions set to '.$this->source_width.'x'.$this->source_height, __FILE__, __LINE__);
$this->SetOrientationDependantWidthHeight();
- if (!eregi('('.implode('|', $this->AlphaCapableFormats).')', $outputFormat)) {
+ if (!preg_match('#('.implode('|', $this->AlphaCapableFormats).')#i', $outputFormat)) {
// not a transparency-capable format
- $commandline .= ' -background "#'.($this->bg ? $this->bg : 'FFFFFF').'"';
- if ($getimagesize[2] == 1) {
- // GIF
+ $commandline .= ' -background '.escapeshellarg('#'.($this->bg ? $this->bg : 'FFFFFF'));
+ if ($getimagesize[2] == IMAGETYPE_GIF) {
$commandline .= ' -flatten';
}
}
- if ($getimagesize[2] == 1) {
- // GIF
+ if ($getimagesize[2] == IMAGETYPE_GIF) {
$commandline .= ' -coalesce'; // may be needed for animated GIFs
}
if ($this->source_width || $this->source_height) {
@@ -1358,7 +1431,7 @@
$borderThickness = 0;
if (!empty($this->fltr)) {
foreach ($this->fltr as $key => $value) {
- if (ereg('^bord\|([0-9]+)', $value, $matches)) {
+ if (preg_match('#^bord\|([0-9]+)#', $value, $matches)) {
$borderThickness = $matches[1];
break;
}
@@ -1373,11 +1446,7 @@
$sideY = phpthumb_functions::nonempty_min( $this->source_height, $hAll, round($wAll / $zcAR));
$thumbnailH = round(max($sideY, ($sideY * $zcAR) / $imAR));
- if ($IMuseExplicitImageOutputDimensions) {
- $commandline .= ' -'.$IMresizeParameter.' '.$thumbnailH.'x'.$thumbnailH;
- } else {
- $commandline .= ' -'.$IMresizeParameter.' x'.$thumbnailH;
- }
+ $commandline .= ' -'.$IMresizeParameter.' '.escapeshellarg(($IMuseExplicitImageOutputDimensions ? $thumbnailH : '').'x'.$thumbnailH);
switch (strtoupper($this->zc)) {
case 'T':
@@ -1412,9 +1481,9 @@
}
if (($wAll > 0) && ($hAll > 0)) {
- $commandline .= ' -crop '.$wAll.'x'.$hAll.'+0+0';
+ $commandline .= ' -crop '.escapeshellarg($wAll.'x'.$hAll.'+0+0');
} else {
- $commandline .= ' -crop '.$side.'x'.$side.'+0+0';
+ $commandline .= ' -crop '.escapeshellarg($side.'x'.$side.'+0+0');
}
if ($this->ImageMagickSwitchAvailable('repage')) {
$commandline .= ' +repage';
@@ -1424,10 +1493,23 @@
} elseif ($this->sw || $this->sh || $this->sx || $this->sy) {
- $commandline .= ' -crop '.($this->sw ? $this->sw : $this->source_width).'x'.($this->sh ? $this->sh : $this->source_height).'+'.$this->sx.'+'.$this->sy;
+ $crop_param = '';
+ $crop_param .= ($this->sw ? (($this->sw < 2) ? round($this->sw * $this->source_width) : $this->sw) : $this->source_width);
+ $crop_param .= 'x'.($this->sh ? (($this->sh < 2) ? round($this->sh * $this->source_height) : $this->sh) : $this->source_height);
+ $crop_param .= '+'.(($this->sx < 2) ? round($this->sx * $this->source_width) : $this->sx);
+ $crop_param .= '+'.(($this->sy < 2) ? round($this->sy * $this->source_height) : $this->sy);
+// TO BE FIXED
+// makes 1x1 output
+// http://trainspotted.com/phpThumb/phpThumb.php?src=/content/CNR/47/CNR-4728-LD-L-20110723-898.jpg&w=100&h=100&far=1&f=png&fltr[]=lvl&sx=0.05&sy=0.25&sw=0.92&sh=0.42
+// '/usr/bin/convert' -density 150 -thumbnail 100x100 -contrast-stretch '0.1%' '/var/www/vhosts/trainspotted.com/httpdocs/content/CNR/47/CNR-4728-LD-L-20110723-898.jpg[0]' png:'/var/www/vhosts/trainspotted.com/httpdocs/phpThumb/_cache/pThumbIIUlvj'
+// $commandline .= ' -crop '.escapeshellarg($crop_param);
+
// this is broken for aoe=1, but unsure how to fix. Send advice to in...@si...
if ($this->w || $this->h) {
- if ($this->ImageMagickSwitchAvailable('repage')) {
+ //if ($this->ImageMagickSwitchAvailable('repage')) {
+if (false) {
+// TO BE FIXED
+// newer versions of ImageMagick require -repage <geometry>
$commandline .= ' -repage';
} else {
$this->DebugMessage('Skipping "-repage" because ImageMagick (v'.$this->ImageMagickVersion().') does not support it', __FILE__, __LINE__);
@@ -1439,17 +1521,16 @@
$this->w = ceil($this->h * ($this->source_width / $this->source_height));
}
}
- $commandline .= ' -'.$IMresizeParameter.' '.$this->w.'x'.$this->h;
+ $commandline .= ' -'.$IMresizeParameter.' '.escapeshellarg($this->w.'x'.$this->h);
}
} else {
if ($this->iar && (intval($this->w) > 0) && (intval($this->h) > 0)) {
- //$commandline .= ' -'.$IMresizeParameter.' '.$this->w.'x'.$this->h.'!';
list($nw, $nh) = phpthumb_functions::TranslateWHbyAngle($this->w, $this->h, $this->ra);
$nw = ((round($nw) != 0) ? round($nw) : '');
$nh = ((round($nh) != 0) ? round($nh) : '');
- $commandline .= ' -'.$IMresizeParameter.' '.$nw.'x'.$nh.'!';
+ $commandline .= ' -'.$IMresizeParameter.' '.escapeshellarg($nw.'x'.$nh.'!');
} else {
$this->w = ((($this->aoe || $this->far) && $this->w) ? $this->w : ($this->w ? phpthumb_functions::nonempty_min($this->w, $getimagesize[0]) : ''));
$this->h = ((($this->aoe || $this->far) && $this->h) ? $this->h : ($this->h ? phpthumb_functions::nonempty_min($this->h, $getimagesize[1]) : ''));
@@ -1461,11 +1542,10 @@
$this->w = ceil($this->h * ($this->source_width / $this->source_height));
}
}
- //$commandline .= ' -'.$IMresizeParameter.' '.$this->w.'x'.$this->h;
list($nw, $nh) = phpthumb_functions::TranslateWHbyAngle($this->w, $this->h, $this->ra);
$nw = ((round($nw) != 0) ? round($nw) : '');
$nh = ((round($nh) != 0) ? round($nh) : '');
- $commandline .= ' -'.$IMresizeParameter.' '.$nw.'x'.$nh;
+ $commandline .= ' -'.$IMresizeParameter.' '.escapeshellarg($nw.'x'.$nh);
}
}
}
@@ -1475,15 +1555,13 @@
$this->DebugMessage('GetImageSize('.$this->sourceFilename.') failed', __FILE__, __LINE__);
if ($this->w || $this->h) {
+ $exactDimensionsBang = (($this->iar && (intval($this->w) > 0) && (intval($this->h) > 0)) ? '!' : '');
if ($IMuseExplicitImageOutputDimensions) {
- // unknown source aspect ration, just put large number and hope IM figures it out
- $commandline .= ' -'.$IMresizeParameter.' '.($this->w ? $this->w : '9999').'x'.($this->h ? $this->h : '9999');
+ // unknown source aspect ratio, just put large number and hope IM figures it out
+ $commandline .= ' -'.$IMresizeParameter.' '.escapeshellarg(($this->w ? $this->w : '9999').'x'.($this->h ? $this->h : '9999').$exactDimensionsBang);
} else {
- $commandline .= ' -'.$IMresizeParameter.' '.$this->w.'x'.$this->h;
+ $commandline .= ' -'.$IMresizeParameter.' '.escapeshellarg($this->w.'x'.$this->h.$exactDimensionsBang);
}
- if ($this->iar && (intval($this->w) > 0) && (intval($this->h) > 0)) {
- $commandline .= '!';
- }
}
}
@@ -1491,15 +1569,15 @@
if ($this->ra) {
$this->ra = intval($this->ra);
if ($this->ImageMagickSwitchAvailable('rotate')) {
- if (!eregi('('.implode('|', $this->AlphaCapableFormats).')', $outputFormat) || phpthumb_functions::version_compare_replacement($this->ImageMagickVersion(), '6.3.7', '>=')) {
+ if (!preg_match('#('.implode('|', $this->AlphaCapableFormats).')#i', $outputFormat) || phpthumb_functions::version_compare_replacement($this->ImageMagickVersion(), '6.3.7', '>=')) {
$this->DebugMessage('Using ImageMagick rotate', __FILE__, __LINE__);
- $commandline .= ' -rotate '.$this->ra;
+ $commandline .= ' -rotate '.escapeshellarg($this->ra);
if (($this->ra % 90) != 0) {
- if (eregi('('.implode('|', $this->AlphaCapableFormats).')', $outputFormat)) {
+ if (preg_match('#('.implode('|', $this->AlphaCapableFormats).')#i', $outputFormat)) {
// alpha-capable format
$commandline .= ' -background rgba(255,255,255,0)';
} else {
- $commandline .= ' -background "#'.($this->bg ? $this->bg : 'FFFFFF').'"';
+ $commandline .= ' -background '.escapeshellarg('#'.($this->bg ? $this->bg : 'FFFFFF'));
}
}
$this->ra = 0;
@@ -1517,19 +1595,21 @@
switch ($command) {
case 'brit':
if ($this->ImageMagickSwitchAvailable('modulate')) {
- $commandline .= ' -modulate '.(100 + $parameter).',100,100';
+ $commandline .= ' -modulate '.escapeshellarg((100 + intval($parameter)).',100,100');
$successfullyProcessedFilters[] = $filterkey;
}
break;
case 'cont':
if ($this->ImageMagickSwitchAvailable('contrast')) {
- $contDiv10 = round($parameter / 10);
+ $contDiv10 = round(intval($parameter) / 10);
if ($contDiv10 > 0) {
+ $contDiv10 = min($contDiv10, 100);
for ($i = 0; $i < $contDiv10; $i++) {
$commandline .= ' -contrast'; /...
[truncated message content] |
|
From: <tr...@us...> - 2012-12-12 00:09:48
|
Revision: 10366
http://sourceforge.net/p/xoops/svn/10366
Author: trabis
Date: 2012-12-12 00:09:45 +0000 (Wed, 12 Dec 2012)
Log Message:
-----------
Fixing small bugs
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/userutility.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsload.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopslocal.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/userutility.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/userutility.php 2012-12-11 23:01:05 UTC (rev 10365)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/userutility.php 2012-12-12 00:09:45 UTC (rev 10366)
@@ -254,25 +254,25 @@
/**
* XoopsUserUtility::getUnameFromIds()
*
- * @param int $uid
- * @param bool $usereal
- * @param bool $linked
+ * @param array $uids
+ * @param bool $usereal
+ * @param bool $linked
*
* @return array
*/
- static function getUnameFromIds($uid, $usereal = false, $linked = false)
+ static function getUnameFromIds($uids, $usereal = false, $linked = false)
{
$xoops = Xoops::getInstance();
- if (!is_array($uid)) {
- $uid = array($uid);
+ if (!is_array($uids)) {
+ $uids = array($uids);
}
- $userid = array_map('intval', array_filter($uid));
+ $userids = array_map('intval', array_filter($uids));
$myts = MyTextSanitizer::getInstance();
$users = array();
- if (count($userid) > 0) {
+ if (count($userids) > 0) {
$criteria = new CriteriaCompo(new Criteria('level', 0, '>'));
- $criteria->add(new Criteria('uid', "('" . implode(',', array_unique($userid)) . "')", 'IN'));
+ $criteria->add(new Criteria('uid', "('" . implode(',', array_unique($userids)) . "')", 'IN'));
$user_handler = $xoops->getHandlerUser();
if (!$rows = $user_handler->getAll($criteria, array('uid', 'uname', 'name'), false, true)) {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsload.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsload.php 2012-12-11 23:01:05 UTC (rev 10365)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsload.php 2012-12-12 00:09:45 UTC (rev 10366)
@@ -333,7 +333,7 @@
'xoopsmembershiphandler' => XOOPS_ROOT_PATH . '/kernel/membership.php',
'xoopsmodelfactory' => XOOPS_ROOT_PATH . '/class/model/xoopsmodel.php',
'xoopsmoduleadmin' => XOOPS_ROOT_PATH . '/class/moduleadmin.php',
- 'xoopsmodules' => XOOPS_ROOT_PATH . '/kernel/module.php',
+ 'xoopsmodule' => XOOPS_ROOT_PATH . '/kernel/module.php',
'xoopsmodulehandler' => XOOPS_ROOT_PATH . '/kernel/module.php',
'xoopsmultimailer' => XOOPS_ROOT_PATH . '/class/mail/xoopsmultimailer.php',
'xoopsnotification' => XOOPS_ROOT_PATH . '/kernel/notification.php',
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopslocal.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopslocal.php 2012-12-11 23:01:05 UTC (rev 10365)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopslocal.php 2012-12-12 00:09:45 UTC (rev 10366)
@@ -260,9 +260,7 @@
*/
public function __call($name, $args)
{
- exit($name);
if (function_exists($name)) {
- exit($name);
return call_user_func_array($name, $args);
}
return null;
|
|
From: <txm...@us...> - 2012-12-11 23:01:08
|
Revision: 10365
http://sourceforge.net/p/xoops/svn/10365
Author: txmodxoops
Date: 2012-12-11 23:01:05 +0000 (Tue, 11 Dec 2012)
Log Message:
-----------
Modified for mobile
Added Paths:
-----------
XoopsCore/tags/2.5mobile timgno/htdocs/class/xoopsform/formtext.php
Added: XoopsCore/tags/2.5mobile timgno/htdocs/class/xoopsform/formtext.php
===================================================================
--- XoopsCore/tags/2.5mobile timgno/htdocs/class/xoopsform/formtext.php (rev 0)
+++ XoopsCore/tags/2.5mobile timgno/htdocs/class/xoopsform/formtext.php 2012-12-11 23:01:05 UTC (rev 10365)
@@ -0,0 +1,127 @@
+<?php
+/**
+ * XOOPS form element
+ *
+ * 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 Kazumi Ono (AKA onokazu) http://www.myweb.ne.jp/, http://jp.xoops.org/
+ * @version $Id: formtext.php 8066 2011-11-06 05:09:33Z beckmi $
+ */
+
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
+/**
+ * A simple text field
+ */
+class XoopsFormText extends XoopsFormElement
+{
+ /**
+ * Size
+ *
+ * @var int
+ * @access private
+ */
+ var $_size;
+
+ /**
+ * Maximum length of the text
+ *
+ * @var int
+ * @access private
+ */
+ var $_maxlength;
+
+ /**
+ * Initial text
+ *
+ * @var string
+ * @access private
+ */
+ var $_value;
+
+ /**
+ * Constructor
+ *
+ * @param string $caption Caption
+ * @param string $name "name" attribute
+ * @param int $size Size
+ * @param int $maxlength Maximum length of text
+ * @param string $value Initial text
+ */
+ function XoopsFormText($caption, $name, $size, $maxlength, $value = '')
+ {
+ $this->setCaption($caption);
+ $this->setName($name);
+ $this->_size = intval($size);
+ $this->_maxlength = intval($maxlength);
+ $this->setValue($value);
+ }
+
+ /**
+ * Get size
+ *
+ * @return int
+ */
+ function getSize()
+ {
+ return $this->_size;
+ }
+
+ /**
+ * Get maximum text length
+ *
+ * @return int
+ */
+ function getMaxlength()
+ {
+ return $this->_maxlength;
+ }
+
+ /**
+ * Get initial content
+ *
+ * @param bool $encode To sanitizer the text? Default value should be "true"; however we have to set "false" for backward compat
+ * @return string
+ */
+ function getValue($encode = false)
+ {
+ return $encode ? htmlspecialchars($this->_value, ENT_QUOTES) : $this->_value;
+ }
+
+ /**
+ * Set initial text value
+ *
+ * @param $value string
+ */
+ function setValue( |
|
From: <txm...@us...> - 2012-12-11 22:01:55
|
Revision: 10364
http://sourceforge.net/p/xoops/svn/10364
Author: txmodxoops
Date: 2012-12-11 22:01:54 +0000 (Tue, 11 Dec 2012)
Log Message:
-----------
Modified for mobile
Added Paths:
-----------
XoopsCore/tags/2.5mobile timgno/htdocs/class/
XoopsCore/tags/2.5mobile timgno/htdocs/class/xoopsform/
XoopsCore/tags/2.5mobile timgno/htdocs/class/xoopsform/formradio.php
Added: XoopsCore/tags/2.5mobile timgno/htdocs/class/xoopsform/formradio.php
===================================================================
--- XoopsCore/tags/2.5mobile timgno/htdocs/class/xoopsform/formradio.php (rev 0)
+++ XoopsCore/tags/2.5mobile timgno/htdocs/class/xoopsform/formradio.php 2012-12-11 22:01:54 UTC (rev 10364)
@@ -0,0 +1,208 @@
+<?php
+/**
+ * XOOPS form radio compo
+ *
+ * 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://www.xoops.org/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package kernel
+ * @since 2.0
+ * @author Kazumi Ono (AKA onokazu) http://www.myweb.ne.jp/, http://jp.xoops.org/
+ * @author Taiwen Jiang <ph...@us...>
+ * @version $Id: formradio.php 8066 2011-11-06 05:09:33Z beckmi $
+ * @package kernel
+ * @subpackage form
+ * @todo template
+ */
+class XoopsFormRadio extends XoopsFormElement
+{
+ /**
+ * Array of Options
+ *
+ * @var array
+ * @access private
+ */
+ var $_options = array();
+
+ /**
+ * Pre-selected value
+ *
+ * @var string
+ * @access private
+ */
+ var $_value = null;
+
+ /**
+ * HTML to seperate the elements
+ *
+ * @var string
+ * @access private
+ */
+ var $_delimeter;
+
+ /**
+ * Column number for rendering
+ *
+ * @var int
+ * @access public
+ */
+ var $columns;
+
+ /**
+ * Constructor
+ *
+ * @param string $caption Caption
+ * @param string $name "name" attribute
+ * @param string $value Pre-selected value
+ */
+ function XoopsFormRadio($caption, $name, $value = null, $delimeter = ' ')
+ {
+ $this->setCaption($caption);
+ $this->setName($name);
+ if (isset($value)) {
+ $this->setValue($value);
+ }
+ $this->_delimeter = $delimeter;
+ }
+
+ /**
+ * Get the "value" attribute
+ *
+ * @param bool $encode To sanitizer the text?
+ * @return string
+ */
+ function getValue($encode = false)
+ {
+ return ($encode && $this->_value !== null) ? htmlspecialchars($this->_value, ENT_QUOTES) : $this->_value;
+ }
+
+ /**
+ * Set the pre-selected value
+ *
+ * @param $value string
+ */
+ function setValue($value)
+ {
+ $this->_value = $value;
+ }
+
+ /**
+ * Add an option
+ *
+ * @param string $value "value" attribute - This gets submitted as form-data.
+ * @param string $name "name" attribute - This is displayed. If empty, we use the "value" instead.
+ */
+ function addOption($value, $name = '')
+ {
+ if ($name != '') {
+ $this->_options[$value] = $name;
+ } else {
+ $this->_options[$value] = $value;
+ }
+ }
+
+ /**
+ * Adds multiple options
+ *
+ * @param array $options Associative array of value->name pairs.
+ */
+ function addOptionArray($options)
+ {
+ if (is_array($options)) {
+ foreach($options as $k => $v) {
+ $this->addOption($k, $v);
+ }
+ }
+ }
+
+ /**
+ * Get an array with all the options
+ *
+ * @param int $encode To sanitizer the text? potential values: 0 - skip; 1 - only for value; 2 - for both value and name
+ * @return array Associative array of value->name pairs
+ */
+ function getOptions($encode = false)
+ {
+ if (! $encode) {
+ return $this->_options;
+ }
+ $value = array();
+ foreach($this->_options as $val => $name) {
+ $value[$encode ? htmlspecialchars($val, ENT_QUOTES) : $val] = ($encode > 1) ? htmlspecialchars($name, ENT_QUOTES) : $name;
+ }
+ return $value;
+ }
+
+ /**
+ * Get the delimiter of this group
+ *
+ * @param bool $encode To sanitizer the text?
+ * @return string The delimiter
+ */
+ function getDelimeter($encode = false)
+ {
+ return $encode ? htmlspecialchars(str_replace(' ', ' ', $this->_delimeter)) : $this->_delimeter;
+ }
+
+ /**
+ * Prepare HTML for output
+ *
+ * @return string HTML
+ */
+ function render()
+ {
+ $ret = '';
+ $ele_name = $this->getName();
+ $ele_title = $this->getTitle();
+ $ele_value = $this->getValue();
+ $ele_options = $this->getOptions();
+ $ele_extra = $this->getExtra();
+ $ele_delimeter = empty($this->columns) ? $this->getDelimeter() : '';
+ $ret .= '<div data-role="fieldcontain">';
+ $ret .= '<fieldset data-role="controlgroup" data-type="horizontal">';
+ if (! empty($this->columns)) {
+ $ret .= '<table><tr>';
+ }
+ $i = 0;
+ $id_ele = 0;
+ foreach($ele_options as $value => $name) {
+ $id_ele++;
+ if (! empty($this->columns)) {
+ if ($i % $this->columns == 0) {
+ $ret .= '<tr>';
+ }
+ $ret .= '<td>';
+ }
+ $ret .= '<input type="radio" name="' . $ele_name . '" id="' . $ele_name . $id_ele. '" title = "' . htmlspecialchars($ele_title, ENT_QUOTES) . '" value="' . htmlspecialchars($value, ENT_QUOTES) . '"';
+ if (isset($ele_value) && $value == $ele_value) {
+ $ret .= ' checked="checked"';
+ }
+ $ret .= $ele_extra . ' />' . "<label name='xolb_{$ele_name}' for='" . $ele_name . $id_ele. "'>" . $name . "</label>" .
+ $ele_delimeter ;
+
+ if (! empty($this->columns)) {
+ $ret .= '</td>';
+ if (++ $i % $this->columns == 0) {
+ $ret .= '</tr>';
+ }
+ }
+ }
+ if (! empty($this->columns)) {
+ if ($span = $i % $this->columns) {
+ $ret .= '<td colspan="' . ($this->columns - $span) . '"></td></tr>';
+ }
+ $ret .= '</table>';
+ }
+ $ret .= '</fieldset>';
+ $ret .= '</div>';
+ return $ret;
+ }
+}
+
+?>
\ No newline at end of file
|
|
From: <txm...@us...> - 2012-12-11 19:09:12
|
Revision: 10363
http://sourceforge.net/p/xoops/svn/10363
Author: txmodxoops
Date: 2012-12-11 19:09:09 +0000 (Tue, 11 Dec 2012)
Log Message:
-----------
Updated
Modified Paths:
--------------
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/blocks/system_block_online.html
Modified: XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/blocks/system_block_online.html
===================================================================
--- XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/blocks/system_block_online.html 2012-12-11 18:33:53 UTC (rev 10362)
+++ XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/blocks/system_block_online.html 2012-12-11 19:09:09 UTC (rev 10363)
@@ -5,6 +5,6 @@
<{$block.lang_guests}>: <{$block.online_guests}>
<br /><br />
<{$block.online_names}>
-<a href="javascript:openWithSelfMain('<{$xoops_url}>/misc.php?action=showpopups&type=online','Online',420,350);" title="<{$block.lang_more}>" data-rel="dialog">
+<a href="javascript:openWithSelfMain('<{$xoops_url}>/misc.php?action=showpopups&type=online','Online',420,350);" title="<{$block.lang_more}>" data-rel="popup" data-position-to="window" data-role="button" data-inline="true" data-mini="true" data-transition="pop">
<{$block.lang_more}>
</a>
\ No newline at end of file
|
|
From: <txm...@us...> - 2012-12-11 18:33:55
|
Revision: 10362
http://sourceforge.net/p/xoops/svn/10362
Author: txmodxoops
Date: 2012-12-11 18:33:53 +0000 (Tue, 11 Dec 2012)
Log Message:
-----------
Added to $modversion['templates'][]
Added Paths:
-----------
XoopsCore/tags/2.5mobile timgno/htdocs/modules/profile/
XoopsCore/tags/2.5mobile timgno/htdocs/modules/profile/xoops_version.php
Added: XoopsCore/tags/2.5mobile timgno/htdocs/modules/profile/xoops_version.php
===================================================================
--- XoopsCore/tags/2.5mobile timgno/htdocs/modules/profile/xoops_version.php (rev 0)
+++ XoopsCore/tags/2.5mobile timgno/htdocs/modules/profile/xoops_version.php 2012-12-11 18:33:53 UTC (rev 10362)
@@ -0,0 +1,135 @@
+<?php
+/**
+ * Extended User Profile
+ *
+ * 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 profile
+ * @since 2.3.0
+ * @author Jan Pedersen
+ * @author Taiwen Jiang <ph...@us...>
+ * @version $Id: xoops_version.php 9205 2012-03-27 08:07:04Z beckmi $
+ */
+
+/**
+ * This is a temporary solution for merging XOOPS 2.0 and 2.2 series
+ * A thorough solution will be available in XOOPS 3.0
+ *
+ */
+$modversion = array();
+$modversion['name'] = _PROFILE_MI_NAME;
+$modversion['version'] = 1.63;
+$modversion['description'] = _PROFILE_MI_DESC;
+$modversion['author'] = "Jan Pedersen, Taiwen Jiang, alfred, Wishcraft";
+$modversion['credits'] = "Ackbarr, mboyden, marco, mamba, trabis, etc.";
+$modversion['help'] = 'page=help';
+$modversion['license'] = 'GNU GPL 2.0';
+$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html/";
+$modversion['image'] = "images/logo.png";
+$modversion['dirname'] = "profile";
+$modversion['dirmoduleadmin'] = 'Frameworks/moduleclasses';
+$modversion['icons16'] = 'Frameworks/moduleclasses/icons/16';
+$modversion['icons32'] = 'Frameworks/moduleclasses/icons/32';
+
+//about
+$modversion['release_date'] = '2011/10/08';
+$modversion["module_website_url"] = "http://www.xoops.org/";
+$modversion["module_website_name"] = "XOOPS";
+$modversion["module_status"] = "RC";
+$modversion['min_php']='5.2';
+$modversion['min_xoops']="2.5";
+
+// Admin menu
+// Set to 1 if you want to display menu generated by system module
+$modversion['system_menu'] = 1;
+
+// Admin things
+$modversion['hasAdmin'] = 1;
+$modversion['adminindex'] = "admin/user.php";
+$modversion['adminmenu'] = "admin/menu.php";
+
+// Scripts to run upon installation or update
+$modversion['onInstall'] = "include/install.php";
+$modversion['onUpdate'] = "include/update.php";
+
+// Menu
+$modversion['hasMain'] = 1;
+if ($GLOBALS['xoopsUser']) {
+ $modversion['sub'][1]['name'] = _PROFILE_MI_EDITACCOUNT;
+ $modversion['sub'][1]['url'] = "edituser.php";
+ $modversion['sub'][2]['name'] = _PROFILE_MI_PAGE_SEARCH;
+ $modversion['sub'][2]['url'] = "search.php";
+ $modversion['sub'][3]['name'] = _PROFILE_MI_CHANGEPASS;
+ $modversion['sub'][3]['url'] = "changepass.php";
+}
+
+// Mysql file
+$modversion['sqlfile']['mysql'] = "sql/mysql.sql";
+
+// Tables created by sql file (without prefix!)
+$modversion['tables'][1] = "profile_category";
+$modversion['tables'][2] = "profile_profile";
+$modversion['tables'][3] = "profile_field";
+$modversion['tables'][4] = "profile_visibility";
+$modversion['tables'][5] = "profile_regstep";
+
+
+// Config items
+$i = 1;
+$modversion['config'][$i]['name'] = 'profile_search';
+$modversion['config'][$i]['title'] = '_PROFILE_MI_PROFILE_SEARCH';
+$modversion['config'][$i]['description'] = '';
+$modversion['config'][$i]['formtype'] = 'yesno';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 1;
+$i++;
+$modversion['config'][$i]['name'] = 'profile_privateapikey';
+$modversion['config'][$i]['title'] = '_PROFILE_MI_PROFILE_PRIVATEAPIKEY';
+$modversion['config'][$i]['description'] = '';
+$modversion['config'][$i]['formtype'] = 'textbox';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = '';
+$i++;
+$modversion['config'][$i]['name'] = 'profile_publicapikey';
+$modversion['config'][$i]['title'] = '_PROFILE_MI_PROFILE_PUBLICAPIKEY';
+$modversion['config'][$i]['description'] = '';
+$modversion['config'][$i]['formtype'] = 'textbox';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = '';
+$i++;
+$modversion['config'][$i]['name'] = 'profile_mod_div';
+$modversion['config'][$i]['title'] = '_PROFILE_MI_PROFILE_MODIV';
+$modversion['config'][$i]['description'] = '';
+$modversion['config'][$i]['formtype'] = 'select';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 2;
+$modversion['config'][$i]['options'] = array('1' => 1, '2' => 2, '3' => 3, '4' => 4);
+unset($i);
+
+// Templates
+$modversion['templates'][] = array( 'file' => 'profile_breadcrumbs.html', 'description' => '' );
+$modversion['templates'][] = array( 'file' => 'profile_form.html', 'description' => '' );
+$modversion['templates'][] = array( 'file' => 'profile_userinfo.html', 'description' => '' );
+$modversion['templates'][] = array( 'file' => 'profile_search.html', 'description' => '' );
+$modversion['templates'][] = array( 'file' => 'profile_results.html', 'description' => '' );
+$modversion['templates'][] = array( 'file' => 'profile_register.html', 'description' => '' );
+$modversion['templates'][] = array( 'file' => 'profile_changepass.html', 'description' => '' );
+$modversion['templates'][] = array( 'file' => 'profile_editprofile.html', 'description' => '' );
+$modversion['templates'][] = array( 'file' => 'profile_userform.html', 'description' => '' );
+$modversion['templates'][] = array( 'file' => 'profile_avatar.html', 'description' => '' );
+$modversion['templates'][] = array( 'file' => 'profile_email.html', 'description' => '' );
+
+// Admin Templates
+$modversion['templates'][] = array( 'file' => 'profile_fieldlist.html', 'description' => '', 'type' => 'admin' );
+$modversion['templates'][] = array( 'file' => 'profile_categorylist.html', 'description' => '', 'type' => 'admin' );
+$modversion['templates'][] = array( 'file' => 'profile_visibility.html', 'description' => '', 'type' => 'admin' );
+$modversion['templates'][] = array( 'file' => 'profile_steplist.html', 'description' => '', 'type' => 'admin' );
+
+?>
\ No newline at end of file
|
|
From: <txm...@us...> - 2012-12-11 18:24:51
|
Revision: 10361
http://sourceforge.net/p/xoops/svn/10361
Author: txmodxoops
Date: 2012-12-11 18:24:46 +0000 (Tue, 11 Dec 2012)
Log Message:
-----------
Updated
Modified Paths:
--------------
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/css/jqm-init.css
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/css/style.css
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/js/jqm-init.js
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/system_redirect.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/system_siteclosed.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/theme.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/tpl/dcontent.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/tpl/footer.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/tpl/header.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/tpl/metas.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/tpl/scripts.html
Added Paths:
-----------
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/img/icons/
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/img/icons/apple/
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/img/icons/apple/icon_114.png
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/img/icons/apple/icon_57.png
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/img/icons/apple/icon_72.png
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/img/icons/apple/index.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/img/icons/index.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/contact/
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/contact/blocks/
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/contact/blocks/index.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/contact/contact_index.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/contact/index.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/imprint/
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/imprint/blocks/
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/imprint/blocks/index.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/imprint/imprint_footer.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/imprint/imprint_header.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/imprint/imprint_imp.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/imprint/imprint_index.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/imprint/index.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/pm/
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/pm/blocks/
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/pm/blocks/index.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/pm/index.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/pm/pm_pmlite.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/pm/pm_readpmsg.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/pm/pm_viewpmsg.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/profile/
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/profile/admin/
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/profile/admin/index.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/profile/admin/profile_categorylist.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/profile/admin/profile_fieldlist.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/profile/admin/profile_steplist.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/profile/admin/profile_visibility.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/profile/blocks/
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/profile/blocks/index.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/profile/index.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/profile/profile_avatar.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/profile/profile_breadcrumbs.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/profile/profile_changepass.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/profile/profile_editprofile.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/profile/profile_email.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/profile/profile_form.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/profile/profile_register.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/profile/profile_results.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/profile/profile_search.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/profile/profile_userform.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/profile/profile_userinfo.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/admin/
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/admin/index.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/admin/system_avatars.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/admin/system_banners.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/admin/system_blocks.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/admin/system_blocks_item.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/admin/system_comments.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/admin/system_filemanager.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/admin/system_groups.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/admin/system_header.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/admin/system_help.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/admin/system_images.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/admin/system_index.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/admin/system_mailusers.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/admin/system_maintenance.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/admin/system_modules.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/admin/system_modules_confirm.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/admin/system_preferences.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/admin/system_smilies.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/admin/system_templates.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/admin/system_userrank.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/admin/system_users.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/blocks/
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/blocks/index.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/blocks/system_block_comments.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/blocks/system_block_login.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/blocks/system_block_mainmenu.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/blocks/system_block_newusers.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/blocks/system_block_notification.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/blocks/system_block_online.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/blocks/system_block_search.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/blocks/system_block_siteinfo.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/blocks/system_block_themes.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/blocks/system_block_topusers.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/blocks/system_block_user.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/blocks/system_block_waiting.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/system_banner.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/system_bannerdisplay.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/system_bannerlogin.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/system_block_dummy.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/system_comment.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/system_comments_flat.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/system_comments_nest.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/system_comments_thread.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/system_dummy.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/system_homepage.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/system_imagemanager.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/system_imagemanager2.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/system_notification_list.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/system_notification_select.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/system_rss.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/system_userform.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/system/system_userinfo.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/tpl/blocks.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/tpl/blocks_left.html
XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/tpl/blocks_right.html
Modified: XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/css/jqm-init.css
===================================================================
--- XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/css/jqm-init.css 2012-12-11 17:19:50 UTC (rev 10360)
+++ XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/css/jqm-init.css 2012-12-11 18:24:46 UTC (rev 10361)
@@ -1,457 +1,459 @@
-/* jqm docs css
-
-Beware: lots of last-minute CSS going on in here
-cobblers, shoes,
-*/
-
-body { background: #f9f9f9; padding:13px; }
-body.ui-mobile-viewport { padding: 0; }
-body, input, textarea, select, button { font-family: Helvetica, Arial, san-serif; }
-.ui-mobile .type-home .ui-content { margin: 0; background: #e5e5e5 url(../images/jqm-sitebg.png) top center repeat-x; }
-.ui-mobile #jqm-homeheader { padding: 40px 10px 0; text-align: center; margin: 0 auto; }
-.ui-mobile #jqm-homeheader h1 { margin: 0 0 ; }
-.ui-mobile #jqm-homeheader p { margin: .3em 0 0; line-height: 1.3; font-size: .9em; font-weight: bold; color: #666; }
-
-.type-home .ui-content .jqm-version {
- display: block;
- position: absolute;
- width: 96px;
- border: solid #fff;
- border-width: 2px 1px;
- padding: .25em 2.25em;
- margin: 0 15px 0 0;
- right: 0;
- top: -2px;
- background: #f7cf57;
- color: #000;
- font-size: .8em;
- font-weight: bold;
- text-align: center;
- text-shadow: 0 1px 1px #fff;
- z-index: 9;
- -webkit-transform: rotate(45deg) translate(4.8em,-1em);
- -moz-transform: rotate(45deg) translate(4.8em,-1em);
- -ms-transform: rotate(45deg) translate(4.8em,-1em);
- -o-transform: rotate(45deg) translate(4.8em,-1em);
- transform: rotate(45deg);
- -webkit-box-shadow: 0 0 6px rgba(0,0,0,.40);
- -moz-box-shadow: 0 0 6px rgba(0,0,0,.40);
- -o-box-shadow: 0 0 6px rgba(0,0,0,.40);
- box-shadow: 0 0 6px rgba(0,0,0,.40);
-}
-.type-home .ui-content .jqm-version b {
- color: #a21412;
- font-weight: bold;
-}
-
-.footer-docs {
- padding: 5px 0;
- clear:both;
- color:#666;
-}
-.footer-docs p {
- font-weight: normal;
- font-size: .9em;
-}
-.ui-mobile-viewport .footer-docs p {
- margin: .5em 15px;
-}
-.ui-mobile-viewport .footer-docs p.jqm-version {
- font-weight: bold;
-}
-@media all and (min-width:650px) {
- .ui-mobile-viewport .footer-docs {
- overflow: hidden;
- }
- .ui-mobile-viewport .footer-docs p {
- margin: 1em 15px;
- float: left;
- }
- .ui-mobile-viewport .footer-docs p.jqm-version {
- float: right;
- font-weight: normal;
- }
-}
-
-h2 { margin:1.2em 0 .4em 0; }
-p code { font-size:1.2em; font-weight:bold; }
-h4 code {font-size:1.2em; font-weight:bold; }
-
-dt { font-weight: bold; margin: 2em 0 .5em; }
-dt code, dd code { font-size:1.3em; line-height:150%; }
-pre { white-space: pre; white-space: pre-wrap; word-wrap: break-word; }
-strong { font-weight: bold; }
-
-#jqm-homeheader img { width: 275px; height: 78px; margin-top:-20px; }
-img { max-width: 100%; }
-
-/* fluid images moved from jquery.mobile.core.css*/
-.ui-mobile img {
- max-width: 100%;
-}
-
-.ui-header .jqm-home { top: 0; }
-nav { margin: 0; }
-
-p.intro {
- font-size: .96em;
- line-height: 1.3;
- border-top: 1px solid #75ae18;
- border-bottom: 0;
- background: none;
- margin: 1.5em 0;
- padding: 1.5em 15px 0;
-}
-p.intro strong {
- color: #558e08;
-}
-
-.type-interior .content-secondary {
- border-right: 0;
- border-left: 0;
- margin: 10px -15px 0;
- background: #fff;
- border-top: 1px solid #ccc;
-}
-.type-home .ui-content {
- margin-top: 5px;
- overflow: hidden;
- position: relative;
-}
-.type-interior .ui-content {
- padding-bottom: 0;
-}
-.content-secondary .ui-collapsible {
- padding: 10px 15px;
-}
-.content-secondary .ui-collapsible-inset {
- margin: 0;
-}
-.content-secondary .ui-collapsible-content {
- padding: 0;
- background: none;
-}
-.content-secondary .ui-listview {
- margin: 0;
-}
-/* new API additions */
-
-dt {
- margin: 35px 0 15px 0;
- background-color:#ddd;
- font-weight:normal;
-}
-dt code {
- display:inline-block;
- font-weight:bold;
- color:#56A00E;
- padding:3px 7px;
- margin-right:10px;
- background-color:#fff;
-}
-dd {
- margin-bottom:10px;
-}
-dd .default { font-weight:bold; }
-dd pre {
- margin:0 0 0 0;
-}
-dd code { font-weight: normal; }
-dd pre code {
- margin:0;
- border:none;
- font-weight:normal;
- font-size:100%;
- background-color:transparent;
-}
-dd h4 { margin:15px 0 0 0; }
-
-.localnav {
- margin:0 0 20px 0;
-}
-.ui-mobile-viewport .localnav li {
- float:left;
-}
-.localnav .ui-btn-inner {
- padding: .6em 10px;
- font-size:80%;
-}
-
-/* custom dialog for the photos sharing */
-.ui-dialog.dialog-actionsheet .ui-dialog-contain {
- margin-top: 0;
-}
-
-/* popup examples */
-.type-interior .ui-popup-container .ui-content { padding: 15px !important; }
-
-/* F bar theme - just for the docs overview headers */
-.ui-bar-f {
- border: 1px solid #56A00E;
- background: #74b042;
- color: #fff;
- font-weight: bold;
- text-shadow: 0 1px 1px #335413;
- background-image: -webkit-gradient(linear, left top, left bottom, from(#74b042), to(#56A00E)); /* Saf4+, Chrome */
- background-image: -webkit-linear-gradient(#74b042, #56A00E); /* Chrome 10+, Saf5.1+ */
- background-image: -moz-linear-gradient(#74b042, #56A00E); /* FF3.6 */
- background-image: -ms-linear-gradient(#74b042, #56A00E); /* IE10 */
- background-image: -o-linear-gradient(#74b042, #56A00E); /* Opera 11.10+ */
- background-image: linear-gradient(#74b042, #56A00E);
-}
-.ui-bar-f,
-.ui-bar-f input,
-.ui-bar-f select,
-.ui-bar-f textarea,
-.ui-bar-f button {
- font-family: Helvetica, Arial, sans-serif /*{global-font-family}*/;
-}
-
-.ui-bar-f,
-.ui-bar-f .ui-link-inherit {
- color: #fff;
-}
-.ui-bar-f .ui-link {
- color: #fff;
- font-weight: bold;
-}
-.ui-btn-up-f {
- border: 1px solid #3B6F07;
- background: #56A00E;
- font-weight: bold;
- color: #fff;
- text-shadow: 0 1px 1px #234403;
- background-image: -webkit-gradient(linear, left top, left bottom, from(#74b042), to(#56A00E)); /* Saf4+, Chrome */
- background-image: -webkit-linear-gradient(#74b042, #56A00E); /* Chrome 10+, Saf5.1+ */
- background-image: -moz-linear-gradient(#74b042, #56A00E); /* FF3.6 */
- background-image: -ms-linear-gradient(#74b042, #56A00E); /* IE10 */
- background-image: -o-linear-gradient(#74b042, #56A00E); /* Opera 11.10+ */
- background-image: linear-gradient(#74b042, #56A00E);
-}
-.ui-btn-up-f a.ui-link-inherit {
- color: #fff;
-}
-.ui-btn-hover-f {
- border: 1px solid #3B6F07;
- background: #6EBC1F;
- font-weight: bold;
- color: #fff;
- text-shadow: 0 1px 1px #234403;
- background-image: -webkit-gradient(linear, left top, left bottom, from(#8FC963), to(#6EBC1F)); /* Saf4+, Chrome */
- background-image: -webkit-linear-gradient(#8FC963, #6EBC1F); /* Chrome 10+, Saf5.1+ */
- background-image: -moz-linear-gradient(#8FC963, #6EBC1F); /* FF3.6 */
- background-image: -ms-linear-gradient(#8FC963, #6EBC1F); /* IE10 */
- background-image: -o-linear-gradient(#8FC963, #6EBC1F); /* Opera 11.10+ */
- background-image: linear-gradient(#8FC963, #6EBC1F);
-}
-.ui-btn-hover-f a.ui-link-inherit {
- color: #fff;
-}
-.ui-btn-down-f {
- border: 1px solid #3B6F07;
- background: #3d3d3d;
- font-weight: bold;
- color: #fff;
- text-shadow: 0 1px 1px #234403;
- background-image: -webkit-gradient(linear, left top, left bottom, from(#56A00E), to(#64A234)); /* Saf4+, Chrome */
- background-image: -webkit-linear-gradient(#56A00E, #64A234); /* Chrome 10+, Saf5.1+ */
- background-image: -moz-linear-gradient(#56A00E, #64A234); /* FF3.6 */
- background-image: -ms-linear-gradient(#56A00E, #64A234); /* IE10 */
- background-image: -o-linear-gradient(#56A00E, #64A234); /* Opera 11.10+ */
- background-image: linear-gradient(#56A00E, #64A234);
-}
-.ui-btn-down-f a.ui-link-inherit {
- color: #fff;
-}
-.ui-btn-up-f,
-.ui-btn-hover-f,
-.ui-btn-down-f {
- font-family: Helvetica, Arial, sans-serif;
- text-decoration: none;
-}
-
-
-/* docs site layout */
-
-@media all and (min-width: 650px){
-
- .type-home .ui-content {
- margin-top: 5px;
- }
- .ui-mobile #jqm-homeheader {
- max-width: 340px;
- }
- p.intro {
- margin: 2em 0;
- }
- .type-home .ui-content,
- .type-interior > .ui-content {
- padding: 0;
- }
- .type-interior > .ui-content {
- overflow: hidden;
- }
- .content-secondary {
- text-align: left;
- float: left;
- width: 45%;
- }
- .content-secondary,
- .type-interior .content-secondary {
- margin: 30px 0 20px 2%;
- padding: 20px 4% 0 0;
- background: none;
- border-top: none;
- position: relative;
- }
- .type-interior .content-secondary::after {
- content: "";
- display: inline-block;
- position: absolute;
- top: 0;
- right: 0;
- height: 1px;
- width: 1px;
- margin-bottom: -9999px;
- padding-bottom: 9999px;
- background: #bbb;
- }
- .type-index .content-secondary {
- padding: 0;
- }
- .content-secondary .ui-collapsible {
- margin: 0;
- padding: 0;
- }
- .content-secondary .ui-collapsible-content {
- border-left: none;
- border-right: none;
- }
- .type-index .content-secondary .ui-listview {
- margin: 0;
- }
- .ui-mobile #jqm-homeheader {
- padding: 0;
- }
- .content-primary {
- width: 45%;
- float: right;
- margin-top: 30px;
- margin-right: 1%;
- padding-right: 1%;
- }
- .content-primary ul:first-child {
- margin-top: 0;
- }
- /* collapsible non-inset example */
- .content-primary .ui-collapsible-content ul:first-child {
- margin-top: -10px;
- }
- .content-secondary h2 {
- position: absolute;
- left: -9999px;
- }
- .type-interior .content-primary {
- padding: 1.5em 6% 3em 0;
- margin: 0;
- }
- /* fix up the collapsibles - expanded on desktop */
- .content-secondary .ui-collapsible-inset {
- margin-bottom: -1px;
- }
- .content-secondary .ui-collapsible-heading {
- display: none;
- }
- .content-secondary .ui-collapsible-contain {
- margin:0;
- }
- .content-secondary .ui-collapsible-content {
- display: block;
- margin: 0;
- padding: 0;
- }
- .content-secondary .ui-collapsible-content,
- .content-secondary .ui-collapsible-content > .ui-listview .ui-li-last {
- border-bottom-left-radius: 0;
- border-bottom-right-radius: 0;
- }
- .type-interior .content-secondary .ui-li-divider {
- padding-top: 1em;
- padding-bottom: 1em;
- }
- .type-interior .content-secondary {
- margin: 0;
- padding: 0;
- }
-
-}
-@media all and (min-width: 750px){
- .type-home .ui-content {
- background-position: 39%;
- }
- .content-secondary {
- width: 34%;
- }
- .content-primary {
- width: 56%;
- padding-right: 1%;
- }
-}
-
-@media all and (min-width: 1200px){
- .type-home .ui-content{
- background-position: 38.5%;
- }
- .content-secondary {
- width: 30%;
- padding-right:6%;
- margin: 30px 0 20px 5%;
- }
- .type-interior .content-secondary {
- margin: 0;
- padding: 0;
- }
- .content-primary {
- width: 50%;
- margin-right: 5%;
- padding-right: 3%;
- }
- .type-interior .content-primary {
- width: 60%;
- }
-}
-
-/* reset for popup examples */
-.type-interior .ui-popup.ui-content,
-.type-interior .ui-popup .ui-content {
- background-position: 0 0;
- background-repeat: no-repeat;
- overflow: visible;
-}
-
-/* tables documenting enum-type settings */
-.enum-value {
- vertical-align: top;
- white-space: nowrap;
-}
-
-/* Navbar examples */
-.content-primary > .ui-header,
-.content-primary > .ui-footer {
- overflow: hidden;
-}
-
-/* list styles */
-ul { margin:0; padding-left:0; }
-ul li { list-style:none; padding:.7em 0; margin:0; border-bottom:1px solid #e3e3e3; }
-ul ul li { border: none;}
-
-dl dd ul { padding-left: 40px; }
-dl dd ul li { list-style: disc; }
-dl dd ul li li { list-style: circle; }
-dl dd ul li li li { list-style: square; }
-dl dd ul li { border: none; }
-
-.ui-mobile-viewport .localnav li {
- border: none;
-}
+/* jqm docs css
+
+Beware: lots of last-minute CSS going on in here
+cobblers, shoes,
+*/
+
+body { background: #f9f9f9; padding:13px; }
+body.ui-mobile-viewport { padding: 0; }
+body, input, textarea, select, button { font-family: Helvetica, Arial, san-serif; }
+.ui-mobile .type-home .ui-content { margin: 0; background: #e5e5e5 url(../images/jqm-sitebg.png) top center repeat-x; }
+.ui-mobile #jqm-homeheader { padding: 40px 10px 0; text-align: center; margin: 0 auto; }
+.ui-mobile #jqm-homeheader h1 { margin: 0 0 ; }
+.ui-mobile #jqm-homeheader p { margin: .3em 0 0; line-height: 1.3; font-size: .9em; font-weight: bold; color: #666; }
+
+.type-home .ui-content .jqm-version {
+ display: block;
+ position: absolute;
+ width: 96px;
+ border: solid #fff;
+ border-width: 2px 1px;
+ padding: .25em 2.25em;
+ margin: 0 15px 0 0;
+ right: 0;
+ top: -2px;
+ background: #f7cf57;
+ color: #000;
+ font-size: .8em;
+ font-weight: bold;
+ text-align: center;
+ text-shadow: 0 1px 1px #fff;
+ z-index: 9;
+ -webkit-transform: rotate(45deg) translate(4.8em,-1em);
+ -moz-transform: rotate(45deg) translate(4.8em,-1em);
+ -ms-transform: rotate(45deg) translate(4.8em,-1em);
+ -o-transform: rotate(45deg) translate(4.8em,-1em);
+ transform: rotate(45deg);
+ -webkit-box-shadow: 0 0 6px rgba(0,0,0,.40);
+ -moz-box-shadow: 0 0 6px rgba(0,0,0,.40);
+ -o-box-shadow: 0 0 6px rgba(0,0,0,.40);
+ box-shadow: 0 0 6px rgba(0,0,0,.40);
+}
+.type-home .ui-content .jqm-version b {
+ color: #a21412;
+ font-weight: bold;
+}
+
+.footer-docs {
+ padding: 5px 0;
+ clear:both;
+ color:#666;
+}
+.footer-docs p {
+ font-weight: normal;
+ font-size: .9em;
+}
+.ui-mobile-viewport .footer-docs p {
+ margin: .5em 15px;
+}
+.ui-mobile-viewport .footer-docs p.jqm-version {
+ font-weight: bold;
+}
+@media all and (min-width:650px) {
+ .ui-mobile-viewport .footer-docs {
+ overflow: hidden;
+ }
+ .ui-mobile-viewport .footer-docs p {
+ margin: 1em 15px;
+ float: left;
+ }
+ .ui-mobile-viewport .footer-docs p.jqm-version {
+ float: right;
+ font-weight: normal;
+ }
+}
+
+h2 { margin:1.2em 0 .4em 0; }
+p code { font-size:1.2em; font-weight:bold; }
+h4 code {font-size:1.2em; font-weight:bold; }
+
+dt { font-weight: bold; margin: 2em 0 .5em; }
+dt code, dd code { font-size:1.3em; line-height:150%; }
+pre { white-space: pre; white-space: pre-wrap; word-wrap: break-word; }
+strong { font-weight: bold; }
+
+#jqm-homeheader img { width: 275px; height: 78px; margin-top:-20px; }
+img { max-width: 100%; }
+
+/* fluid images moved from jquery.mobile.core.css*/
+.ui-mobile img {
+ max-width: 100%;
+}
+
+.ui-header .jqm-home { top: 0; }
+nav { margin: 0; }
+
+p.intro {
+ font-size: .96em;
+ line-height: 1.3;
+ border-top: 1px solid #75ae18;
+ border-bottom: 0;
+ background: none;
+ margin: 1.5em 0;
+ padding: 1.5em 15px 0;
+}
+p.intro strong {
+ color: #558e08;
+}
+
+.type-interior .content-secondary {
+ border-right: 0;
+ border-left: 0;
+ margin: 10px -15px 0;
+ background: #fff;
+ border-top: 1px solid #ccc;
+}
+.type-home .ui-content {
+ margin-top: 5px;
+ overflow: hidden;
+ position: relative;
+}
+.type-interior .ui-content {
+ padding-bottom: 0;
+}
+.content-secondary .ui-collapsible {
+ padding: 10px 15px;
+}
+.content-secondary .ui-collapsible-inset {
+ margin: 0;
+}
+.content-secondary .ui-collapsible-content {
+ padding: 0;
+ background: none;
+}
+.content-secondary .ui-listview {
+ margin: 0;
+}
+/* new API additions */
+
+dt {
+ margin: 35px 0 15px 0;
+ background-color:#ddd;
+ font-weight:normal;
+}
+dt code {
+ display:inline-block;
+ font-weight:bold;
+ color:#56A00E;
+ padding:3px 7px;
+ margin-right:10px;
+ background-color:#fff;
+}
+dd {
+ margin-bottom:10px;
+}
+dd .default { font-weight:bold; }
+dd pre {
+ margin:0 0 0 0;
+}
+dd code { font-weight: normal; }
+dd pre code {
+ margin:0;
+ border:none;
+ font-weight:normal;
+ font-size:100%;
+ background-color:transparent;
+}
+dd h4 { margin:15px 0 0 0; }
+
+.localnav {
+ margin:0 0 20px 0;
+}
+.ui-mobile-viewport .localnav li {
+ float:left;
+}
+.localnav .ui-btn-inner {
+ padding: .6em 10px;
+ font-size:80%;
+}
+
+/* custom dialog for the photos sharing */
+.ui-dialog.dialog-actionsheet .ui-dialog-contain {
+ margin-top: 0;
+}
+
+/* popup examples */
+.type-interior .ui-popup-container .ui-content { padding: 15px !important; }
+
+/* F bar theme - just for the docs overview headers */
+.ui-bar-f {
+ border: 1px solid #56A00E;
+ background: #74b042;
+ color: #fff;
+ font-weight: bold;
+ text-shadow: 0 1px 1px #335413;
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#74b042), to(#56A00E)); /* Saf4+, Chrome */
+ background-image: -webkit-linear-gradient(#74b042, #56A00E); /* Chrome 10+, Saf5.1+ */
+ background-image: -moz-linear-gradient(#74b042, #56A00E); /* FF3.6 */
+ background-image: -ms-linear-gradient(#74b042, #56A00E); /* IE10 */
+ background-image: -o-linear-gradient(#74b042, #56A00E); /* Opera 11.10+ */
+ background-image: linear-gradient(#74b042, #56A00E);
+}
+.ui-bar-f,
+.ui-bar-f input,
+.ui-bar-f select,
+.ui-bar-f textarea,
+.ui-bar-f button {
+ font-family: Helvetica, Arial, sans-serif /*{global-font-family}*/;
+}
+
+.ui-bar-f,
+.ui-bar-f .ui-link-inherit {
+ color: #fff;
+}
+.ui-bar-f .ui-link {
+ color: #fff;
+ font-weight: bold;
+}
+.ui-btn-up-f {
+ border: 1px solid #3B6F07;
+ background: #56A00E;
+ font-weight: bold;
+ color: #fff;
+ text-shadow: 0 1px 1px #234403;
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#74b042), to(#56A00E)); /* Saf4+, Chrome */
+ background-image: -webkit-linear-gradient(#74b042, #56A00E); /* Chrome 10+, Saf5.1+ */
+ background-image: -moz-linear-gradient(#74b042, #56A00E); /* FF3.6 */
+ background-image: -ms-linear-gradient(#74b042, #56A00E); /* IE10 */
+ background-image: -o-linear-gradient(#74b042, #56A00E); /* Opera 11.10+ */
+ background-image: linear-gradient(#74b042, #56A00E);
+}
+.ui-btn-up-f a.ui-link-inherit {
+ color: #fff;
+}
+.ui-btn-hover-f {
+ border: 1px solid #3B6F07;
+ background: #6EBC1F;
+ font-weight: bold;
+ color: #fff;
+ text-shadow: 0 1px 1px #234403;
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#8FC963), to(#6EBC1F)); /* Saf4+, Chrome */
+ background-image: -webkit-linear-gradient(#8FC963, #6EBC1F); /* Chrome 10+, Saf5.1+ */
+ background-image: -moz-linear-gradient(#8FC963, #6EBC1F); /* FF3.6 */
+ background-image: -ms-linear-gradient(#8FC963, #6EBC1F); /* IE10 */
+ background-image: -o-linear-gradient(#8FC963, #6EBC1F); /* Opera 11.10+ */
+ background-image: linear-gradient(#8FC963, #6EBC1F);
+}
+.ui-btn-hover-f a.ui-link-inherit {
+ color: #fff;
+}
+.ui-btn-down-f {
+ border: 1px solid #3B6F07;
+ background: #3d3d3d;
+ font-weight: bold;
+ color: #fff;
+ text-shadow: 0 1px 1px #234403;
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#56A00E), to(#64A234)); /* Saf4+, Chrome */
+ background-image: -webkit-linear-gradient(#56A00E, #64A234); /* Chrome 10+, Saf5.1+ */
+ background-image: -moz-linear-gradient(#56A00E, #64A234); /* FF3.6 */
+ background-image: -ms-linear-gradient(#56A00E, #64A234); /* IE10 */
+ background-image: -o-linear-gradient(#56A00E, #64A234); /* Opera 11.10+ */
+ background-image: linear-gradient(#56A00E, #64A234);
+}
+.ui-btn-down-f a.ui-link-inherit {
+ color: #fff;
+}
+.ui-btn-up-f,
+.ui-btn-hover-f,
+.ui-btn-down-f {
+ font-family: Helvetica, Arial, sans-serif;
+ text-decoration: none;
+}
+
+.ui-content { border-width: 0; overflow: visible; overflow-x: hidden; padding: 0; } /**/
+.ui-content .xcontent { padding: 10px 25px 10px 25px; } /**/
+
+/* docs site layout */
+
+@media all and (min-width: 650px){
+
+ .type-home .ui-content {
+ margin-top: 5px;
+ }
+ .ui-mobile #jqm-homeheader {
+ max-width: 340px;
+ }
+ p.intro {
+ margin: 2em 0;
+ }
+ .type-home .ui-content,
+ .type-interior > .ui-content {
+ padding: 0;
+ }
+ .type-interior > .ui-content {
+ overflow: hidden;
+ }
+ .content-secondary {
+ text-align: left;
+ float: left;
+ width: 45%;
+ }
+ .content-secondary,
+ .type-interior .content-secondary {
+ margin: 30px 0 20px 2%;
+ padding: 20px 4% 0 0;
+ background: none;
+ border-top: none;
+ position: relative;
+ }
+ .type-interior .content-secondary::after {
+ content: "";
+ display: inline-block;
+ position: absolute;
+ top: 0;
+ right: 0;
+ height: 1px;
+ width: 1px;
+ margin-bottom: -9999px;
+ padding-bottom: 9999px;
+ background: #bbb;
+ }
+ .type-index .content-secondary {
+ padding: 0;
+ }
+ .content-secondary .ui-collapsible {
+ margin: 0;
+ padding: 0;
+ }
+ .content-secondary .ui-collapsible-content {
+ border-left: none;
+ border-right: none;
+ }
+ .type-index .content-secondary .ui-listview {
+ margin: 0;
+ }
+ .ui-mobile #jqm-homeheader {
+ padding: 0;
+ }
+ .content-primary {
+ width: 45%;
+ float: right;
+ margin-top: 30px;
+ margin-right: 1%;
+ padding-right: 1%;
+ }
+ .content-primary ul:first-child {
+ margin-top: 0;
+ }
+ /* collapsible non-inset example */
+ .content-primary .ui-collapsible-content ul:first-child {
+ margin-top: -10px;
+ }
+ .content-secondary h2 {
+ position: absolute;
+ left: -9999px;
+ }
+ .type-interior .content-primary {
+ padding: 1.5em 6% 3em 0;
+ margin: 0;
+ }
+ /* fix up the collapsibles - expanded on desktop */
+ .content-secondary .ui-collapsible-inset {
+ margin-bottom: -1px;
+ }
+ .content-secondary .ui-collapsible-heading {
+ display: none;
+ }
+ .content-secondary .ui-collapsible-contain {
+ margin:0;
+ }
+ .content-secondary .ui-collapsible-content {
+ display: block;
+ margin: 0;
+ padding: 0;
+ }
+ .content-secondary .ui-collapsible-content,
+ .content-secondary .ui-collapsible-content > .ui-listview .ui-li-last {
+ border-bottom-left-radius: 0;
+ border-bottom-right-radius: 0;
+ }
+ .type-interior .content-secondary .ui-li-divider {
+ padding-top: 1em;
+ padding-bottom: 1em;
+ }
+ .type-interior .content-secondary {
+ margin: 0;
+ padding: 0;
+ }
+
+}
+@media all and (min-width: 750px){
+ .type-home .ui-content {
+ background-position: 39%;
+ }
+ .content-secondary {
+ width: 34%;
+ }
+ .content-primary {
+ width: 56%;
+ padding-right: 1%;
+ }
+}
+
+@media all and (min-width: 1200px){
+ .type-home .ui-content{
+ background-position: 38.5%;
+ }
+ .content-secondary {
+ width: 30%;
+ padding-right:6%;
+ margin: 30px 0 20px 5%;
+ }
+ .type-interior .content-secondary {
+ margin: 0;
+ padding: 0;
+ }
+ .content-primary {
+ width: 50%;
+ margin-right: 5%;
+ padding-right: 3%;
+ }
+ .type-interior .content-primary {
+ width: 60%;
+ }
+}
+
+/* reset for popup examples */
+.type-interior .ui-popup.ui-content,
+.type-interior .ui-popup .ui-content {
+ background-position: 0 0;
+ background-repeat: no-repeat;
+ overflow: visible;
+}
+
+/* tables documenting enum-type settings */
+.enum-value {
+ vertical-align: top;
+ white-space: nowrap;
+}
+
+/* Navbar examples */
+.content-primary > .ui-header,
+.content-primary > .ui-footer {
+ overflow: hidden;
+}
+
+/* list styles */
+ul { margin:0; padding-left:0; }
+ul li { list-style:none; padding:.7em 0; margin:0; border-bottom:1px solid #e3e3e3; }
+ul ul li { border: none;}
+
+dl dd ul { padding-left: 40px; }
+dl dd ul li { list-style: disc; }
+dl dd ul li li { list-style: circle; }
+dl dd ul li li li { list-style: square; }
+dl dd ul li { border: none; }
+
+.ui-mobile-viewport .localnav li {
+ border: none;
+}
\ No newline at end of file
Modified: XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/css/style.css
===================================================================
--- XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/css/style.css 2012-12-11 17:19:50 UTC (rev 10360)
+++ XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/css/style.css 2012-12-11 18:24:46 UTC (rev 10361)
@@ -14,15 +14,15 @@
.itemAdminLink {font-size: .9em;}
.itemPermaLink {font-size: .9em;}
-#content {text-align: left; padding: 8px;}
+#content {text-align: left; padding: 5px;}
caption {font-weight: bold;}
-th, thead {background-color: #2A75C5; padding : 2px; color: #fff; vertical-align : middle;}
+th, thead {background-color: transparent; padding : 2px; color: #fff; vertical-align : middle;}
.outer {border: 1px solid #c0c0c0;}
-.head {background-color: #c2cdd6; padding: 5px; font-weight: bold;}
-.even {background-color: #dee3e7; padding: 5px;}
-.odd {background-color: #E9E9E9; padding: 5px;}
-.foot {background-color: #c2cdd6; padding: 5px; font-weight: bold;}
+.head {background-color: transparent; padding: 1px; font-weight: bold;}
+.even {background-color: transparent; padding: 1px;}
+.odd {background-color: transparent; padding: 1px;}
+.foot {background-color: transparent; padding: 1px; font-weight: bold;}
.errorMsg,.confirmMsg, .resultMsg { padding: .8em; text-align:center; margin-bottom: 1em; border: 2px solid #ddd;}
.errorMsg { background-color: #FBE3E4; color: #D12F19; border-color: #FBC2C4; }
@@ -32,17 +32,30 @@
.confirmMsg a { background-color: transparent; color: #817134; }
.successMsg a { background-color: transparent; color: #529214; }
+#mainmenu a {background-color: #e6e6e6; display: block; margin: 0; padding: 4px;}
+#mainmenu a:hover {background-color: #fff;}
+#mainmenu a.menuTop {padding-left: 3px; border-top: 1px solid #c0c0c0; border-right: 1px solid #666; border-bottom: 1px solid #666; border-left: 1px solid #c0c0c0;}
+#mainmenu a.menuMain {padding-left: 3px; border-right: 1px solid #666; border-bottom: 1px solid #666; border-left: 1px solid #c0c0c0;}
+#mainmenu a.menuSub {padding-left: 9px; border-right: 1px solid #666; border-bottom: 1px solid #666; border-left: 1px solid #c0c0c0;}
+#mainmenu a.maincurrent {background-color:transparent; color:#ff9900;}
+
+#usermenu { font-size : .9em;}
+#usermenu a {background-color: #e6e6e6; display: block; margin: 0; padding: 2px; border-right: 1px solid #666; border-bottom: 1px solid #666; border-left: 1px solid #c0c0c0; font-weight : normal;}
+#usermenu a:hover {background-color: #fff;}
+#usermenu a.menuTop {border-top: 1px solid #c0c0c0;}
+#usermenu a.highlight {background-color: #fcc;}
+
/*============== Styles for system_siteclosed.html (override system module) =================*/
#xo-siteclose {
- width: 400px;
- margin: 100px auto;
+ width: 200px;
+ margin: 20px auto;
background-color: #e2e2e2;
padding: 30px;
color: #000;
font-size: 1.2em;
font-weight: bold;
text-align: center;
- border: 1px solid #666;
+ border: 1px solid #555;
}
#xo-userbar_siteclosed {
display: block;
@@ -157,11 +170,10 @@
.ui-btn-icon-notext .ui-icon-tool { display: block; z-index: 0;}
.ui-icon-tool
{
- background: #000 /*{global-icon-color}*/;
- background: rgba(0,0,0,0) /*{global-icon-disc}*/;
- background-image: url(images/icons-18-white.png) /*{global-icon-set}*/;
+ background: #000; /*{global-icon-color}*/
+ background: rgba(0,0,0,0); /*{global-icon-disc}*/
+ background-image: url(images/icons-18-white.png); /*{global-icon-set}*/
background-repeat: no-repeat;
-
}
/* modifica css base */
@@ -179,18 +191,18 @@
}
.ui-btn-corner-top-tool {
- -moz-border-radius-topleft: 0.5em /*{global-radii-buttons}*/;
- -webkit-border-top-left-radius: 0.5em /*{global-radii-buttons}*/;
- border-top-left-radius: 0.5em /*{global-radii-buttons}*/;
- -moz-border-radius-topright: 0.5em /*{global-radii-buttons}*/;
- -webkit-border-top-right-radius: 0.5em /*{global-radii-buttons}*/;
- border-top-right-radius: 0.5em /*{global-radii-buttons}*/;
+ -moz-border-radius-topleft: 0.5em; /*{global-radii-buttons}*/
+ -webkit-border-top-left-radius: 0.5em; /*{global-radii-buttons}*/
+ border-top-left-radius: 0.5em; /*{global-radii-buttons}*/
+ -moz-border-radius-topright: 0.5em; /*{global-radii-buttons}*/
+ -webkit-border-top-right-radius: 0.5em; /*{global-radii-buttons}*/
+ border-top-right-radius: 0.5em; /*{global-radii-buttons}*/
}
.ui-btn-corner-all-tool {
- -moz-border-radius: 0.5em /*{global-radii-buttons}*/;
- -webkit-border-radius: 0.5em /*{global-radii-buttons}*/;
- border-radius: 0.5em /*{global-radii-buttons}*/;
+ -moz-border-radius: 0.5em; /*{global-radii-buttons}*/
+ -webkit-border-radius: 0.5em; /*{global-radii-buttons}*/
+ border-radius: 0.5em; /*{global-radii-buttons}*/
}
.iconeHome {background-repeat:no-repeat;background-position:left top;display:block;width:139px;height:133px;overflow:hidden;text-indent:-1000px}
@@ -202,21 +214,21 @@
.ui-icon-myappcarrello-settings {background: url("/img/drawable-mdpi/carrello.png") no-repeat rgba(0, 0, 0, 0) !important;}
/*.header{background:url(../img/bg_header.png); repeat: left top; height: 47px;}
-.carrello{background-image:url(../img/icons/menu_carrello.png)}
-.catalogo{background-image:url(../img/icons/menu_catalogo.png)}
+.cart{background-image:url(../img/icons/menu_carrello.png)}
+.catalog{background-image:url(../img/icons/menu_catalogo.png)}
.top10{background-image:url(../img/icons/menu_topten.png)}
.help{background-image:url(../img/icons/menu_help.png)}
.logo{background:url(../img/xlogo.png) no-repeat left 4px; width:100px; height: 35px; text-indent: -1000px; margin:0px 2px;}
scheda Prodotto
-.spTitolo{font-family:Helvetica;font-size:18px;color:#035a9c;text-transform:uppercase;font-weight:bold}
-.spAutore{font-family:Helvetica;font-size:13px;text-transform:uppercase;}
+.spTitle{font-family:Helvetica;font-size:18px;color:#035a9c;text-transform:uppercase;font-weight:bold}
+.spAuthor{font-family:Helvetica;font-size:13px;text-transform:uppercase;}
.spPrezzoNetto{font-family:Helvetica;font-size:16px;color:#035a9c;text-transform:uppercase;font-weight:bold}
.spPrezzoLordo{font-family:Helvetica;font-size:13px;}
.spSconto{font-family:Helvetica;font-size:16px;color:red;text-transform:uppercase;font-weight:bold}
.spEditore{font-family:Helvetica;font-size:16px;color:#035a9c;text-transform:uppercase;font-weight:bold}
-.spPubblicazione{font-family:Helvetica;font-size:16px;color:#035a9c;text-transform:uppercase;font-weight:bold}
-.spDescrizione{font-family:Helvetica;font-size:16px;color:#035a9c;font-weight:bold}
+.spPublication{font-family:Helvetica;font-size:16px;color:#035a9c;text-transform:uppercase;font-weight:bold}
+.spDescription{font-family:Helvetica;font-size:16px;color:#035a9c;font-weight:bold}
*//* scheda Prodotto */
@media only screen and (-webkit-min-device-pixel-ratio: 0.75) {
Added: XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/img/icons/apple/icon_114.png
===================================================================
(Binary files differ)
Property changes on: XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/img/icons/apple/icon_114.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/img/icons/apple/icon_57.png
===================================================================
(Binary files differ)
Property changes on: XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/img/icons/apple/icon_57.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/img/icons/apple/icon_72.png
===================================================================
(Binary files differ)
Property changes on: XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/img/icons/apple/icon_72.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/img/icons/apple/index.html
===================================================================
--- XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/img/icons/apple/index.html (rev 0)
+++ XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/img/icons/apple/index.html 2012-12-11 18:24:46 UTC (rev 10361)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/img/icons/index.html
===================================================================
--- XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/img/icons/index.html (rev 0)
+++ XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/img/icons/index.html 2012-12-11 18:24:46 UTC (rev 10361)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Modified: XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/js/jqm-init.js
===================================================================
--- XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/js/jqm-init.js 2012-12-11 17:19:50 UTC (rev 10360)
+++ XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/js/jqm-init.js 2012-12-11 18:24:46 UTC (rev 10361)
@@ -36,10 +36,36 @@
foothtml += " " + str;
}
- $( ".type-home .ui-content p.jqm-version" ).html( html );
+ $( ".type-home .ui-content p.jqm-version" ).html( html );
$( ".footer-docs p.jqm-version" ).html( foothtml );
+
+ //$('a').buttonMarkup({ mini: true, shadow: false, theme: "b", inline: true });
+ $('[type="button"], [type="submit"]').button({ mini: true, shadow: false, inline: true });
+ $('input[type="checkbox"]').checkboxradio({ mini: true, shadow: false, inline: true });
+ $('input[type="radio"]').checkboxradio({ mini: true, shadow: false, inline: true });
+
+ $('select').selectmenu('open');
+
+ $.mobile.selectmenu.prototype.options.initSelector = "select";
+
+ $.mobile.touchOverflowEnabled = true;
});
+// display page controls
+$(document).bind( 'pagecreate', function() {
+ //$('a').buttonMarkup({ mini: true, shadow: false, theme: "b", inline: true });
+ $('[type="button"], [type="submit"]').button({ mini: true, shadow: false, inline: true });
+ $("input[type='checkbox']").checkboxradio({ mini: true, shadow: false, inline: true });
+ $("input[type='radio']").checkboxradio({ mini: true, shadow: false, inline: true });
+
+ /* $.mobile.changePage( "search.php?query="+query, {
+ type: "post",
+ data: $("form#search").serialize()
+ }); */
+
+ //$('select').selectmenu('open');
+});
+
// Turn off AJAX for local file browsing
if ( location.protocol.substr(0,4) === 'file' ||
location.protocol.substr(0,11) === '*-extension' ||
@@ -54,9 +80,50 @@
// fix the links for the initial page
$(fixLinks);
+
+ // initialized list for news module
+ $('#list').live('pageshow', function (event, ui) {
+ var t = "";
+ var param = getParameterByName('type');
+ var jsurl = "/search.php?query=" + param;
+ $.ajax({
+ type: "GET",
+ url: jsurl,
+ data: "{}",
+ contentType: "application/json; charset=utf-8",
+ dataType: "json",
+ success: function (msg) {
+ var data = eval(msg);
+ $.each(data, function (rec) {
+ t += "<li><a href='modules/news/article.php?id=" + this.Id + "'>";
+ t += "<img src='" + this.Category + "'/>";
+ t += "<h3>" + this.Title + "</h3>";
+ t += "<p>" + this.Description + "</p>";
+ t += "<p style='font-size:11px'>";
+ t += "<span>Price: €" + this.Price + "</span>";
+ t += "<span> €" + this.PriceForegone + "</span>";
+ t += "<span>" + this.Discount + "%</span>";
+ t += "</p>";
+ t += "</a></li>";
+ });
+ $("[data-role=listview]").html(t);
+ $("[data-role=listview]").listview('refresh');
+ },
+ error: function (msg) {
+ alert(msg.status + ' ' + msg.statusText);
+ }
+ });
+ });
+
// fix the links for subsequent ajax page loads
- $(document).bind( 'pagecreate', fixLinks );
+ $(document).bind( 'pagecreate', fixLinks );
+
+ $( document ).bind( "mobileinit", function(){
+ $.mobile.collapsibleset.prototype.options.collapsedIcon = "arrow-r";
+ $.mobile.page.prototype.options.keepNative = "select, input.foo, textarea.bar";
+ $.mobile.selectmenu.prototype.options.nativeMenu = true;
+ });
// Check to see if ajax can be used. This does a quick ajax request and blocks the page until its done
$.ajax({
@@ -66,9 +133,6 @@
}).error(function() {
// Ajax doesn't work so turn it off
$( document ).bind( "mobileinit", function() {
- $.mobile.ajaxEnabled = true;
- $.support.touchOverflow = true;
- $.mobile.touchOverflowEnabled = true;
var message = $( '<div>' , {
'class': "ui-footer ui-bar-e",
Added: XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/contact/blocks/index.html
===================================================================
--- XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/contact/blocks/index.html (rev 0)
+++ XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/contact/blocks/index.html 2012-12-11 18:24:46 UTC (rev 10361)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/contact/contact_index.html
===================================================================
--- XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/contact/contact_index.html (rev 0)
+++ XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/contact/contact_index.html 2012-12-11 18:24:46 UTC (rev 10361)
@@ -0,0 +1,4 @@
+<div class="contact">
+ <div class="pad2 marg2"><{$info}></div>
+ <div class="pad2 marg2"><{$form}></div>
+</div>
\ No newline at end of file
Added: XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/contact/index.html
===================================================================
--- XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/contact/index.html (rev 0)
+++ XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/contact/index.html 2012-12-11 18:24:46 UTC (rev 10361)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/imprint/blocks/index.html
===================================================================
--- XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/imprint/blocks/index.html (rev 0)
+++ XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/imprint/blocks/index.html 2012-12-11 18:24:46 UTC (rev 10361)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/imprint/imprint_footer.html
===================================================================
--- XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/imprint/imprint_footer.html (rev 0)
+++ XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/imprint/imprint_footer.html 2012-12-11 18:24:46 UTC (rev 10361)
@@ -0,0 +1,11 @@
+<{include file="db:system_barsocials.html"}>
+<div class="left"><{$copyright}></div>
+<{if $adv != '' && !$xoops_isadmin}>
+<br /><div class="center"><{$adv}></div>
+<{/if}>
+<{if $social_active != 0}>
+<div class="center"><{$social_code}></div>
+<{/if}>
+<{if $xoops_isadmin}>
+ <div class="center bold"><a href="<{$imprint_url}>/admin/index.php"><{$smarty.const._MA_IMPRINT_ADMIN}></a></div>
+<{/if}>
\ No newline at end of file
Added: XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/imprint/imprint_header.html
===================================================================
--- XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/imprint/imprint_header.html (rev 0)
+++ XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/imprint/imprint_header.html 2012-12-11 18:24:46 UTC (rev 10361)
@@ -0,0 +1,7 @@
+<div class="box-header">
+ <span class="left"><b>Title</b>: <{$smarty.const._MA_IMPRINT_TITLE}></span><br />
+ <span class="left"><b>Description</b>: <{$smarty.const._MA_IMPRINT_DESC}></span>
+</div>
+<{if $adv != '' && !$xoops_isadmin}>
+<br /><div class="center"><{$adv}></div><br />
+<{/if}>
\ No newline at end of file
Added: XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/imprint/imprint_imp.html
===================================================================
--- XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/imprint/imprint_imp.html (rev 0)
+++ XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/imprint/imprint_imp.html 2012-12-11 18:24:46 UTC (rev 10361)
@@ -0,0 +1,3 @@
+<{include file="db:imprint_header.html"}>
+<div class="outer"></div>
+<{include file="db:imprint_footer.html"}>
\ No newline at end of file
Added: XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/imprint/imprint_index.html
===================================================================
--- XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/imprint/imprint_index.html (rev 0)
+++ XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/imprint/imprint_index.html 2012-12-11 18:24:46 UTC (rev 10361)
@@ -0,0 +1,30 @@
+<{include file="db:imprint_header.html"}>
+<!-- Imprint -->
+<div class="imprint">
+ <!-- Immagine -->
+ <div class="image">
+ <img src="<{$imp.image}>" alt="Imprint" border="0" />
+ </div>
+ <div class="clear"></div>
+ <div class="setdesc">
+ <span><label class="bold"><{$smarty.const._MD_IMPRINT_SOCIETYNAME}></label>: <{$imp.name}></span><br /><br />
+ <span><label class="bold"><{$smarty.const._MD_IMPRINT_ADDRESS}></label>: <{$imp.address}></span><br />
+ <span><label class="bold"><{$smarty.const._MD_IMPRINT_POSTALCODE}></label>: <{$imp.postalcode}></span><br />
+ <span><label class="bold"><{$smarty.const._MD_IMPRINT_CITY}></label>: <{$imp.city}></span><br />
+ <span><label class="bold"><{$smarty.const._MD_IMPRINT_COUNTRY}></label>: <{$imp.country}></span><br /><br />
+ <span><label class="bold"><{$smarty.const._MD_IMPRINT_PHONE}></label>: <{$imp.phone}></span><br />
+ <span><label class="bold"><{$smarty.const._MD_IMPRINT_FAX}></label>: <{$imp.fax}></span><br />
+ <span><label class="bold"><{$smarty.const._MD_IMPRINT_EMAIL}></label>: <{$imp.email}></span><br /><br />
+ </div>
+ <div class="clear"></div>
+ <div class="disclaimer">
+ <span class="bold"><{$imp.title_disclaimer}></span><br /><br />
+ <div class="text">
+ <span><{$imp.disclaimer}></span><br /><br />
+ </div>
+ <div class="clear"></div>
+ </div>
+ <div class="clear"></div>
+</div>
+<div class="clear"></div>
+<{include file="db:imprint_footer.html"}>
\ No newline at end of file
Added: XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/imprint/index.html
===================================================================
--- XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/imprint/index.html (rev 0)
+++ XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/imprint/index.html 2012-12-11 18:24:46 UTC (rev 10361)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/pm/blocks/index.html
===================================================================
--- XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/pm/blocks/index.html (rev 0)
+++ XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/pm/blocks/index.html 2012-12-11 18:24:46 UTC (rev 10361)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/pm/index.html
===================================================================
--- XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/pm/index.html (rev 0)
+++ XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/pm/index.html 2012-12-11 18:24:46 UTC (rev 10361)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/pm/pm_pmlite.html
===================================================================
--- XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/pm/pm_pmlite.html (rev 0)
+++ XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/pm/pm_pmlite.html 2012-12-11 18:24:46 UTC (rev 10361)
@@ -0,0 +1,42 @@
+<{$pmform.javascript}>
+<form name="<{$pmform.name}>" id="<{$pmform.name}>" action="<{$pmform.action}>" method="<{$pmform.method}>" <{$pmform.extra}> >
+ <div class='outer txtcenter width100'>
+ <div>
+ <div class='head width30 txtright'><{$smarty.const._PM_TO}></div>
+ <div class='even txtleft'><{if $pmform.elements.to_userid.hidden != 1}><{$pmform.elements.to_userid.body}><{/if}><{$to_username}></div>
+ </div>
+ <div>
+ <div class='head width30 txtright'><{$smarty.const._PM_SUBJECTC}></div>
+ <div class='even txtleft'><{$pmform.elements.subject.body}></div>
+ </div>
+ <div>
+ <div class='head width30 txtright'><{$smarty.const._PM_SUBJECT_ICONS}></div>
+ <div class='even txtleft'>
+
+ <{foreachq item=icon from=$radio_icons}>
+ <input type='radio' name='icon' id='<{$icon}>' value='<{$icon}>' /><label name='xolb_icon' for='<{$icon}>'><img src='<{xoAppUrl}>images/subject/<{$icon}>' alt="" /></label>
+ <{/foreach}> </div>
+ </div>
+ <div class='aligntop'>
+ <div class='head width30 txtright'><{$smarty.const._PM_MESSAGEC}></div>
+ <div class='even txtleft'><{$pmform.elements.message.body}></div>
+ </div>
+ <div class='aligntop'>
+ <div class='head width30'><{$smarty.const._PM_SAVEINOUTBOX}></div>
+ <div class='even'><{$pmform.elements.savecopy.body}></div>
+ </div>
+ <div>
+ <div class='head'> </div>
+ <div class='even'>
+ <{foreach item=element from=$pmform.elements}>
+ <{if $element.hidden == 1}>
+ <{$element.body}>
+ <{/if}>
+ <{/foreach}>
+ <{$pmform.elements.submit.body}>
+ <{$pmform.elements.reset.body}>
+ <{$pmform.elements.cancel.body}>
+ </div>
+ </div>
+ </div>
+</form>
\ No newline at end of file
Added: XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/pm/pm_readpmsg.html
===================================================================
--- XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/pm/pm_readpmsg.html (rev 0)
+++ XoopsCore/tags/2.5mobile timgno/htdocs/themes/mdefault/modules/pm/pm_readpmsg.html 2012-12-11 18:24:46 UTC (rev 10361)
@@ -0,0 +1,79 @@
+<div>
+ <h4><{$smarty.const._PM_PRIVATEMESSAGE}></h4>
+</div><br />
+<div class="floatright txtright" style="width: 32%;">
+ <{if $op == "out"}>
+ <a href='viewpmsg.php?op=in' title='<{$smarty.const._PM_INBOX}>'><{$smarty.const._PM_INBOX}></a> | <a href='viewpmsg.php?op=save' title='<{$smarty.const._PM_SAVEBOX}>'><{$smarty.const._PM_SAVEBOX}></a>
+ <{elseif $op == "save"}>
+ <a href='viewpmsg.php?op=in' title='<{$smarty.const._PM_INBOX}>'><{$smarty.const._PM_INBOX}></a> | <a href='viewpmsg.php?op=out' title='<{$smarty.const._PM_OUTBOX}>'><{$smarty.const._PM_OUTBOX}></a>
+ <{elseif $op == "in"}>
+ <a href='viewpmsg.php?op=out' title='<{$smarty.const._PM_OUTBOX}>'><{$smarty.const._PM_OUTBOX}></a> | <a href='viewpmsg.php?op=save' title='<{$smarty.const._PM_SAVEBOX}>'><{$smarty.const._PM_SAVEBOX}></a>
+ <{/if}>
+</div>
+
+<{if $message}>
+ <span class='bold'>»»</span> <{$message.subject}><br />
+ <form name="<{$pmform.name}>" id="<{$pmform.name}>" action="<{$pmform.action}>" method="<{$pmform.method}>" <{$pmform.extra}> >
+ <table cellpadding='4' cellspacing='1' class='outer bnone width100'>
+ <tr>
+ <th colspan='2'><{if $op==out}><{$smarty.const._PM_TO}><{else}><{$smarty.const._PM_FROM}><{/if}></th>
+ </tr>
+ <tr class='even'>
+ <td class='aligntop'>
+ <{if ( $poster != false ) }>
+ <a href='<{$xoops_url}>/userinfo.php?uid=<{$poster->getVar("uid")}>'><{$poster->getVar("uname")}></a><br />
+ <{if ( $poster->getVar("user_avatar") != "" ) }>
+ <img src='<{$xoops_url}>/uploads/<{$poster->getVar("user_avatar")}>' alt='' /><br />
+ <{/if}>
+ <{if ( $poster->getVar("user_from") != "" ) }>
+ <{$smarty.const._PM_FROMC}><{$poster->getVar("user_from")}><br /><br />
+ <{/if}>
+ <{if ( $poster->isOnline() ) }>
+ <span class='bold red'><{$smarty.const._PM_ONLINE}></span><br /><br />
+ <{/if}>
+ <{else}>
+ <{$anonymous}>
+ <{/if}>
+ </td>
+ <td>
+ <{if $message.msg_image != ""}>
+ <img src='<{$xoops_url}>/images/subject/<{$message.msg_image}>' alt='' />
+ <{/if}>
+ ...
[truncated message content] |
|
From: <du...@us...> - 2012-12-11 17:19:53
|
Revision: 10360
http://sourceforge.net/p/xoops/svn/10360
Author: dugris
Date: 2012-12-11 17:19:50 +0000 (Tue, 11 Dec 2012)
Log Message:
-----------
fix class/model
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/joint.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/read.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/joint.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/joint.php 2012-12-11 14:36:16 UTC (rev 10359)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/joint.php 2012-12-11 17:19:50 UTC (rev 10360)
@@ -94,13 +94,13 @@
$sql = " SELECT {$select}" . " FROM {$this->handler->table} AS o" . " LEFT JOIN {$this->handler->table_link} AS l ON o.{$this->handler->field_object} = l.{$this->handler->field_link}";
if (isset($criteria) && is_subclass_of($criteria, "criteriaelement")) {
$sql .= " " . $criteria->renderWhere();
+ if ($criteria->getGroupby() != '') {
+ $sql .= ' GROUP BY (' . $criteria->getGroupby() . ')';
+ }
if ($sort = $criteria->getSort()) {
$sql .= " ORDER BY {$sort} " . $criteria->getOrder();
$orderSet = true;
}
- if ($criteria->get |
|
From: <be...@us...> - 2012-12-11 14:36:20
|
Revision: 10359
http://sourceforge.net/p/xoops/svn/10359
Author: beckmi
Date: 2012-12-11 14:36:16 +0000 (Tue, 11 Dec 2012)
Log Message:
-----------
conversion to mysqli (see the readme_myqsli_conversion_warnings.txt)
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/Frameworks/art/functions.php
XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/Frameworks/art/object.php
XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/class/database/mysqldatabase.php
XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/class/model/sync.php
XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/class/moduleadmin.php
XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/install/include/functions.php
XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/install/page_dbsettings.php
XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/install/page_modcheck.php
XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/kernel/notification.php
XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/modules/logger/plugins/pqp/logger.php
XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/modules/maintenance/class/maintenance.php
XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/modules/protector/admin/prefix_manager.php
XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/modules/protector/class/protector.php
XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/modules/system/class/thumbs/phpThumb.php
Modified: XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/Frameworks/art/functions.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/Frameworks/art/functions.php 2012-12-11 14:27:48 UTC (rev 10358)
+++ XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/Frameworks/art/functions.php 2012-12-11 14:36:16 UTC (rev 10359)
@@ -42,9 +42,9 @@
return $mysql_version;
}
if (!is_null($conn)) {
- $mysql_version = mysql_get_server_info($conn);
+ $mysql_version = ((is_null($___mysqli_res = mysqli_get_server_info($conn))) ? false : $___mysqli_res);
} else {
- $mysql_version = mysql_get_server_info();
+ $mysql_version = ((is_null($___mysqli_res = mysqli_get_server_info($GLOBALS["___mysqli_ston"]))) ? false : $___mysqli_res);
}
return $mysql_version;
}
Modified: XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/Frameworks/art/object.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/Frameworks/art/object.php 2012-12-11 14:27:48 UTC (rev 10358)
+++ XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/Frameworks/art/object.php 2012-12-11 14:36:16 UTC (rev 10359)
@@ -84,9 +84,9 @@
function mysql_server_version($conn = null)
{
if (!is_null($conn)) {
- return mysql_get_server_info($conn);
+ return ((is_null($___mysqli_res = mysqli_get_server_info($conn))) ? false : $___mysqli_res);
} else {
- return mysql_get_server_info();
+ return ((is_null($___mysqli_res = mysqli_get_server_info($GLOBALS["___mysqli_ston"]))) ? false : $___mysqli_res);
}
}
Modified: XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/class/database/mysqldatabase.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/class/database/mysqldatabase.php 2012-12-11 14:27:48 UTC (rev 10358)
+++ XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/class/database/mysqldatabase.php 2012-12-11 14:36:16 UTC (rev 10359)
@@ -45,17 +45,17 @@
{
static $db_charset_set;
- if (!extension_loaded('mysql')) {
- trigger_error('notrace:mysql extension not loaded', E_USER_ERROR);
+ if (!extension_loaded('mysqli')) {
+ trigger_error('notrace:mysqli extension not loaded', E_USER_ERROR);
return false;
}
$this->allowWebChanges = ($_SERVER['REQUEST_METHOD'] != 'GET');
if (XOOPS_DB_PCONNECT == 1) {
- $this->conn = @mysql_pconnect(XOOPS_DB_HOST, XOOPS_DB_USER, XOOPS_DB_PASS);
+ $this->conn = @($GLOBALS["___mysqli_ston"] = mysqli_connect(XOOPS_DB_HOST, XOOPS_DB_USER, XOOPS_DB_PASS));
} else {
- $this->conn = @mysql_connect(XOOPS_DB_HOST, XOOPS_DB_USER, XOOPS_DB_PASS);
+ $this->conn = @($GLOBALS["___mysqli_ston"] = mysqli_connect(XOOPS_DB_HOST, XOOPS_DB_USER, XOOPS_DB_PASS));
}
if (!$this->conn) {
@@ -64,7 +64,7 @@
return false;
}
if ($selectdb != false) {
- if (!mysql_select_db(XOOPS_DB_NAME)) {
+ if (!((bool)mysqli_query($GLOBALS["___mysqli_ston"], "USE " . constant('XOOPS_DB_NAME')))) {
$xoopsPreload = XoopsPreload::getInstance();
$xoopsPreload->triggerEvent('core.database.nodb');
return false;
@@ -100,7 +100,7 @@
*/
public function fetchRow($result)
{
- return @mysql_fetch_row($result);
+ return @mysqli_fetch_row($result);
}
/**
@@ -111,7 +111,7 @@
*/
public function fetchArray($result)
{
- return @mysql_fetch_assoc($result);
+ return @mysqli_fetch_assoc($result);
}
/**
@@ -122,7 +122,7 @@
*/
public function fetchBoth($result)
{
- return @mysql_fetch_array($result, MYSQL_BOTH);
+ return @mysqli_fetch_array($result, MYSQLI_BOTH);
}
/**
@@ -133,7 +133,7 @@
*/
public function fetchObject($result)
{
- return @mysql_fetch_object($result);
+ return @mysqli_fetch_object($result);
}
/**
@@ -143,7 +143,7 @@
*/
public function getInsertId()
{
- return mysql_insert_id($this->conn);
+ return ((is_null($___mysqli_res = mysqli_insert_id($this->conn))) ? false : $___mysqli_res);
}
/**
@@ -154,7 +154,7 @@
*/
public function getRowsNum($result)
{
- return @mysql_num_rows($result);
+ return @mysqli_num_rows($result);
}
/**
@@ -164,7 +164,7 @@
*/
public function getAffectedRows()
{
- return mysql_affected_rows($this->conn);
+ return mysqli_affected_rows($this->conn);
}
/**
@@ -174,7 +174,7 @@
*/
public function close()
{
- mysql_close($this->conn);
+ ((is_null($___mysqli_res = mysqli_close($this->conn))) ? false : $___mysqli_res);
}
/**
@@ -185,7 +185,7 @@
*/
public function freeRecordSet($result)
{
- return mysql_free_result($result);
+ return ((mysqli_free_result($result) || (is_object($result) && (get_class($result) == "mysqli_result"))) ? true : false);
}
/**
@@ -195,7 +195,7 @@
*/
public function error()
{
- return @mysql_error();
+ return @((is_object($GLOBALS["___mysqli_ston"])) ? mysqli_error($GLOBALS["___mysqli_ston"]) : (($___mysqli_res = mysqli_connect_error()) ? $___mysqli_res : false));
}
/**
@@ -205,7 +205,7 @@
*/
public function errno()
{
- return @mysql_errno();
+ return @((is_object($GLOBALS["___mysqli_ston"])) ? mysqli_errno($GLOBALS["___mysqli_ston"]) : (($___mysqli_res = mysqli_connect_errno()) ? $___mysqli_res : false));
}
/**
@@ -227,7 +227,7 @@
*/
public function quote($string)
{
- return "'" . str_replace("\\\"", '"', str_replace("\\"", '"', mysql_real_escape_string($string, $this->conn))) . "'";
+ return "'" . str_replace("\\\"", '"', str_replace("\\"", '"', mysqli_real_escape_string( $this->conn, $string))) . "'";
}
/**
@@ -249,7 +249,7 @@
}
$xoopsPreload = XoopsPreload::getInstance();
$xoopsPreload->triggerEvent('core.database.query.start');
- $result = mysql_query($sql, $this->conn);
+ $result = mysqli_query( $this->conn, $sql);
$xoopsPreload->triggerEvent('core.database.query.end');
if ($result) {
@@ -309,7 +309,7 @@
*/
public function getFieldName($result, $offset)
{
- return mysql_field_name($result, $offset);
+ return ((($___mysqli_tmp = mysqli_fetch_field_direct($result, 0)->name) && (!is_null($___mysqli_tmp))) ? $___mysqli_tmp : false);
}
/**
@@ -321,7 +321,7 @@
*/
public function getFieldType($result, $offset)
{
- return mysql_field_type($result, $offset);
+ return ((is_object($___mysqli_tmp = mysqli_fetch_field_direct($result, 0)) && !is_null($___mysqli_tmp = $___mysqli_tmp->type)) ? ((($___mysqli_tmp = (string)(substr(( (($___mysqli_tmp == MYSQLI_TYPE_STRING) || ($___mysqli_tmp == MYSQLI_TYPE_VAR_STRING) ) ? "string " : "" ) . ( (in_array($___mysqli_tmp, array(MYSQLI_TYPE_TINY, MYSQLI_TYPE_SHORT, MYSQLI_TYPE_LONG, MYSQLI_TYPE_LONGLONG, MYSQLI_TYPE_INT24))) ? "int " : "" ) . ( (in_array($___mysqli_tmp, array(MYSQLI_TYPE_FLOAT, MYSQLI_TYPE_DOUBLE, MYSQLI_TYPE_DECIMAL, ((defined("MYSQLI_TYPE_NEWDECIMAL")) ? constant("MYSQLI_TYPE_NEWDECIMAL") : -1)))) ? "real " : "" ) . ( ($___mysqli_tmp == MYSQLI_TYPE_TIMESTAMP) ? "timestamp " : "" ) . ( ($___mysqli_tmp == MYSQLI_TYPE_YEAR) ? "year " : "" ) . ( (($___mysqli_tmp == MYSQLI_TYPE_DATE) || ($___mysqli_tmp == MYSQLI_TYPE_NEWDATE) ) ? "date " : "" ) . ( ($___mysqli_tmp == MYSQLI_TYPE_TIME) ? "time " : "" ) . ( ($___mysqli_tmp == MYSQLI_TYPE_SET) ? "set " : "" ) . ( ($___mysqli_tmp == MYSQLI_TYPE_ENUM) ? "enum " : "" ) . ( ($___mysqli_tmp == MYSQLI_TYPE_GEOMETRY) ? "geometry " : "" ) . ( ($___mysqli_tmp == MYSQLI_TYPE_DATETIME) ? "datetime " : "" ) . ( (in_array($___mysqli_tmp, array(MYSQLI_TYPE_TINY_BLOB, MYSQLI_TYPE_BLOB, MYSQLI_TYPE_MEDIUM_BLOB, MYSQLI_TYPE_LONG_BLOB))) ? "blob " : "" ) . ( ($___mysqli_tmp == MYSQLI_TYPE_NULL) ? "null " : "" ), 0, -1))) == "") ? "unknown" : $___mysqli_tmp) : false);
}
/**
@@ -332,7 +332,7 @@
*/
public function getFieldsNum($result)
{
- return mysql_num_fields($result);
+ return (($___mysqli_tmp = mysqli_num_fields($result)) ? $___mysqli_tmp : false);
}
}
Modified: XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/class/model/sync.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/class/model/sync.php 2012-12-11 14:27:48 UTC (rev 10358)
+++ XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/class/model/sync.php 2012-12-11 14:36:16 UTC (rev 10359)
@@ -68,7 +68,7 @@
/**
* for MySQL 4.1+
*/
- if (version_compare(mysql_get_server_info(), "4.1.0", "ge")) {
+ if (version_compare(((is_null($___mysqli_res = mysqli_get_server_info($GLOBALS["___mysqli_ston"]))) ? false : $___mysqli_res), "4.1.0", "ge")) {
$sql = "DELETE FROM `{$this->handler->table}`"
. " WHERE (`{$this->handler->field_object}` NOT IN ( SELECT DISTINCT `{$this->handler->field_link}` FROM `{$this->handler->table_link}`) )";
} else {
Modified: XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/class/moduleadmin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/class/moduleadmin.php 2012-12-11 14:27:48 UTC (rev 10358)
+++ XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/class/moduleadmin.php 2012-12-11 14:36:16 UTC (rev 10359)
@@ -372,7 +372,7 @@
if ($dbarray[XOOPS_DB_TYPE]) {
switch (XOOPS_DB_TYPE) {
case "mysql":
- $dbCurrentVersion = mysql_get_server_info();
+ $dbCurrentVersion = ((is_null($___mysqli_res = mysqli_get_server_info($GLOBALS["___mysqli_ston"]))) ? false : $___mysqli_res);
break;
case "mysqli":
$dbCurrentVersion = mysqli_get_server_info();
Modified: XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/install/include/functions.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/install/include/functions.php 2012-12-11 14:27:48 UTC (rev 10358)
+++ XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/install/include/functions.php 2012-12-11 14:36:16 UTC (rev 10359)
@@ -255,8 +255,8 @@
$charsets["utf8"] = "UTF-8 Unicode";
$ut8_available = false;
- if ($result = mysql_query("SHOW CHARSET", $link)) {
- while ($row = mysql_fetch_assoc($result)) {
+ if ($result = mysqli_query( $link, "SHOW CHARSET")) {
+ while ($row = mysqli_fetch_assoc($result)) {
$charsets[$row["Charset"]] = $row["Description"];
if ($row["Charset"] == "utf8") {
$ut8_available = true;
@@ -282,8 +282,8 @@
return $collations[$charset];
}
- if ($result = mysql_query("SHOW COLLATION WHERE CHARSET = '" . mysql_real_escape_string($charset) . "'", $link)) {
- while ($row = mysql_fetch_assoc($result)) {
+ if ($result = mysqli_query( $link, "SHOW COLLATION WHERE CHARSET = '" . ((isset($GLOBALS["___mysqli_ston"]) && is_object($GLOBALS["___mysqli_ston"])) ? mysqli_real_escape_string($GLOBALS["___mysqli_ston"], $charset) : ((trigger_error("[MySQLConverterToo] Fix the mysql_escape_string() call! This code does not work.", E_USER_ERROR)) ? "" : "")) . "'")) {
+ while ($row = mysqli_fetch_assoc($result)) {
$collations[$charset][$row["Collation"]] = $row["Default"] ? 1 : 0;
}
}
@@ -304,7 +304,7 @@
if (empty($charset)) {
$collation = "";
}
- if (version_compare(mysql_get_server_info($link), "4.1.0", "lt")) {
+ if (version_compare(((is_null($___mysqli_res = mysqli_get_server_info($link))) ? false : $___mysqli_res), "4.1.0", "lt")) {
$charset = $collation = "";
}
if (empty($charset) && empty($collation)) {
@@ -337,7 +337,7 @@
*/
function xoFormFieldCollation($name, $value, $label, $help, $link, $charset)
{
- if (version_compare(mysql_get_server_info($link), "4.1.0", "lt")) {
+ if (version_compare(((is_null($___mysqli_res = mysqli_get_server_info($link))) ? false : $___mysqli_res), "4.1.0", "lt")) {
return "";
}
if (empty($charset) || !$collations = getDbCollations($link, $charset)) {
@@ -402,7 +402,7 @@
*/
function xoFormFieldCharset($name, $value, $label, $help = '', $link)
{
- if (version_compare(mysql_get_server_info($link), "4.1.0", "lt")) {
+ if (version_compare(((is_null($___mysqli_res = mysqli_get_server_info($link))) ? false : $___mysqli_res), "4.1.0", "lt")) {
return "";
}
if (!$chars = getDbCharsets($link)) {
Modified: XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/install/page_dbsettings.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/install/page_dbsettings.php 2012-12-11 14:27:48 UTC (rev 10358)
+++ XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/install/page_dbsettings.php 2012-12-11 14:36:16 UTC (rev 10359)
@@ -57,18 +57,18 @@
$error = validateDbCharset($link, $vars['DB_CHARSET'], $vars['DB_COLLATION']);
$db_exist = true;
if (empty($error)) {
- if (!@mysql_select_db($vars['DB_NAME'], $link)) {
+ if (!@((bool)mysqli_query( $link, "USE $vars['DB_NAME']"))) {
// Database not here: try to create it
- $result = mysql_query("CREATE DATABASE `" . $vars['DB_NAME'] . '`');
+ $result = mysqli_query($GLOBALS["___mysqli_ston"], "CREATE DATABASE `" . $vars['DB_NAME'] . '`');
if (!$result) {
$error = ERR_NO_DATABASE;
$db_exist = false;
}
}
if ($db_exist && $vars['DB_CHARSET']) {
- $sql = "ALTER DATABASE `" . $vars['DB_NAME'] . "` DEFAULT CHARACTER SET " . mysql_real_escape_string($vars['DB_CHARSET']) . ($vars['DB_COLLATION']
- ? " COLLATE " . mysql_real_escape_string($vars['DB_COLLATION']) : "");
- if (!mysql_query($sql)) {
+ $sql = "ALTER DATABASE `" . $vars['DB_NAME'] . "` DEFAULT CHARACTER SET " . ((isset($GLOBALS["___mysqli_ston"]) && is_object($GLOBALS["___mysqli_ston"])) ? mysqli_real_escape_string($GLOBALS["___mysqli_ston"], $vars['DB_CHARSET']) : ((trigger_error("[MySQLConverterToo] Fix the mysql_escape_string() call! This code does not work.", E_USER_ERROR)) ? "" : "")) . ($vars['DB_COLLATION']
+ ? " COLLATE " . ((isset($GLOBALS["___mysqli_ston"]) && is_object($GLOBALS["___mysqli_ston"])) ? mysqli_real_escape_string($GLOBALS["___mysqli_ston"], $vars['DB_COLLATION']) : ((trigger_error("[MySQLConverterToo] Fix the mysql_escape_string() call! This code does not work.", E_USER_ERROR)) ? "" : "")) : "");
+ if (!mysqli_query($GLOBALS["___mysqli_ston"], $sql)) {
$error = ERR_CHARSET_NOT_SET . $sql;
}
}
Modified: XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/install/page_modcheck.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/install/page_modcheck.php 2012-12-11 14:27:48 UTC (rev 10358)
+++ XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/install/page_modcheck.php 2012-12-11 14:36:16 UTC (rev 10359)
@@ -59,7 +59,7 @@
<tr>
<th><?php printf(PHP_EXTENSION,'MySQL'); ?></th>
- <td><?php echo xoDiag(function_exists('mysql_connect') ? 1 : -1, @mysql_get_client_info()); ?></td>
+ <td><?php echo xoDiag(function_exists('mysqli_connect') ? 1 : -1, @mysqli_get_client_info()); ?></td>
</tr>
<tr>
Modified: XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/kernel/notification.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/kernel/notification.php 2012-12-11 14:27:48 UTC (rev 10358)
+++ XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/kernel/notification.php 2012-12-11 14:36:16 UTC (rev 10359)
@@ -282,9 +282,9 @@
{
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('not_modid', intval($module_id)));
- $criteria->add(new Criteria('not_category', mysql_real_escape_string($category)));
+ $criteria->add(new Criteria('not_category', ((isset($GLOBALS["___mysqli_ston"]) && is_object($GLOBALS["___mysqli_ston"])) ? mysqli_real_escape_string($GLOBALS["___mysqli_ston"], $category) : ((trigger_error("[MySQLConverterToo] Fix the mysql_escape_string() call! This code does not work.", E_USER_ERROR)) ? "" : ""))));
$criteria->add(new Criteria('not_itemid', intval($item_id)));
- $criteria->add(new Criteria('not_event', mysql_real_escape_string($event)));
+ $criteria->add(new Criteria('not_event', ((isset($GLOBALS["___mysqli_ston"]) && is_object($GLOBALS["___mysqli_ston"])) ? mysqli_real_escape_string($GLOBALS["___mysqli_ston"], $event) : ((trigger_error("[MySQLConverterToo] Fix the mysql_escape_string() call! This code does not work.", E_USER_ERROR)) ? "" : ""))));
$criteria->add(new Criteria('not_uid', intval($user_id)));
$objects = $this->getObjectsArray($criteria);
if (count($objects) == 1) {
@@ -310,9 +310,9 @@
{
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('not_modid', intval($module_id)));
- $criteria->add(new Criteria('not_category', mysql_real_escape_string($category)));
+ $criteria->add(new Criteria('not_category', ((isset($GLOBALS["___mysqli_ston"]) && is_object($GLOBALS["___mysqli_ston"])) ? mysqli_real_escape_string($GLOBALS["___mysqli_ston"], $category) : ((trigger_error("[MySQLConverterToo] Fix the mysql_escape_string() call! This code does not work.", E_USER_ERROR)) ? "" : ""))));
$criteria->add(new Criteria('not_itemid', intval($item_id)));
- $criteria->add(new Criteria('not_event', mysql_real_escape_string($event)));
+ $criteria->add(new Criteria('not_event', ((isset($GLOBALS["___mysqli_ston"]) && is_object($GLOBALS["___mysqli_ston"])) ? mysqli_real_escape_string($GLOBALS["___mysqli_ston"], $event) : ((trigger_error("[MySQLConverterToo] Fix the mysql_escape_string() call! This code does not work.", E_USER_ERROR)) ? "" : ""))));
$criteria->add(new Criteria('not_uid', intval($user_id)));
return $this->getCount($criteria);
}
@@ -410,7 +410,7 @@
{
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('not_modid', intval($module_id)));
- $criteria->add(new Criteria('not_category', mysql_real_escape_string($category)));
+ $criteria->add(new Criteria('not_category', ((isset($GLOBALS["___mysqli_ston"]) && is_object($GLOBALS["___mysqli_ston"])) ? mysqli_real_escape_string($GLOBALS["___mysqli_ston"], $category) : ((trigger_error("[MySQLConverterToo] Fix the mysql_escape_string() call! This code does not work.", E_USER_ERROR)) ? "" : ""))));
if ($item_id) {
$criteria->add(new Criteria('not_itemid', intval($item_id)));
}
@@ -522,9 +522,9 @@
}
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('not_modid', intval($module_id)));
- $criteria->add(new Criteria('not_category', mysql_real_escape_string($category)));
+ $criteria->add(new Criteria('not_category', ((isset($GLOBALS["___mysqli_ston"]) && is_object($GLOBALS["___mysqli_ston"])) ? mysqli_real_escape_string($GLOBALS["___mysqli_ston"], $category) : ((trigger_error("[MySQLConverterToo] Fix the mysql_escape_string() call! This code does not work.", E_USER_ERROR)) ? "" : ""))));
$criteria->add(new Criteria('not_itemid', intval($item_id)));
- $criteria->add(new Criteria('not_event', mysql_real_escape_string($event)));
+ $criteria->add(new Criteria('not_event', ((isset($GLOBALS["___mysqli_ston"]) && is_object($GLOBALS["___mysqli_ston"])) ? mysqli_real_escape_string($GLOBALS["___mysqli_ston"], $event) : ((trigger_error("[MySQLConverterToo] Fix the mysql_escape_string() call! This code does not work.", E_USER_ERROR)) ? "" : ""))));
$mode_criteria = new CriteriaCompo();
$mode_criteria->add(new Criteria('not_mode', XOOPS_NOTIFICATION_MODE_SENDALWAYS), 'OR');
$mode_criteria->add(new Criteria('not_mode', XOOPS_NOTIFICATION_MODE_SENDONCETHENDELETE), 'OR');
@@ -640,7 +640,7 @@
}
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('not_modid', intval($module_id)));
- $criteria->add(new Criteria('not_category', mysql_real_escape_string($category)));
+ $criteria->add(new Criteria('not_category', ((isset($GLOBALS["___mysqli_ston"]) && is_object($GLOBALS["___mysqli_ston"])) ? mysqli_real_escape_string($GLOBALS["___mysqli_ston"], $category) : ((trigger_error("[MySQLConverterToo] Fix the mysql_escape_string() call! This code does not work.", E_USER_ERROR)) ? "" : ""))));
$criteria->add(new Criteria('not_itemid', intval($item_id)));
$criteria->add(new Criteria('not_uid', intval($user_id)));
if (!is_array($events)) {
@@ -648,7 +648,7 @@
}
$event_criteria = new CriteriaCompo();
foreach ($events as $event) {
- $event_criteria->add(new Criteria('not_event', mysql_real_escape_string($event)), 'OR');
+ $event_criteria->add(new Criteria('not_event', ((isset($GLOBALS["___mysqli_ston"]) && is_object($GLOBALS["___mysqli_ston"])) ? mysqli_real_escape_string($GLOBALS["___mysqli_ston"], $event) : ((trigger_error("[MySQLConverterToo] Fix the mysql_escape_string() call! This code does not work.", E_USER_ERROR)) ? "" : ""))), 'OR');
}
$criteria->add($event_criteria);
return $this->deleteAll($criteria);
@@ -682,7 +682,7 @@
{
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('not_modid', intval($module_id)));
- $criteria->add(new Criteria('not_category', mysql_real_escape_string($category)));
+ $criteria->add(new Criteria('not_category', ((isset($GLOBALS["___mysqli_ston"]) && is_object($GLOBALS["___mysqli_ston"])) ? mysqli_real_escape_string($GLOBALS["___mysqli_ston"], $category) : ((trigger_error("[MySQLConverterToo] Fix the mysql_escape_string() call! This code does not work.", E_USER_ERROR)) ? "" : ""))));
$criteria->add(new Criteria('not_itemid', intval($item_id)));
return $this->deleteAll($criteria);
}
Modified: XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/modules/logger/plugins/pqp/logger.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/modules/logger/plugins/pqp/logger.php 2012-12-11 14:27:48 UTC (rev 10358)
+++ XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/modules/logger/plugins/pqp/logger.php 2012-12-11 14:36:16 UTC (rev 10359)
@@ -306,11 +306,11 @@
$this->db =& XoopsDatabaseFactory::getDatabaseConnection();
try {
$sql = 'EXPLAIN ' . $query['sql'];
- $rs = mysql_query($sql, $this->db->conn);
+ $rs = mysqli_query( $this->db->conn, $sql);
} catch (Exception $e) {
}
if ($rs) {
- $row = mysql_fetch_array($rs, MYSQL_ASSOC);
+ $row = mysqli_fetch_array($rs, MYSQLI_ASSOC);
$query['explain'] = $row;
}
return $query;
Modified: XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/modules/maintenance/class/maintenance.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/modules/maintenance/class/maintenance.php 2012-12-11 14:27:48 UTC (rev 10358)
+++ XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/modules/maintenance/class/maintenance.php 2012-12-11 14:36:16 UTC (rev 10359)
@@ -112,7 +112,7 @@
$field_type = array();
$i = 0;
while ($i < $num_fields) {
- $meta = mysql_fetch_field($result, $i);
+ $meta = (((($___mysqli_tmp = mysqli_fetch_field_direct($result, 0)) && is_object($___mysqli_tmp)) ? ( (!is_null($___mysqli_tmp->primary_key = ($___mysqli_tmp->flags & MYSQLI_PRI_KEY_FLAG) ? 1 : 0)) && (!is_null($___mysqli_tmp->multiple_key = ($___mysqli_tmp->flags & MYSQLI_MULTIPLE_KEY_FLAG) ? 1 : 0)) && (!is_null($___mysqli_tmp->unique_key = ($___mysqli_tmp->flags & MYSQLI_UNIQUE_KEY_FLAG) ? 1 : 0)) && (!is_null($___mysqli_tmp->numeric = (int)(($___mysqli_tmp->type <= MYSQLI_TYPE_INT24) || ($___mysqli_tmp->type == MYSQLI_TYPE_YEAR) || ((defined("MYSQLI_TYPE_NEWDECIMAL")) ? ($___mysqli_tmp->type == MYSQLI_TYPE_NEWDECIMAL) : 0)))) && (!is_null($___mysqli_tmp->blob = (int)in_array($___mysqli_tmp->type, array(MYSQLI_TYPE_TINY_BLOB, MYSQLI_TYPE_BLOB, MYSQLI_TYPE_MEDIUM_BLOB, MYSQLI_TYPE_LONG_BLOB)))) && (!is_null($___mysqli_tmp->unsigned = ($___mysqli_tmp->flags & MYSQLI_UNSIGNED_FLAG) ? 1 : 0)) && (!is_null($___mysqli_tmp->zerofill = ($___mysqli_tmp->flags & MYSQLI_ZEROFILL_FLAG) ? 1 : 0)) && (!is_null($___mysqli_type = $___mysqli_tmp->type)) && (!is_null($___mysqli_tmp->type = (($___mysqli_type == MYSQLI_TYPE_STRING) || ($___mysqli_type == MYSQLI_TYPE_VAR_STRING)) ? "type" : "")) &&(!is_null($___mysqli_tmp->type = ("" == $___mysqli_tmp->type && in_array($___mysqli_type, array(MYSQLI_TYPE_TINY, MYSQLI_TYPE_SHORT, MYSQLI_TYPE_LONG, MYSQLI_TYPE_LONGLONG, MYSQLI_TYPE_INT24))) ? "int" : $___mysqli_tmp->type)) &&(!is_null($___mysqli_tmp->type = ("" == $___mysqli_tmp->type && in_array($___mysqli_type, array(MYSQLI_TYPE_FLOAT, MYSQLI_TYPE_DOUBLE, MYSQLI_TYPE_DECIMAL, ((defined("MYSQLI_TYPE_NEWDECIMAL")) ? constant("MYSQLI_TYPE_NEWDECIMAL") : -1)))) ? "real" : $___mysqli_tmp->type)) && (!is_null($___mysqli_tmp->type = ("" == $___mysqli_tmp->type && $___mysqli_type == MYSQLI_TYPE_TIMESTAMP) ? "timestamp" : $___mysqli_tmp->type)) && (!is_null($___mysqli_tmp->type = ("" == $___mysqli_tmp->type && $___mysqli_type == MYSQLI_TYPE_YEAR) ? "year" : $___mysqli_tmp->type)) && (!is_null($___mysqli_tmp->type = ("" |
|
From: <be...@us...> - 2012-12-11 14:27:52
|
Revision: 10358
http://sourceforge.net/p/xoops/svn/10358
Author: beckmi
Date: 2012-12-11 14:27:48 +0000 (Tue, 11 Dec 2012)
Log Message:
-----------
Creating branch for Conversion to mysqli
Added Paths:
-----------
XoopsCore/branches/2.6.x/2.6.0_mysqli/
|
|
From: <tr...@us...> - 2012-12-11 14:04:00
|
Revision: 10357
http://sourceforge.net/p/xoops/svn/10357
Author: trabis
Date: 2012-12-11 14:03:58 +0000 (Tue, 11 Dec 2012)
Log Message:
-----------
Cosmetic Change in codex menus
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/codex/index.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/codex/xoops_version.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/codex/index.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/codex/index.php 2012-12-11 11:53:17 UTC (rev 10356)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/codex/index.php 2012-12-11 14:03:58 UTC (rev 10357)
@@ -23,7 +23,8 @@
$files = XoopsLists::getFileListAsArray(dirname(__FILE__));
foreach ($files as $file) {
if (!in_array($file, array('xoops_version.php', 'index.php'))) {
- echo "<a href={$file}>{$file}</a><br/>";
+ $fileName = ucfirst(str_replace('.php', '', $file));
+ echo "<a href={$file}>{$fileName}</a><br/>";
}
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/codex/xoops_version.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/codex/xoops_version.php 2012-12-11 11:53:17 UTC (rev 10356)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/codex/xoops_version.php 2012-12-11 14:03:58 UTC (rev 10357)
@@ -61,7 +61,8 @@
$i = 0;
foreach ($files as $file) {
if (!in_array($file, array('xoops_version.php', 'index.php'))) {
- $modversion['sub'][$i]['name'] = $file;
+ $fileName = ucfirst(str_replace('.php', '', $file));
+ $modversion['sub'][$i]['name'] = $fileName;
$modversion['sub'][$i]['url'] = $file;
$i++;
}
|
|
From: <du...@us...> - 2012-12-11 11:53:19
|
Revision: 10356
http://sourceforge.net/p/xoops/svn/10356
Author: dugris
Date: 2012-12-11 11:53:17 +0000 (Tue, 11 Dec 2012)
Log Message:
-----------
Fix : search
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_search.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/search.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_search.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_search.html 2012-12-11 03:01:22 UTC (rev 10355)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_search.html 2012-12-11 11:53:17 UTC (rev 10356)
@@ -49,7 +49,9 @@
<{if $result.uid}>
<a href="<{$xoops_url}>/userinfo.php?uid=<{$result.uid}>" title="<{$result.uname}>"><{$result.uname}></a>
<{/if}>
- ( <{$result.time}> )
+ <{if $result.time}>
+ (<{$result.time}>)
+ <{/if}>
</span>
</div>
<{/foreach}>
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/search.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/search.php 2012-12-11 03:01:22 UTC (rev 10355)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/search.php 2012-12-11 11:53:17 UTC (rev 10356)
@@ -187,9 +187,11 @@
}
$res[$i]['title'] = $myts->htmlspecialchars($results[$i]['title']);
$res[$i]['title_highligh'] = preg_replace( $queries_pattern, "<span class='searchHighlight'>$1</span>", $myts->htmlspecialchars($results[$i]['title']));
- $res[$i]['uid'] = @intval($results[$i]['uid']);
- $res[$i]['uname'] = XoopsUser::getUnameFromId($results[$i]['uid'], true);
- $res[$i]['time'] = !empty($results[$i]['time']) ? " (" . XoopsLocal::formatTimestamp(intval($results[$i]['time'])) . ")" : "";
+ if ( !empty($results[$i]['uid']) ) {
+ $res[$i]['uid'] = intval($results[$i]['uid']);
+ $res[$i]['uname'] = XoopsUser::getUnameFromId($results[$i]['uid'], true);
+ }
+ $res[$i]['time'] = !empty($results[$i]['time']) ? XoopsLocal::formatTimestamp(intval($results[$i]['time'])) : "";
$res[$i]['content'] = empty($results[$i]['content']) ? "" : preg_replace( $queries_pattern, "<span class='searchHighlight'>$1</span>", $results[$i]['content']);
}
if ($count >= 5) {
|
|
From: <du...@us...> - 2012-12-11 03:01:25
|
Revision: 10355
http://sourceforge.net/p/xoops/svn/10355
Author: dugris
Date: 2012-12-11 03:01:22 +0000 (Tue, 11 Dec 2012)
Log Message:
-----------
modify qrcode xoops_version.php
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/xoops_version.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/xoops_version.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/xoops_version.php 2012-12-11 02:59:21 UTC (rev 10354)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/xoops_version.php 2012-12-11 03:01:22 UTC (rev 10355)
@@ -42,8 +42,8 @@
// paypal
$modversion['paypal'] = array();
-$modversion['paypal']['business'] = 'lus...@gm...';
-$modversion['paypal']['item_name'] = '';
+$modversion['paypal']['business'] = 'dug...@gm...';
+$modversion['paypal']['item_name'] = _MI_QRCODE_DSC;
$modversion['paypal']['amount'] = 0;
$modversion['paypal']['currency_code'] = 'EUR';
|
|
From: <du...@us...> - 2012-12-11 02:59:33
|
Revision: 10354
http://sourceforge.net/p/xoops/svn/10354
Author: dugris
Date: 2012-12-11 02:59:21 +0000 (Tue, 11 Dec 2012)
Log Message:
-----------
adding qrcode module
Added Paths:
-----------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/codex/qrcode.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/class/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/class/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/class/xoops_qrcode.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/icons/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/icons/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/icons/logo_large.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/icons/logo_small.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/images/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/images/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/images/logo.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/include/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/include/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/include/qrcode.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/include/qrcode_colors.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/language/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/language/english/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/language/english/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/language/english/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/language/english/modinfo.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/language/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/CHANGELOG
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/INSTALL
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/LICENSE
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/README
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/VERSION
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/bindings/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/bindings/tcpdf/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/bindings/tcpdf/qrcode.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_1.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_1.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_10.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_10.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_11.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_11.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_12.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_12.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_13.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_13.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_14.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_14.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_15.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_15.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_16.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_16.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_17.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_17.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_18.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_18.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_19.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_19.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_2.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_2.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_20.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_20.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_21.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_21.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_22.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_22.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_23.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_23.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_24.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_24.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_25.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_25.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_26.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_26.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_27.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_27.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_28.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_28.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_29.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_29.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_3.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_3.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_30.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_30.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_31.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_31.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_32.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_32.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_33.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_33.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_34.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_34.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_35.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_35.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_36.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_36.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_37.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_37.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_38.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_38.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_39.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_39.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_4.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_4.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_40.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_40.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_5.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_5.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_6.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_6.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_7.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_7.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_8.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_8.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_9.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/frame_9.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_0/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_0/mask_101_0.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_0/mask_105_0.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_0/mask_109_0.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_0/mask_113_0.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_0/mask_117_0.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_0/mask_121_0.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_0/mask_125_0.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_0/mask_129_0.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_0/mask_133_0.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_0/mask_137_0.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_0/mask_141_0.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_0/mask_145_0.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_0/mask_149_0.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_0/mask_153_0.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_0/mask_157_0.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_0/mask_161_0.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_0/mask_165_0.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_0/mask_169_0.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_0/mask_173_0.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_0/mask_177_0.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_0/mask_21_0.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_0/mask_25_0.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_0/mask_29_0.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_0/mask_33_0.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_0/mask_37_0.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_0/mask_41_0.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_0/mask_45_0.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_0/mask_49_0.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_0/mask_53_0.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_0/mask_57_0.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_0/mask_61_0.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_0/mask_65_0.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_0/mask_69_0.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_0/mask_73_0.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_0/mask_77_0.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_0/mask_81_0.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_0/mask_85_0.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_0/mask_89_0.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_0/mask_93_0.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_0/mask_97_0.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_1/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_1/mask_101_1.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_1/mask_105_1.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_1/mask_109_1.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_1/mask_113_1.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_1/mask_117_1.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_1/mask_121_1.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_1/mask_125_1.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_1/mask_129_1.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_1/mask_133_1.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_1/mask_137_1.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_1/mask_141_1.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_1/mask_145_1.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_1/mask_149_1.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_1/mask_153_1.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_1/mask_157_1.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_1/mask_161_1.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_1/mask_165_1.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_1/mask_169_1.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_1/mask_173_1.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_1/mask_177_1.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_1/mask_21_1.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_1/mask_25_1.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_1/mask_29_1.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_1/mask_33_1.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_1/mask_37_1.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_1/mask_41_1.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_1/mask_45_1.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_1/mask_49_1.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_1/mask_53_1.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_1/mask_57_1.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_1/mask_61_1.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_1/mask_65_1.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_1/mask_69_1.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_1/mask_73_1.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_1/mask_77_1.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_1/mask_81_1.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_1/mask_85_1.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_1/mask_89_1.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_1/mask_93_1.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_1/mask_97_1.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_2/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_2/mask_101_2.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_2/mask_105_2.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_2/mask_109_2.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_2/mask_113_2.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_2/mask_117_2.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_2/mask_121_2.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_2/mask_125_2.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_2/mask_129_2.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_2/mask_133_2.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_2/mask_137_2.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_2/mask_141_2.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_2/mask_145_2.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_2/mask_149_2.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_2/mask_153_2.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_2/mask_157_2.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_2/mask_161_2.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_2/mask_165_2.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_2/mask_169_2.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_2/mask_173_2.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_2/mask_177_2.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_2/mask_21_2.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_2/mask_25_2.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_2/mask_29_2.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_2/mask_33_2.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_2/mask_37_2.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_2/mask_41_2.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_2/mask_45_2.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_2/mask_49_2.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_2/mask_53_2.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_2/mask_57_2.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_2/mask_61_2.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_2/mask_65_2.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_2/mask_69_2.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_2/mask_73_2.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_2/mask_77_2.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_2/mask_81_2.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_2/mask_85_2.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_2/mask_89_2.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_2/mask_93_2.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_2/mask_97_2.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_3/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_3/mask_101_3.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_3/mask_105_3.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_3/mask_109_3.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_3/mask_113_3.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_3/mask_117_3.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_3/mask_121_3.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_3/mask_125_3.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_3/mask_129_3.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_3/mask_133_3.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_3/mask_137_3.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_3/mask_141_3.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_3/mask_145_3.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_3/mask_149_3.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_3/mask_153_3.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_3/mask_157_3.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_3/mask_161_3.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_3/mask_165_3.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_3/mask_169_3.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_3/mask_173_3.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_3/mask_177_3.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_3/mask_21_3.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_3/mask_25_3.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_3/mask_29_3.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_3/mask_33_3.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_3/mask_37_3.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_3/mask_41_3.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_3/mask_45_3.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_3/mask_49_3.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_3/mask_53_3.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_3/mask_57_3.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_3/mask_61_3.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_3/mask_65_3.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_3/mask_69_3.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_3/mask_73_3.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_3/mask_77_3.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_3/mask_81_3.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_3/mask_85_3.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_3/mask_89_3.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_3/mask_93_3.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_3/mask_97_3.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_4/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_4/mask_101_4.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_4/mask_105_4.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_4/mask_109_4.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_4/mask_113_4.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_4/mask_117_4.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_4/mask_121_4.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_4/mask_125_4.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_4/mask_129_4.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_4/mask_133_4.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_4/mask_137_4.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_4/mask_141_4.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_4/mask_145_4.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_4/mask_149_4.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_4/mask_153_4.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_4/mask_157_4.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_4/mask_161_4.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_4/mask_165_4.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_4/mask_169_4.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_4/mask_173_4.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_4/mask_177_4.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_4/mask_21_4.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_4/mask_25_4.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_4/mask_29_4.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_4/mask_33_4.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_4/mask_37_4.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_4/mask_41_4.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_4/mask_45_4.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_4/mask_49_4.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_4/mask_53_4.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_4/mask_57_4.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_4/mask_61_4.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_4/mask_65_4.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_4/mask_69_4.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_4/mask_73_4.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_4/mask_77_4.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_4/mask_81_4.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_4/mask_85_4.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_4/mask_89_4.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_4/mask_93_4.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_4/mask_97_4.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_5/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_5/mask_101_5.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_5/mask_105_5.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_5/mask_109_5.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_5/mask_113_5.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_5/mask_117_5.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_5/mask_121_5.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_5/mask_125_5.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_5/mask_129_5.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_5/mask_133_5.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_5/mask_137_5.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_5/mask_141_5.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_5/mask_145_5.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_5/mask_149_5.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_5/mask_153_5.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_5/mask_157_5.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_5/mask_161_5.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_5/mask_165_5.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_5/mask_169_5.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_5/mask_173_5.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_5/mask_177_5.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_5/mask_21_5.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_5/mask_25_5.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_5/mask_29_5.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_5/mask_33_5.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_5/mask_37_5.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_5/mask_41_5.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_5/mask_45_5.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_5/mask_49_5.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_5/mask_53_5.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_5/mask_57_5.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_5/mask_61_5.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_5/mask_65_5.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_5/mask_69_5.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_5/mask_73_5.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_5/mask_77_5.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_5/mask_81_5.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_5/mask_85_5.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_5/mask_89_5.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_5/mask_93_5.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_5/mask_97_5.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_6/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_6/mask_101_6.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_6/mask_105_6.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_6/mask_109_6.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_6/mask_113_6.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_6/mask_117_6.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_6/mask_121_6.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_6/mask_125_6.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_6/mask_129_6.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_6/mask_133_6.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_6/mask_137_6.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_6/mask_141_6.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_6/mask_145_6.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_6/mask_149_6.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_6/mask_153_6.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_6/mask_157_6.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_6/mask_161_6.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_6/mask_165_6.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_6/mask_169_6.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_6/mask_173_6.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_6/mask_177_6.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_6/mask_21_6.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_6/mask_25_6.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_6/mask_29_6.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_6/mask_33_6.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_6/mask_37_6.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_6/mask_41_6.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_6/mask_45_6.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_6/mask_49_6.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_6/mask_53_6.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_6/mask_57_6.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_6/mask_61_6.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_6/mask_65_6.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_6/mask_69_6.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_6/mask_73_6.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_6/mask_77_6.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_6/mask_81_6.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_6/mask_85_6.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_6/mask_89_6.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_6/mask_93_6.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_6/mask_97_6.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_7/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_7/mask_101_7.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_7/mask_105_7.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_7/mask_109_7.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_7/mask_113_7.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_7/mask_117_7.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_7/mask_121_7.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_7/mask_125_7.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_7/mask_129_7.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_7/mask_133_7.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_7/mask_137_7.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_7/mask_141_7.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_7/mask_145_7.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_7/mask_149_7.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_7/mask_153_7.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_7/mask_157_7.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_7/mask_161_7.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_7/mask_165_7.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_7/mask_169_7.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_7/mask_173_7.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_7/mask_177_7.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_7/mask_21_7.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_7/mask_25_7.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_7/mask_29_7.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_7/mask_33_7.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_7/mask_37_7.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_7/mask_41_7.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_7/mask_45_7.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_7/mask_49_7.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_7/mask_53_7.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_7/mask_57_7.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_7/mask_61_7.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_7/mask_65_7.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_7/mask_69_7.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_7/mask_73_7.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_7/mask_77_7.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_7/mask_81_7.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_7/mask_85_7.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_7/mask_89_7.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_7/mask_93_7.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/cache/mask_7/mask_97_7.dat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/errors.txt
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/index.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/phpqrcode.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/qrbitstream.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/qrconfig.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/qrconst.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/qrencode.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/qrimage.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/qrinput.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/qrlib.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/qrmask.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/qrrscode.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/qrspec.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/qrsplit.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/qrtools.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/qrvect.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/tools/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/tools/merge.bat
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/tools/merge.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/tools/merge.sh
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/tools/merged_config.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/tools/merged_header.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/preloads/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/preloads/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/xoops_version.php
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/codex/qrcode.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/codex/qrcode.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/codex/qrcode.php 2012-12-11 02:59:21 UTC (rev 10354)
@@ -0,0 +1,32 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Laurent JEN - aka DuGris
+ * @version $Id$
+ */
+
+include dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'mainfile.php';
+
+$xoops = Xoops::getInstance();
+$xoops->header();
+
+if ($xoops->isActiveModule('qrcode')) {
+ echo '<img src="' . $xoops->url('/modules/qrcode/include/qrcode.php') . '?url=http://www.xoops.org" title="http://www.xoops.org">';
+} else {
+ echo 'Oops, Please install qrcode module!';
+}
+Xoops_Utils::dumpFile(__FILE__);
+echo '<hr>';
+Xoops_Utils::dumpFile($xoops->path('/modules/qrcode/include/qrcode.php'));
+$xoops->footer();
\ No newline at end of file
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/codex/qrcode.php
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:keywords
+ Author Date Id Revision URL
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode
___________________________________________________________________
Added: tsvn:autoprops
+ *.php = svn:executable=*;svn:keywords=Author Date Id Rev URL;
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/class
___________________________________________________________________
Added: tsvn:autoprops
+ *.php = svn:executable=*;svn:keywords=Author Date Id Rev URL;
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/class/index.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/class/index.html (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/class/index.html 2012-12-11 02:59:21 UTC (rev 10354)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/class/index.html
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision URL
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/class/xoops_qrcode.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/class/xoops_qrcode.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/class/xoops_qrcode.php 2012-12-11 02:59:21 UTC (rev 10354)
@@ -0,0 +1,131 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+/**
+ * QRCode
+ *
+ * @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 class
+ * @since 2.6.0
+ * @author Laurent JEN - aka DuGris
+ * @version $Id$
+ */
+
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
+include dirname(dirname(__FILE__)) . '/phpqrcode/qrlib.php';
+include dirname(dirname(__FILE__)) . '/include/qrcode_colors.php';
+
+class Xoops_qrcode extends QRcode
+{
+ private $outfile = false;
+ private $saveandprint = false;
+ public $format = 'png';
+ public $eclevel = 0;
+ public $size = 3;
+ public $margin = 0;
+ public $back_color = 0xFFFFFF;
+ public $fore_color = 0x000000;
+
+ /**
+ * class constructor
+ *
+ * @access public
+ */
+ public function __construct()
+ {
+ $xoops = Xoops::getInstance();
+ $xoops->disableErrorReporting();
+ $this->setFormat();
+ }
+
+ /**
+ * Render format
+ */
+ public function setFormat($format = 'png')
+ {
+ $this->format = (in_array($format, array('png', 'text', 'eps', 'svg', 'raw'))) ? $format : 'png';
+ }
+
+ /**
+ * level of error correction
+ * 0 - QR_ECLEVEL_L = Low
+ * 1 - QR_ECLEVEL_M = Medium
+ * 2 - QR_ECLEVEL_Q = Quartile
+ * 3 - QR_ECLEVEL_H = High
+ */
+ public function setLevel($eclevel = QR_ECLEVEL_L)
+ {
+ $this->eclevel = (intval($eclevel)>=0 && intval($eclevel)<=3) ? intval($eclevel) : QR_ECLEVEL_L;
+ }
+
+ /**
+ * define size of each of the barcode code squares measured in pixels
+ * Each code square (also named \x93pixels\x94 or \x93modules\x94) is 4\xD74px.
+ */
+ public function setSize($size=4)
+ {
+ $this->size = intval($size);
+ }
+
+ /**
+ * define size of margin in pixels
+ */
+ public function setMargin($margin=0)
+ {
+ $this->margin = intval($margin);
+ }
+
+ /**
+ * Set Background color
+ */
+ public function setBackground($back_color=0xFFFFFF)
+ {
+ $this->back_color = $back_color;
+ }
+
+ /**
+ * Set Foreground color
+ */
+ public function setForeground($fore_color=0x000000)
+ {
+ $this->fore_color = $fore_color;
+ }
+
+ /**
+ * Render QRcode
+ */
+ public function render( $text )
+ {
+ switch($this->format) {
+ case 'text':
+ parent::text($text, $this->outfile, $this->eclevel, $this->size, $this->margin, $this->saveandprint, $this->back_color, $this->fore_color);
+ break;
+
+ case 'eps':
+ parent::eps($text, $this->outfile, $this->eclevel, $this->size, $this->margin, $this->saveandprint, $this->back_color, $this->fore_color);
+ break;
+
+ case 'svg':
+ parent::svg($text, $this->outfile, $this->eclevel, $this->size, $this->margin, $this->saveandprint, $this->back_color, $this->fore_color);
+ break;
+
+ case 'raw':
+ parent::raw($text, $this->outfile, $this->eclevel, $this->size, $this->margin, $this->saveandprint, $this->back_color, $this->fore_color);
+ break;
+
+ default:
+ parent::png($text, $this->outfile, $this->eclevel, $this->size, $this->margin, $this->saveandprint, $this->back_color, $this->fore_color);
+ break;
+ }
+ }
+}
\ No newline at end of file
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/class/xoops_qrcode.php
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:keywords
+ Author Date Id Revision URL
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/icons
___________________________________________________________________
Added: tsvn:autoprops
+ *.php = svn:executable=*;svn:keywords=Author Date Id Rev URL;
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/icons/index.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/icons/index.html (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/icons/index.html 2012-12-11 02:59:21 UTC (rev 10354)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/icons/index.html
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision URL
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/icons/logo_large.png
===================================================================
(Binary files differ)
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/icons/logo_large.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: svn:keywords
+ Author Date Id Revision URL
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/icons/logo_small.png
===================================================================
(Binary files differ)
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/icons/logo_small.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: svn:keywords
+ Author Date Id Revision URL
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/images
___________________________________________________________________
Added: tsvn:autoprops
+ *.php = svn:executable=*;svn:keywords=Author Date Id Rev URL;
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/images/index.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/images/index.html (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/images/index.html 2012-12-11 02:59:21 UTC (rev 10354)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/images/index.html
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision URL
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/images/logo.png
===================================================================
(Binary files differ)
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/images/logo.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: svn:keywords
+ Author Date Id Revision URL
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/include
___________________________________________________________________
Added: tsvn:autoprops
+ *.php = svn:executable=*;svn:keywords=Author Date Id Rev URL;
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/include/index.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/include/index.html (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/include/index.html 2012-12-11 02:59:21 UTC (rev 10354)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/include/index.html
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision URL
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/include/qrcode.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/include/qrcode.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/include/qrcode.php 2012-12-11 02:59:21 UTC (rev 10354)
@@ -0,0 +1,34 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Laurent JEN - aka DuGris
+ * @version $Id$
+ */
+
+include dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'mainfile.php';
+
+$xoops = Xoops::getinstance();
+if ($xoops->isActiveModule('qrcode') && $_GET['url']) {
+ $qrcode = new Xoops_qrcode();
+ $qrcode->render( $_GET['url'] );
+} else {
+ $contents = '';
+ $size = getimagesize($xoops->url('/images/blank.gif'));
+ $handle = fopen($xoops->url('/images/blank.gif'), "rb");
+ while (!feof($handle)) {
+ $contents .= fread($handle, 1024);
+ }
+ fclose($handle);
+ echo $contents;
+}
\ No newline at end of file
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/include/qrcode.php
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:keywords
+ Author Date Id Revision URL
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/include/qrcode_colors.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/include/qrcode_colors.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/include/qrcode_colors.php 2012-12-11 02:59:21 UTC (rev 10354)
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Xoopartners module
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package Xoopartners
+ * @since 2.6.0
+ * @author Laurent JEN (Aka DuGris)
+ * @version $Id$
+ */
+
+define('_AQUA' , 0x00FFFF);
+define('_BLACK' , 0x000000);
+define('_BLUE' , 0x0000FF);
+define('_FUCHSIA' , 0xFF00FF);
+define('_GRAY' , 0x808080);
+define('_GREEN' , 0x008000);
+define('_LIME' , 0x00FF00);
+define('_MAROON' , 0x800000);
+define('_NAVY' , 0x000080);
+define('_OLIVE' , 0x808000);
+define('_PURPLE' , 0x800080);
+define('_RED' , 0xFF0000);
+define('_SILVER' , 0xC0C0C0);
+define('_TEAL' , 0x008080);
+define('_WHITE' , 0xFFFFFF);
+define('_YELLOW' , 0xFFFF00);
+?>
\ No newline at end of file
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/include/qrcode_colors.php
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:keywords
+ Author Date Id Revision URL
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/index.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/index.html (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/index.html 2012-12-11 02:59:21 UTC (rev 10354)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/index.html
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision URL
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/language
___________________________________________________________________
Added: tsvn:autoprops
+ *.php = svn:executable=*;svn:keywords=Author Date Id Rev URL;
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/language/english
___________________________________________________________________
Added: tsvn:autoprops
+ *.php = svn:executable=*;svn:keywords=Author Date Id Rev URL;
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/language/english/index.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/language/english/index.html (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/language/english/index.html 2012-12-11 02:59:21 UTC (rev 10354)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/language/english/index.html
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision URL
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/language/english/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/language/english/main.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/language/english/main.php 2012-12-11 02:59:21 UTC (rev 10354)
@@ -0,0 +1,19 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * @copyright The XOOPS Project http://sourceforge.n...
[truncated message content] |
|
From: <du...@us...> - 2012-12-10 23:49:09
|
Revision: 10353
http://sourceforge.net/p/xoops/svn/10353
Author: dugris
Date: 2012-12-10 23:49:05 +0000 (Mon, 10 Dec 2012)
Log Message:
-----------
add ucfirst for unix compatibility
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Object/Dtype.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Object/Dtype.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Object/Dtype.php 2012-12-10 21:22:11 UTC (rev 10352)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Object/Dtype.php 2012-12-10 23:49:05 UTC (rev 10353)
@@ -55,7 +55,7 @@
{
static $dtypes;
- $name = strtolower($name);
+ $name = ucfirst(strtolower($name));
$dtype = null;
if (!isset($dtypes[$name])) {
if (file_exists($file = dirname(__FILE__) . "/Dtype/{$name}.php")) {
|
|
From: <tr...@us...> - 2012-12-10 21:22:16
|
Revision: 10352
http://sourceforge.net/p/xoops/svn/10352
Author: trabis
Date: 2012-12-10 21:22:11 +0000 (Mon, 10 Dec 2012)
Log Message:
-----------
Creating Xoops_Utils to hold methods that dont deserve a specific class.
Dropping Xoops_Debug
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/theme_blocks.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/codex/cache.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/codex/form.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/codex/pdf.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops.php
Added Paths:
-----------
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Utils.php
Removed Paths:
-------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Debug.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/theme_blocks.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/theme_blocks.php 2012-12-10 19:59:49 UTC (rev 10351)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/theme_blocks.php 2012-12-10 21:22:11 UTC (rev 10352)
@@ -197,7 +197,7 @@
if ($this->theme && $bcachetime) {
$metas = array();
foreach ($this->theme->metas as $type => $value) {
- $dif = $xoops->arrayRecursiveDiff($this->theme->metas[$type], $old[$type]);
+ $dif = Xoops_Utils::arrayRecursiveDiff($this->theme->metas[$type], $old[$type]);
if (count($dif)) {
$metas[$type] = $dif;
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/codex/cache.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/codex/cache.php 2012-12-10 19:59:49 UTC (rev 10351)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/codex/cache.php 2012-12-10 21:22:11 UTC (rev 10352)
@@ -56,5 +56,5 @@
echo '<a href="?nodelete">Refresh</a> - <a href="?delete">Delete caches</a>';
-Xoops_Debug::dumpFile(__FILE__ );
+Xoops_Utils::dumpFile(__FILE__ );
$xoops->footer();
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/codex/form.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/codex/form.php 2012-12-10 19:59:49 UTC (rev 10351)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/codex/form.php 2012-12-10 21:22:11 UTC (rev 10352)
@@ -22,7 +22,7 @@
$xoops->header();
// Form Horizontal
-$form = new XoopsThemeForm('Form Horizontal', 'form_horizontal', 'testform.php', 'post', true, 'horizontal');
+$form = new XoopsThemeForm('Form Horizontal', 'form_horizontal', 'form.php', 'post', true, 'horizontal');
$code = new XoopsFormText('Code', 'code', 2, 25, '','Code...');
$code->setDescription('Description code');
@@ -139,5 +139,5 @@
$form->display();
-Xoops_Debug::dumpFile(__FILE__ );
+Xoops_Utils::dumpFile(__FILE__ );
$xoops->footer();
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/codex/pdf.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/codex/pdf.php 2012-12-10 19:59:49 UTC (rev 10351)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/codex/pdf.php 2012-12-10 21:22:11 UTC (rev 10352)
@@ -21,7 +21,7 @@
$xoops = Xoops::getInstance();
if (isset($_GET['pdf'])) {
- $content = Xoops_Debug::dump($xoops->getConfigs(), false);
+ $content = Xoops_Utils::dumpVar($xoops->getConfigs(), false);
$tpl = new XoopsTpl();
$tpl->assign('dummy_content' , $content);
@@ -34,13 +34,13 @@
} else {
$xoops->header();
echo 'Oops, Please install pdf module!';
- Xoops_Debug::dumpFile(__FILE__ );
+ Xoops_Utils::dumpFile(__FILE__ );
$xoops->footer();
}
} else {
$xoops->header();
echo '<a href="?pdf">Make Pdf</a>';
- Xoops_Debug::dumpFile(__FILE__ );
+ Xoops_Utils::dumpFile(__FILE__ );
$xoops->footer();
}
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Debug.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Debug.php 2012-12-10 19:59:49 UTC (rev 10351)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Debug.php 2012-12-10 21:22:11 UTC (rev 10352)
@@ -1,73 +0,0 @@
-<?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/**
- * Debug
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package class
- * @since 2.6.0
- * @author trabis <lus...@gm...>
- * @version $Id$
- */
-
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
-
-class Xoops_Debug
-{
- /**
- * Output a dump of a variable
- *
- * @param mixed $var variable which will be dumped
- * @param bool $echo
- * @param bool $exit
- *
- * @return string
- */
- static function dump($var, $echo = true, $exit = false)
- {
- $myts = MyTextSanitizer::getInstance();
- $msg = $myts->displayTarea(var_export($var, true));
- $msg = "<div style='padding: 5px; font-weight: bold'>{$msg}</div>";
- if (!$echo) {
- return $msg;
- }
- echo $msg;
- if ($exit) {
- die();
- }
- return $msg;
- }
-
- /**
- * Output a dump of a file
- *
- * @param mixed $file file which will be dumped
- * @param bool $echo
- * @param bool $exit
- *
- * @return string
- */
- static function dumpFile($file, $echo = true, $exit = false)
- {
- $msg = highlight_file($file, true);
- $msg = "<div style='padding: 5px; font-weight: bold'>{$msg}</div>";
- if (!$echo) {
- return $msg;
- }
- echo $msg;
- if ($exit) {
- die();
- }
- return $msg;
- }
-}
\ No newline at end of file
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Utils.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Utils.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Utils.php 2012-12-10 21:22:11 UTC (rev 10352)
@@ -0,0 +1,99 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author trabis <lus...@gm...>
+ * @version $Id$
+ */
+
+class Xoops_Utils
+{
+ /**
+ * Output a dump of a variable
+ *
+ * @param mixed $var variable which will be dumped
+ * @param bool $echo
+ * @param bool $exit
+ *
+ * @return string
+ */
+ static function dumpVar($var, $echo = true, $exit = false)
+ {
+ $myts = MyTextSanitizer::getInstance();
+ $msg = $myts->displayTarea(var_export($var, true));
+ $msg = "<div style='padding: 5px; font-weight: bold'>{$msg}</div>";
+ if (!$echo) {
+ return $msg;
+ }
+ echo $msg;
+ if ($exit) {
+ die();
+ }
+ return $msg;
+ }
+
+ /**
+ * Output a dump of a file
+ *
+ * @param mixed $file file which will be dumped
+ * @param bool $echo
+ * @param bool $exit
+ *
+ * @return string
+ */
+ static function dumpFile($file, $echo = true, $exit = false)
+ {
+ $msg = highlight_file($file, true);
+ $msg = "<div style='padding: 5px; font-weight: bold'>{$msg}</div>";
+ if (!$echo) {
+ return $msg;
+ }
+ echo $msg;
+ if ($exit) {
+ die();
+ }
+ return $msg;
+ }
+
+ /**
+ * Support for recursive array diff
+ * Needed for php 5.4.3 warning issues
+ *
+ * @param array $aArray1
+ * @param array $aArray2
+ *
+ * @return array
+ */
+ static function arrayRecursiveDiff(array $aArray1, array $aArray2)
+ {
+ $aReturn = array();
+
+ foreach ($aArray1 as $mKey => $mValue) {
+ if (array_key_exists($mKey, $aArray2)) {
+ if (is_array($mValue)) {
+ $aRecursiveDiff = self::arrayRecursiveDiff($mValue, $aArray2[$mKey]);
+ if (count($aRecursiveDiff)) {
+ $aReturn[$mKey] = $aRecursiveDiff;
+ }
+ } else {
+ if ($mValue != $aArray2[$mKey]) {
+ $aReturn[$mKey] = $mValue;
+ }
+ }
+ } else {
+ $aReturn[$mKey] = $mValue;
+ }
+ }
+ return $aReturn;
+ }
+}
\ No newline at end of file
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Utils.php
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:keywords
+ Author Date Id Rev URL
Added: svn:eol-style
+ native
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops.php 2012-12-10 19:59:49 UTC (rev 10351)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops.php 2012-12-10 21:22:11 UTC (rev 10352)
@@ -1778,40 +1778,6 @@
}
/**
- * Support for recursive array diff
- * Needed for php 5.4.3 warning issues
- *
- * @todo move to a proper class
- *
- * @param array $aArray1
- * @param array $aArray2
- *
- * @return array
- */
- public function arrayRecursiveDiff(array $aArray1, array $aArray2)
- {
- $aReturn = array();
-
- foreach ($aArray1 as $mKey => $mValue) {
- if (array_key_exists($mKey, $aArray2)) {
- if (is_array($mValue)) {
- $aRecursiveDiff = $this->arrayRecursiveDiff($mValue, $aArray2[$mKey]);
- if (count($aRecursiveDiff)) {
- $aReturn[$mKey] = $aRecursiveDiff;
- }
- } else {
- if ($mValue != $aArray2[$mKey]) {
- $aReturn[$mKey] = $mValue;
- }
- }
- } else {
- $aReturn[$mKey] = $mValue;
- }
- }
- return $aReturn;
- }
-
- /**
* Support for deprecated messages events
*
* @param $message
|
|
From: <tr...@us...> - 2012-12-10 19:59:54
|
Revision: 10351
http://sourceforge.net/p/xoops/svn/10351
Author: trabis
Date: 2012-12-10 19:59:49 +0000 (Mon, 10 Dec 2012)
Log Message:
-----------
Fixing protector problems with the new lazy instantiation of database
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/logger/plugins/legacy/logger.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/include/precheck.inc.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/include/precheck_functions.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/preloads/core.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/logger/plugins/legacy/logger.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/logger/plugins/legacy/logger.php 2012-12-10 19:39:25 UTC (rev 10350)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/logger/plugins/legacy/logger.php 2012-12-10 19:59:49 UTC (rev 10351)
@@ -52,10 +52,8 @@
{
error_reporting(E_ALL | E_STRICT);
$xoops = Xoops::getInstance();
- if (class_exists('XoopsDatabase', false)) {
- if ($xoops->getModuleConfig('debug_mode', 'logger') == 2) {
- $this->usePopup = true;
- }
+ if ($xoops->getModuleConfig('debug_mode', 'logger') == 2) {
+ $this->usePopup = true;
}
$this->activated = true;
$this->enableRendering();
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/include/precheck.inc.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/include/precheck.inc.php 2012-12-10 19:39:25 UTC (rev 10350)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/include/precheck.inc.php 2012-12-10 19:59:49 UTC (rev 10351)
@@ -23,11 +23,6 @@
require_once dirname(__FILE__) . '/precheck_functions.php';
-if (class_exists('XoopsDatabase', false)) {
- require dirname(__FILE__) . '/postcheck.inc.php';
- return;
-}
-
define('PROTECTOR_PRECHECK_INCLUDED', 1);
define('PROTECTOR_VERSION', file_get_contents(dirname(__FILE__) . '/version.txt'));
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/include/precheck_functions.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/include/precheck_functions.php 2012-12-10 19:39:25 UTC (rev 10350)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/include/precheck_functions.php 2012-12-10 19:59:49 UTC (rev 10351)
@@ -75,14 +75,6 @@
}
}
- // "DB Layer Trapper"
- $force_override = strstr(@$_SERVER['REQUEST_URI'], 'protector/admin/index.php?page=advisory') ? true : false;
- // $force_override = true ;
- if ($force_override || !empty($conf['enable_dblayertrap'])) {
- @define('PROTECTOR_ENABLED_ANTI_SQL_INJECTION', 1);
- $protector->dblayertrap_init($force_override);
- }
-
// "Big Umbrella" subset version
if (!empty($conf['enable_bigumbrella'])) {
@define('PROTECTOR_ENABLED_ANTI_XSS', 1);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/preloads/core.php 2012-12-10 19:39:25 UTC (rev 10350)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/preloads/core.php 2012-12-10 19:59:49 UTC (rev 10351)
@@ -33,6 +33,7 @@
{
/**
* @static
+ *
* @param $args
*/
static function eventCoreIncludeCommonStart($args)
@@ -43,6 +44,7 @@
/**
* @static
+ *
* @param $args
*/
static function eventCoreIncludeCommonEnd($args)
@@ -53,10 +55,24 @@
/**
* @static
+ *
* @param $args
*/
static function eventCoreClassDatabaseDatabasefactoryConnection($args)
{
+ // Protector class
+ require_once dirname(dirname(__FILE__)) . '/class/protector.php';
+
+ // Protector object
+ $protector = Protector::getInstance();
+ $conf = $protector->getConf();
+ // "DB Layer Trapper"
+ $force_override = strstr(@$_SERVER['REQUEST_URI'], 'protector/admin/index.php?page=advisory') ? true : false;
+ //$force_override = true ;
+ if ($force_override || !empty($conf['enable_dblayertrap'])) {
+ @define('PROTECTOR_ENABLED_ANTI_SQL_INJECTION', 1);
+ $protector->dblayertrap_init($force_override);
+ }
if (defined('XOOPS_DB_ALTERNATIVE') && class_exists(XOOPS_DB_ALTERNATIVE)) {
$args[0] = XOOPS_DB_ALTERNATIVE;
}
|
|
From: <tr...@us...> - 2012-12-10 19:39:28
|
Revision: 10350
http://sourceforge.net/p/xoops/svn/10350
Author: trabis
Date: 2012-12-10 19:39:25 +0000 (Mon, 10 Dec 2012)
Log Message:
-----------
Logger is creating a db connection before protector module could hook it. This was causing infinite loop.
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/logger/plugins/legacy/logger.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/logger/plugins/legacy/logger.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/logger/plugins/legacy/logger.php 2012-12-10 14:09:17 UTC (rev 10349)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/logger/plugins/legacy/logger.php 2012-12-10 19:39:25 UTC (rev 10350)
@@ -52,8 +52,10 @@
{
error_reporting(E_ALL | E_STRICT);
$xoops = Xoops::getInstance();
- if ($xoops->getModuleConfig('debug_mode', 'logger') == 2) {
- $this->usePopup = true;
+ if (class_exists('XoopsDatabase', false)) {
+ if ($xoops->getModuleConfig('debug_mode', 'logger') == 2) {
+ $this->usePopup = true;
+ }
}
$this->activated = true;
$this->enableRendering();
@@ -115,7 +117,9 @@
public function addQuery($sql, $error = null, $errno = null, $query_time = null)
{
if ($this->activated) {
- $this->queries[] = array('sql' => $sql, 'error' => $error, 'errno' => $errno, 'query_time' => $query_time);
+ $this->queries[] = array(
+ 'sql' => $sql, 'error' => $error, 'errno' => $errno, 'query_time' => $query_time
+ );
}
}
|
|
From: <tr...@us...> - 2012-12-10 14:09:21
|
Revision: 10349
http://sourceforge.net/p/xoops/svn/10349
Author: trabis
Date: 2012-12-10 14:09:17 +0000 (Mon, 10 Dec 2012)
Log Message:
-----------
Fixing language issues on installer
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/makedata.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_extensioninstaller.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_moduleinstaller.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/makedata.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/makedata.php 2012-12-10 13:48:43 UTC (rev 10348)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/makedata.php 2012-12-10 14:09:17 UTC (rev 10349)
@@ -9,22 +9,21 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/
/**
-* Installer data generation file
-*
-* See the enclosed file license.txt for licensing information.
-* If you did not receive this file, get it at http://www.fsf.org/copyleft/gpl.html
-*
-* @copyright The XOOPS project http://www.xoops.org/
-* @license http://www.fsf.org/copyleft/gpl.html GNU General Public License (GPL)
-* @package installer
-* @since 2.3.0
-* @author Haruki Setoyama <ha...@pl...>
-* @author Kazumi Ono <web...@my...>
-* @author Skalpa Keo <sk...@xo...>
-* @author Taiwen Jiang <ph...@us...>
-* @author DuGris (aka L. JEN) <du...@fr...>
-* @version $Id$
-*/
+ * Installer data generation file
+ * See the enclosed file license.txt for licensing information.
+ * If you did not receive this file, get it at http://www.fsf.org/copyleft/gpl.html
+ *
+ * @copyright The XOOPS project http://www.xoops.org/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU General Public License (GPL)
+ * @package installer
+ * @since 2.3.0
+ * @author Haruki Setoyama <ha...@pl...>
+ * @author Kazumi Ono <web...@my...>
+ * @author Skalpa Keo <sk...@xo...>
+ * @author Taiwen Jiang <ph...@us...>
+ * @author DuGris (aka L. JEN) <du...@fr...>
+ * @version $Id$
+ */
// include_once './class/dbmanager.php';
// RMV
// TODO: Shouldn't we insert specific field names?? That way we can use
@@ -33,7 +32,7 @@
function make_groups($dbm)
{
$gruops['XOOPS_GROUP_ADMIN'] = $dbm->insert('groups', " VALUES (1, '" . addslashes(_INSTALL_WEBMASTER) . "', '" . addslashes(_INSTALL_WEBMASTERD) . "', 'Admin')");
- $gruops['XOOPS_GROUP_USERS'] = $dbm->insert('groups', " VALUES (2, '" . addslashes(_INSTALL_REGUSERS) . "', '" . addslashes(_INSTALL_REGUSERSD) . "', 'User')" );
+ $gruops['XOOPS_GROUP_USERS'] = $dbm->insert('groups', " VALUES (2, '" . addslashes(_INSTALL_REGUSERS) . "', '" . addslashes(_INSTALL_REGUSERSD) . "', 'User')");
$gruops['XOOPS_GROUP_ANONYMOUS'] = $dbm->insert('groups', " VALUES (3, '" . addslashes(_INSTALL_ANONUSERS) . "', '" . addslashes(_INSTALL_ANONUSERSD) . "', 'Anonymous')");
if (!$gruops['XOOPS_GROUP_ADMIN'] || !$gruops['XOOPS_GROUP_USERS'] || !$gruops['XOOPS_GROUP_ANONYMOUS']) {
return false;
@@ -77,7 +76,7 @@
$time = time();
$dbm->insert('tplset', " VALUES (1, 'default', 'XOOPS Default Template Set', '', " . $time . ")");
// system modules
- if (file_exists($file = $root .'/modules/system/language/' . $language . '/modinfo.php')) {
+ if (file_exists($file = $root . '/modules/system/language/' . $language . '/modinfo.php')) {
include $file;
} else {
include $root . '/modules/system/language/english/modinfo.php';
@@ -92,45 +91,55 @@
foreach ($modversion['templates'] as $tplfile) {
// Main templates
- if ($fp = fopen($root . '/modules/system/templates/' . $tplfile['file'], 'r')) {
- $newtplid = $dbm->insert('tplfile', " VALUES (0, 1, 'system', 'default', '" . addslashes($tplfile['file']) . "', '" . addslashes($tplfile['description']) . "', " . $time . ", " . $time . ", 'module')");
- // $newtplid = $xoopsDB->getInsertId();
- $tplsource = fread($fp, filesize($root . '/modules/system/templates/' . $tplfile['file']));
- fclose($fp);
- $dbm->insert('tplsource', " (tpl_id, tpl_source) VALUES (" . $newtplid . ", '" . addslashes($tplsource) . "')");
+ if (file_exists($file = $root . '/modules/system/templates/' . $tplfile['file'])) {
+ if ($fp = fopen($file, 'r')) {
+ $newtplid = $dbm->insert('tplfile', " VALUES (0, 1, 'system', 'default', '" . addslashes($tplfile['file']) . "', '" . addslashes($tplfile['description']) . "', " . $time . ", " . $time . ", 'module')");
+ // $newtplid = $xoopsDB->getInsertId();
+ $tplsource = fread($fp, filesize($root . '/modules/system/templates/' . $tplfile['file']));
+ fclose($fp);
+ $dbm->insert('tplsource', " (tpl_id, tpl_source) VALUES (" . $newtplid . ", '" . addslashes($tplsource) . "')");
+ }
}
// Admin templates
- if ($fp = fopen($root . '/modules/system/templates/admin/' . $tplfile['file'], 'r')) {
- $newtplid = $dbm->insert('tplfile', " VALUES (0, 1, 'system', 'default', '" . addslashes($tplfile['file']) . "', '" . addslashes($tplfile['description']) . "', " . $time . ", " . $time . ", 'admin')");
- // $newtplid = $xoopsDB->getInsertId();
- $tplsource = fread($fp, filesize($root . '/modules/system/templates/admin/' . $tplfile['file']));
- fclose($fp);
- $dbm->insert('tplsource', " (tpl_id, tpl_source) VALUES (" . $newtplid . ", '" . addslashes($tplsource) . "')");
+ if (file_exists($file = $root . '/modules/system/admin/templates/' . $tplfile['file'])) {
+ if ($fp = fopen($file, 'r')) {
+ $newtplid = $dbm->insert('tplfile', " VALUES (0, 1, 'system', 'default', '" . addslashes($tplfile['file']) . "', '" . addslashes($tplfile['description']) . "', " . $time . ", " . $time . ", 'admin')");
+ // $newtplid = $xoopsDB->getInsertId();
+ $tplsource = fread($fp, filesize($root . '/modules/system/templates/admin/' . $tplfile['file']));
+ fclose($fp);
+ $dbm->insert('tplsource', " (tpl_id, tpl_source) VALUES (" . $newtplid . ", '" . addslashes($tplsource) . "')");
+ }
}
}
foreach ($modversion['blocks'] as $func_num => $newblock) {
- if ($fp = fopen($root . '/modules/system/templates/blocks/' . $newblock['template'], 'r')) {
- if (in_array($newblock['template'], array('system_block_user.html', 'system_block_login.html', 'system_block_mainmenu.html'))) {
- $visible = 1;
- } else {
- $visible = 0;
+ if (file_exists($file = $root . '/modules/system/templates/blocks/' . $newblock['template'])) {
+ if ($fp = fopen($file, 'r')) {
+ if (in_array($newblock['template'], array(
+ 'system_block_user.html', 'system_block_login.html', 'system_block_mainmenu.html'
+ ))
+ ) {
+ $visible = 1;
+ } else {
+ $visible = 0;
+ }
+ $options = !isset($newblock['options']) ? '' : trim($newblock['options']);
+ $edit_func = !isset($newblock['edit_func']) ? '' : trim($newblock['edit_func']);
+ $newbid = $dbm->insert('newblocks', " VALUES (0, 1, " . $func_num . ", '" . addslashes($options) . "', '" . addslashes($newblock['name']) . "', '" . addslashes($newblock['name']) . "', '', 0, 0, " . $visible . ", 'S', 'H', 1, 'system', '" . addslashes($newblock['file']) . "', '" . addslashes($newblock['show_func']) . "', '" . addslashes($edit_func) . "', '" . addslashes($newblock['template']) . "', 0, " . $time . ")");
+ // $newbid = $xoopsDB->getInsertId();
+ $newtplid = $dbm->insert('tplfile', " VALUES (0, " . $newbid . ", 'system', 'default', '" . addslashes($newblock['template']) . "', '" . addslashes($newblock['description']) . "', " . $time . ", " . $time . ", 'block')");
+ // $newtplid = $xoopsDB->getInsertId();
+ $tplsource = fread($fp, filesize($root . '/modules/system/templates/blocks/' . $newblock['template']));
+ fclose($fp);
+ $dbm->insert('tplsource', " (tpl_id, tpl_source) VALUES (" . $newtplid . ", '" . addslashes($tplsource) . "')");
+ $dbm->insert("group_permission", " VALUES (0, " . $gruops['XOOPS_GROUP_ADMIN'] . ", " . $newbid . ", 1, 'block_read')");
+ // $dbm->insert("group_permission", " VALUES (0, ".$gruops['XOOPS_GROUP_ADMIN'].", ".$newbid.", 'xoops_blockadmiin')");
+ $dbm->insert("group_permission", " VALUES (0, " . $gruops['XOOPS_GROUP_USERS'] . ", " . $newbid . ", 1, 'block_read')");
+ $dbm->insert("group_permission", " VALUES (0, " . $gruops['XOOPS_GROUP_ANONYMOUS'] . ", " . $newbid . ", 1, 'block_read')");
}
- $options = !isset($newblock['options']) ? '' : trim($newblock['options']);
- $edit_func = !isset($newblock['edit_func']) ? '' : trim($newblock['edit_func']);
- $newbid = $dbm->insert('newblocks', " VALUES (0, 1, " . $func_num . ", '" . addslashes($options) . "', '" . addslashes($newblock['name']) . "', '" . addslashes($newblock['name']) . "', '', 0, 0, " . $visible . ", 'S', 'H', 1, 'system', '" . addslashes($newblock['file']) . "', '" . addslashes($newblock['show_func']) . "', '" . addslashes($edit_func) . "', '" . addslashes($newblock['template']) . "', 0, " . $time . ")");
- // $newbid = $xoopsDB->getInsertId();
- $newtplid = $dbm->insert('tplfile', " VALUES (0, " . $newbid . ", 'system', 'default', '" . addslashes($newblock['template']) . "', '" . addslashes($newblock['description']) . "', " . $time . ", " . $time . ", 'block')");
- // $newtplid = $xoopsDB->getInsertId();
- $tplsource = fread($fp, filesize($root . '/modules/system/templates/blocks/' . $newblock['template']));
- fclose($fp);
- $dbm->insert('tplsource', " (tpl_id, tpl_source) VALUES (" . $newtplid . ", '" . addslashes($tplsource) . "')");
- $dbm->insert("group_permission", " VALUES (0, " . $gruops['XOOPS_GROUP_ADMIN'] . ", " . $newbid . ", 1, 'block_read')");
- // $dbm->insert("group_permission", " VALUES (0, ".$gruops['XOOPS_GROUP_ADMIN'].", ".$newbid.", 'xoops_blockadmiin')");
- $dbm->insert("group_permission", " VALUES (0, " . $gruops['XOOPS_GROUP_USERS'] . ", " . $newbid . ", 1, 'block_read')");
- $dbm->insert("group_permission", " VALUES (0, " . $gruops['XOOPS_GROUP_ANONYMOUS'] . ", " . $newbid . ", 1, 'block_read')");
}
}
+
// data for table 'users'
$temp = md5($adminpass);
$regdate = time();
@@ -174,14 +183,18 @@
$dbm->insert('config', " VALUES (31, 0, 2, 'self_delete', '_MD_AM_SELFDELETE', '0', '_MD_AM_SELFDELETEDSC', 'yesno', 'int', 22)");
$dbm->insert('config', " VALUES (32, 0, 1, 'com_mode', '_MD_AM_COMMODE', 'flat', '_MD_AM_COMMODEDSC', 'select', 'text', 34)");
$dbm->insert('config', " VALUES (33, 0, 1, 'com_order', '_MD_AM_COMORDER', '0', '_MD_AM_COMORDERDSC', 'select', 'int', 36)");
- $dbm->insert('config', " VALUES (34, 0, 2, 'bad_unames', '_MD_AM_BADUNAMES', '" . addslashes(serialize(array('webmaster', '^xoops', '^admin'))) . "', '_MD_AM_BADUNAMESDSC', 'textarea', 'array', 24)");
+ $dbm->insert('config', " VALUES (34, 0, 2, 'bad_unames', '_MD_AM_BADUNAMES', '" . addslashes(serialize(array(
+ 'webmaster', '^xoops', '^admin'
+ ))) . "', '_MD_AM_BADUNAMESDSC', 'textarea', 'array', 24)");
$dbm->insert('config', " VALUES (35, 0, 2, 'bad_emails', '_MD_AM_BADEMAILS', '" . addslashes(serialize(array('xoops.org$'))) . "', '_MD_AM_BADEMAILSDSC', 'textarea', 'array', 26)");
$dbm->insert('config', " VALUES (36, 0, 2, 'maxuname', '_MD_AM_MAXUNAME', '10', '_MD_AM_MAXUNAMEDSC', 'textbox', 'int', 3)");
$dbm->insert('config', " VALUES (37, 0, 1, 'bad_ips', '_MD_AM_BADIPS', '" . addslashes(serialize(array('127.0.0.1'))) . "', '_MD_AM_BADIPSDSC', 'textarea', 'array', 42)");
$dbm->insert('config', " VALUES (38, 0, 3, 'meta_keywords', '_MD_AM_METAKEY', 'xoops, web applications, web 2.0, sns, news, technology, headlines, linux, software, download, downloads, free, community, forum, bulletin board, bbs, php, survey, polls, kernel, comment, comments, portal, odp, open source, opensource, FreeSoftware, gnu, gpl, license, Unix, *nix, mysql, sql, database, databases, web site, blog, wiki, module, modules, theme, themes, cms, content management', '_MD_AM_METAKEYDSC', 'textarea', 'text', 0)");
$dbm->insert('config', " VALUES (39, 0, 3, 'footer', '_MD_AM_FOOTER', 'Powered by XOOPS © 2001-" . date('Y', time()) . " <a href=\"http://xoops.sourceforge.net\" rel=\"external\" title=\"The XOOPS Project\">The XOOPS Project</a>', '_MD_AM_FOOTERDSC', 'textarea', 'text', 20)");
$dbm->insert('config', " VALUES (40, 0, 4, 'censor_enable', '_MD_AM_DOCENSOR', '0', '_MD_AM_DOCENSORDSC', 'yesno', 'int', 0)");
- $dbm->insert('config', " VALUES (41, 0, 4, 'censor_words', '_MD_AM_CENSORWRD', '" . addslashes(serialize(array('fuck', 'shit'))) . "', '_MD_AM_CENSORWRDDSC', 'textarea', 'array', 1)");
+ $dbm->insert('config', " VALUES (41, 0, 4, 'censor_words', '_MD_AM_CENSORWRD', '" . addslashes(serialize(array(
+ 'fuck', 'shit'
+ ))) . "', '_MD_AM_CENSORWRDDSC', 'textarea', 'array', 1)");
$dbm->insert('config', " VALUES (42, 0, 4, 'censor_replace', '_MD_AM_CENSORRPLC', '#OOPS#', '_MD_AM_CENSORRPLCDSC', 'textbox', 'text', 2)");
$dbm->insert('config', " VALUES (43, 0, 3, 'meta_robots', '_MD_AM_METAROBOTS', 'index,follow', '_MD_AM_METAROBOTSDSC', 'select', 'text', 2)");
$dbm->insert('config', " VALUES (44, 0, 5, 'enable_search', '_MD_AM_DOSEARCH', '1', '_MD_AM_DOSEARCHDSC', 'yesno', 'int', 0)");
@@ -256,7 +269,7 @@
$dbm->insert('config', " VALUES (107, 1, 0, 'active_images', '_MI_SYSTEM_PREFERENCE_ACTIVE_IMAGES', '1', '', 'yesno', 'int', 110)");
$dbm->insert('config', " VALUES (108, 1, 0, 'active_mailusers', '_MI_SYSTEM_PREFERENCE_ACTIVE_MAILUSERS', '1', '', 'yesno', 'int', 120)");
$dbm->insert('config', " VALUES (109, 1, 0, 'active_modulesadmin', '_MI_SYSTEM_PREFERENCE_ACTIVE_MODULESADMIN', '1', '', 'hidden', 'int', 130)");
- $dbm->insert('config', " VALUES (110, 1, 0, 'active_maintenance', '_MI_SYSTEM_PREFERENCE_ACTIVE_MAINTENANCE', '1', '', 'yesno', 'int', 140)");
+ $dbm->insert('config', " VALUES (110, 1, 0, 'active_maintenance', '_MI_SYSTEM_PREFERENCE_ACTIVE_MAINTENANCE', '1', '', 'yesno', 'int', 140)");
$dbm->insert('config', " VALUES (111, 1, 0, 'active_preferences', '_MI_SYSTEM_PREFERENCE_ACTIVE_PREFERENCES', '1', '', 'hidden', 'int', 150)");
$dbm->insert('config', " VALUES (112, 1, 0, 'active_smilies', '_MI_SYSTEM_PREFERENCE_ACTIVE_SMILIES', '1', '', 'yesno', 'int', 160)");
$dbm->insert('config', " VALUES (113, 1, 0, 'active_tplsets', '_MI_SYSTEM_PREFERENCE_ACTIVE_TPLSETS', '1', '', 'hidden', 'int', 170)");
@@ -281,34 +294,34 @@
$dbm->insert('config', " VALUES (134, 0, 1, 'redirect_message_ajax', '_MD_AM_CUSTOM_REDIRECT', '1', '_MD_AM_CUSTOM_REDIRECT_DESC', 'yesno', 'int', 12)");
- require_once $root . '/class/xoopslists.php';
- $editors = XoopsLists::getDirListAsArray( $root . '/class/xoopseditor' );
- $conf=35;
- foreach ( $editors as $dir ) {
- $dbm->insert('configoption', " VALUES (".$conf.", '".$dir."', '".$dir."', 126)");
+ require_once $root . '/class/xoopslists.php';
+ $editors = XoopsLists::getDirListAsArray($root . '/class/xoopseditor');
+ $conf = 35;
+ foreach ($editors as $dir) {
+ $dbm->insert('configoption', " VALUES (" . $conf . ", '" . $dir . "', '" . $dir . "', 126)");
$conf++;
}
- foreach ( $editors as $dir ) {
- $dbm->insert('configoption', " VALUES (".$conf.", '".$dir."', '".$dir."', 127)");
+ foreach ($editors as $dir) {
+ $dbm->insert('configoption', " VALUES (" . $conf . ", '" . $dir . "', '" . $dir . "', 127)");
$conf++;
}
- foreach ( $editors as $dir ) {
- $dbm->insert('configoption', " VALUES (".$conf.", '".$dir."', '".$dir."', 128)");
+ foreach ($editors as $dir) {
+ $dbm->insert('configoption', " VALUES (" . $conf . ", '" . $dir . "', '" . $dir . "', 128)");
$conf++;
}
$icons = XoopsLists::getDirListAsArray($root . '/modules/system/images/icons');
- foreach ( $icons as $dir ) {
- $dbm->insert('configoption', " VALUES (".$conf.", '".$dir."', '".$dir."', 98)");
+ foreach ($icons as $dir) {
+ $dbm->insert('configoption', " VALUES (" . $conf . ", '" . $dir . "', '" . $dir . "', 98)");
$conf++;
}
$breadcrumb = XoopsLists::getDirListAsArray($root . '/modules/system/images/breadcrumb');
- foreach ( $breadcrumb as $dir ) {
- $dbm->insert('configoption', " VALUES (".$conf.", '".$dir."', '".$dir."', 99)");
+ foreach ($breadcrumb as $dir) {
+ $dbm->insert('configoption', " VALUES (" . $conf . ", '" . $dir . "', '" . $dir . "', 99)");
$conf++;
}
$jqueryui = XoopsLists::getDirListAsArray($root . '/modules/system/css/ui');
- foreach ( $jqueryui as $dir ) {
- $dbm->insert('configoption', " VALUES (".$conf.", '".$dir."', '".$dir."', 133)");
+ foreach ($jqueryui as $dir) {
+ $dbm->insert('configoption', " VALUES (" . $conf . ", '" . $dir . "', '" . $dir . "', 133)");
$conf++;
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_extensioninstaller.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_extensioninstaller.php 2012-12-10 13:48:43 UTC (rev 10348)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_extensioninstaller.php 2012-12-10 14:09:17 UTC (rev 10349)
@@ -35,7 +35,11 @@
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
include_once XOOPS_ROOT_PATH . "/modules/system/class/module.php";
+ include_once XOOPS_ROOT_PATH . "/modules/system/class/system.php";
+ $system = System::getInstance();
+ $system->loadLanguage('modulesadmin','system');
+
$system_module = new SystemModule();
$msgs = array();
@@ -66,6 +70,11 @@
}
include_once XOOPS_ROOT_PATH . "/modules/system/class/module.php";
include_once XOOPS_ROOT_PATH . "/modules/system/class/extension.php";
+ include_once XOOPS_ROOT_PATH . "/modules/system/class/system.php";
+
+ $system = System::getInstance();
+ $system->loadLanguage('modulesadmin','system');
+
// Get installed modules
$system_module = new SystemExtension();
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_moduleinstaller.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_moduleinstaller.php 2012-12-10 13:48:43 UTC (rev 10348)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_moduleinstaller.php 2012-12-10 14:09:17 UTC (rev 10349)
@@ -40,8 +40,11 @@
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
include_once XOOPS_ROOT_PATH . "/modules/system/class/module.php";
+ include_once XOOPS_ROOT_PATH . "/modules/system/class/system.php";
$system_module = new SystemModule();
+ $system = System::getInstance();
+ $system->loadLanguage('modulesadmin','system');
$msgs = array();
foreach ($_REQUEST['modules'] as $dirname => $installmod) {
@@ -69,7 +72,13 @@
if (!$xoops->getConfig('language')) {
$xoops->setConfig('language', $_COOKIE['xo_install_lang']);
}
+
include_once XOOPS_ROOT_PATH . "/modules/system/class/module.php";
+ include_once XOOPS_ROOT_PATH . "/modules/system/class/system.php";
+
+ $system_module = new SystemModule();
+ $system = System::getInstance();
+ $system->loadLanguage('modulesadmin','system');
// Get installed modules
$system_module = new SystemModule();
|
|
From: <tr...@us...> - 2012-12-10 13:48:45
|
Revision: 10348
http://sourceforge.net/p/xoops/svn/10348
Author: trabis
Date: 2012-12-10 13:48:43 +0000 (Mon, 10 Dec 2012)
Log Message:
-----------
Adding mainfile back
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/mainfile.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/mainfile.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/mainfile.php 2012-12-10 13:44:16 UTC (rev 10347)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/mainfile.php 2012-12-10 13:48:43 UTC (rev 10348)
@@ -17,65 +17,6 @@
* @version $Id$
*/
-if (!defined("XOOPS_MAINFILE_INCLUDED")) {
- define("XOOPS_MAINFILE_INCLUDED", 1);
-
- // XOOPS Physical Paths
-
- // Physical path to the XOOPS documents (served) directory WITHOUT trailing slash
- define('XOOPS_ROOT_PATH', 'C:/wamp/www/xoops_2.6.0_new/htdocs');
-
- // For forward compatibility
- // Physical path to the XOOPS library directory WITHOUT trailing slash
- define('XOOPS_PATH', 'C:/wamp/www/xoops_2.6.0_new/htdocs/xoops_lib');
- // Physical path to the XOOPS datafiles (writable) directory WITHOUT trailing slash
- define('XOOPS_VAR_PATH', 'C:/wamp/www/xoops_2.6.0_new/htdocs/xoops_data');
- // Alias of XOOPS_PATH, for compatibility, temporary solution
- define("XOOPS_TRUST_PATH", XOOPS_PATH);
-
- // URL Association for SSL and Protocol Compatibility
- $http = 'http://';
- if (!empty($_SERVER['HTTPS'])) {
- $http = ($_SERVER['HTTPS']=='on') ? 'https://' : 'http://';
- }
- define('XOOPS_PROT', $http);
-
- // XOOPS Virtual Path (URL)
- // Virtual path to your main XOOPS directory WITHOUT trailing slash
- // Example: define('XOOPS_URL', 'http://localhost/xoops_2.6.0_new/htdocs');
- define('XOOPS_URL', 'http://localhost/xoops_2.6.0_new/htdocs');
-
- // Shall be handled later, don't forget!
- define("XOOPS_CHECK_PATH", 0);
- // Protect against external scripts execution if safe mode is not enabled
- if (XOOPS_CHECK_PATH && !@ini_get("safe_mode")) {
- if (function_exists("debug_backtrace")) {
- $xoopsScriptPath = debug_backtrace();
- if (!count($xoopsScriptPath)) {
- die("XOOPS path check: this file cannot be requested directly");
- }
- $xoopsScriptPath = $xoopsScriptPath[0]["file"];
- } else {
- $xoopsScriptPath = isset($_SERVER["PATH_TRANSLATED"]) ? $_SERVER["PATH_TRANSLATED"] : $_SERVER["SCRIPT_FILENAME"];
- }
- if (DIRECTORY_SEPARATOR != "/") {
- // IIS6 may double the \ chars
- $xoopsScriptPath = str_replace(strpos($xoopsScriptPath, "\\\\", 2) ? "\\\\" : DIRECTORY_SEPARATOR, "/", $xoopsScriptPath);
- }
- if (strcasecmp(substr($xoopsScriptPath, 0, strlen(XOOPS_ROOT_PATH)), str_replace(DIRECTORY_SEPARATOR, "/", XOOPS_ROOT_PATH))) {
- exit("XOOPS path check: Script is not inside XOOPS_ROOT_PATH and cannot run.");
- }
- }
-
- // Secure file
- require XOOPS_VAR_PATH . '/data/secure.php';
-
- define('XOOPS_GROUP_ADMIN', '1');
- define('XOOPS_GROUP_USERS', '2');
- define('XOOPS_GROUP_ANONYMOUS', '3');
-
- if (!isset($xoopsOption["nocommon"]) && XOOPS_ROOT_PATH != "") {
- include XOOPS_ROOT_PATH."/include/common.php";
- }
-
+if (! defined('XOOPS_INSTALL')) {
+ header('Location: install/index.php');
}
\ No newline at end of file
|
8 messages has been excluded from this view by a project administrator.
