Menu
▾
▴
[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[48273] trunk
|
From: <lph...@us...> - 2013-10-31 16:58:50
|
Revision: 48273
http://sourceforge.net/p/tikiwiki/code/48273
Author: lphuberdeau
Date: 2013-10-31 16:58:45 +0000 (Thu, 31 Oct 2013)
Log Message:
-----------
[MRG] Automatic merge, branches/12.x 48250 to 48272
Modified Paths:
--------------
trunk/admin/include_performance.php
trunk/db/tiki-db.php
trunk/doc/devtools/satis.json
trunk/lib/admin/adminlib.php
trunk/lib/core/TikiDb/Initializer/Pdo.php
trunk/lib/userslib.php
trunk/lib/wiki-plugins/wikiplugin_trackerfilter.php
trunk/styles/layout/design.css
trunk/templates/comment/list.tpl
trunk/templates/tiki-check.tpl
trunk/templates/wiki-plugins/wikiplugin_listexecute.tpl
trunk/tiki-check.php
trunk/tiki-monitor.php
trunk/vendor_extra/pear/Auth/Anonymous.php
trunk/vendor_extra/pear/Auth/Auth.php
trunk/vendor_extra/pear/Auth/Container/DB.php
trunk/vendor_extra/pear/Auth/Container/DBLite.php
trunk/vendor_extra/pear/Auth/Container/MDB.php
trunk/vendor_extra/pear/Auth/Container/MDB2.php
trunk/vendor_extra/pear/Auth/Container/PEAR.php
trunk/vendor_extra/pear/Auth/Container/RADIUS.php
trunk/vendor_extra/pear/Auth/OpenID/AX.php
trunk/vendor_extra/pear/Auth/OpenID/Association.php
trunk/vendor_extra/pear/Auth/OpenID/BigMath.php
trunk/vendor_extra/pear/Auth/OpenID/Consumer.php
trunk/vendor_extra/pear/Auth/OpenID/DiffieHellman.php
trunk/vendor_extra/pear/Auth/OpenID/Discover.php
trunk/vendor_extra/pear/Auth/OpenID/DumbStore.php
trunk/vendor_extra/pear/Auth/OpenID/Extension.php
trunk/vendor_extra/pear/Auth/OpenID/FileStore.php
trunk/vendor_extra/pear/Auth/OpenID/HMAC.php
trunk/vendor_extra/pear/Auth/OpenID/MemcachedStore.php
trunk/vendor_extra/pear/Auth/OpenID/Message.php
trunk/vendor_extra/pear/Auth/OpenID/MySQLStore.php
trunk/vendor_extra/pear/Auth/OpenID/Nonce.php
trunk/vendor_extra/pear/Auth/OpenID/PAPE.php
trunk/vendor_extra/pear/Auth/OpenID/Parse.php
trunk/vendor_extra/pear/Auth/OpenID/PostgreSQLStore.php
trunk/vendor_extra/pear/Auth/OpenID/SQLStore.php
trunk/vendor_extra/pear/Auth/OpenID/SQLiteStore.php
trunk/vendor_extra/pear/Auth/OpenID/SReg.php
trunk/vendor_extra/pear/Auth/OpenID/Server.php
trunk/vendor_extra/pear/Auth/OpenID/ServerRequest.php
trunk/vendor_extra/pear/Auth/OpenID/TrustRoot.php
trunk/vendor_extra/pear/Auth/OpenID/URINorm.php
trunk/vendor_extra/pear/Auth/OpenID.php
trunk/vendor_extra/pear/Auth/Yadis/HTTPFetcher.php
trunk/vendor_extra/pear/Auth/Yadis/ParanoidHTTPFetcher.php
trunk/vendor_extra/pear/Auth/Yadis/PlainHTTPFetcher.php
trunk/vendor_extra/pear/Auth/Yadis/XRDS.php
trunk/vendor_extra/pear/Auth/Yadis/XRI.php
trunk/vendor_extra/pear/Auth/Yadis/XRIRes.php
trunk/vendor_extra/pear/Auth/Yadis/Yadis.php
trunk/vendor_extra/pear/DB/dbase.php
trunk/vendor_extra/pear/DB/fbsql.php
trunk/vendor_extra/pear/DB/ibase.php
trunk/vendor_extra/pear/DB/ifx.php
trunk/vendor_extra/pear/DB/msql.php
trunk/vendor_extra/pear/DB/mssql.php
trunk/vendor_extra/pear/DB/mysql.php
trunk/vendor_extra/pear/DB/mysqli.php
trunk/vendor_extra/pear/DB/oci8.php
trunk/vendor_extra/pear/DB/odbc.php
trunk/vendor_extra/pear/DB/pgsql.php
trunk/vendor_extra/pear/DB/sqlite.php
trunk/vendor_extra/pear/DB/storage.php
trunk/vendor_extra/pear/DB/sybase.php
trunk/vendor_extra/pear/Net/DNS/RR.php
trunk/vendor_extra/pear/Net/DNS.php
trunk/vendor_extra/pear/Net/LDAP2/Entry.php
trunk/vendor_extra/pear/Net/LDAP2/Filter.php
trunk/vendor_extra/pear/Net/LDAP2/LDIF.php
trunk/vendor_extra/pear/Net/LDAP2/RootDSE.php
trunk/vendor_extra/pear/Net/LDAP2/Schema.php
trunk/vendor_extra/pear/Net/LDAP2/Search.php
trunk/vendor_extra/pear/Net/LDAP2/Util.php
trunk/vendor_extra/pear/Net/LDAP2.php
trunk/vendor_extra/pear/Net/Ping.php
trunk/vendor_extra/pear/PEAR/Builder.php
trunk/vendor_extra/pear/PEAR/ChannelFile/Parser.php
trunk/vendor_extra/pear/PEAR/ChannelFile.php
trunk/vendor_extra/pear/PEAR/Command/Auth.php
trunk/vendor_extra/pear/PEAR/Command/Build.php
trunk/vendor_extra/pear/PEAR/Command/Channels.php
trunk/vendor_extra/pear/PEAR/Command/Config.php
trunk/vendor_extra/pear/PEAR/Command/Install.php
trunk/vendor_extra/pear/PEAR/Command/Mirror.php
trunk/vendor_extra/pear/PEAR/Command/Package.php
trunk/vendor_extra/pear/PEAR/Command/Pickle.php
trunk/vendor_extra/pear/PEAR/Command/Registry.php
trunk/vendor_extra/pear/PEAR/Command/Remote.php
trunk/vendor_extra/pear/PEAR/Command/Test.php
trunk/vendor_extra/pear/PEAR/Common.php
trunk/vendor_extra/pear/PEAR/Config.php
trunk/vendor_extra/pear/PEAR/Dependency2.php
trunk/vendor_extra/pear/PEAR/Downloader/Package.php
trunk/vendor_extra/pear/PEAR/Downloader.php
trunk/vendor_extra/pear/PEAR/Frontend/CLI.php
trunk/vendor_extra/pear/PEAR/Installer/Role.php
trunk/vendor_extra/pear/PEAR/Installer.php
trunk/vendor_extra/pear/PEAR/PackageFile/Generator/v1.php
trunk/vendor_extra/pear/PEAR/PackageFile/Generator/v2.php
trunk/vendor_extra/pear/PEAR/PackageFile/Parser/v1.php
trunk/vendor_extra/pear/PEAR/PackageFile/Parser/v2.php
trunk/vendor_extra/pear/PEAR/PackageFile/v1.php
trunk/vendor_extra/pear/PEAR/PackageFile/v2/rw.php
trunk/vendor_extra/pear/PEAR/PackageFile/v2.php
trunk/vendor_extra/pear/PEAR/PackageFile.php
trunk/vendor_extra/pear/PEAR/Packager.php
trunk/vendor_extra/pear/PEAR/REST/10.php
trunk/vendor_extra/pear/PEAR/REST/11.php
trunk/vendor_extra/pear/PEAR/REST/13.php
trunk/vendor_extra/pear/PEAR/Registry.php
trunk/vendor_extra/pear/PEAR/RunTest.php
trunk/vendor_extra/pear/PEAR/Task/Postinstallscript/rw.php
trunk/vendor_extra/pear/PEAR/Task/Postinstallscript.php
trunk/vendor_extra/pear/PEAR/Task/Replace/rw.php
trunk/vendor_extra/pear/PEAR/Task/Replace.php
trunk/vendor_extra/pear/PEAR/Task/Unixeol/rw.php
trunk/vendor_extra/pear/PEAR/Task/Unixeol.php
trunk/vendor_extra/pear/PEAR/Task/Windowseol/rw.php
trunk/vendor_extra/pear/PEAR/Task/Windowseol.php
trunk/vendor_extra/pear/PEAR/Validate.php
trunk/vendor_extra/pear/PEAR/Validator/PECL.php
trunk/vendor_extra/pear/Text/Wiki/Default.php
trunk/vendor_extra/pear/Text/Wiki/Mediawiki.php
trunk/vendor_extra/pear/Text/Wiki/Tiki.php
trunk/vendor_extra/pear/Text/Wiki.php
trunk/vendor_extra/pear/XML_Parser/Parser/Simple.php
trunk/vendor_extra/pear/XML_Parser/Parser.php
trunk/vendor_extra/pear/XML_Parser/examples/xml_parser_file.php
trunk/vendor_extra/pear/XML_Parser/examples/xml_parser_funcmode.php
trunk/vendor_extra/pear/XML_Parser/examples/xml_parser_handler.php
trunk/vendor_extra/pear/XML_Parser/examples/xml_parser_simple1.php
trunk/vendor_extra/pear/XML_Parser/examples/xml_parser_simple2.php
trunk/vendor_extra/pear/XML_Parser/examples/xml_parser_simple_handler.php
Property Changed:
----------------
trunk/
Index: trunk
===================================================================
--- trunk 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk 2013-10-31 16:58:45 UTC (rev 48273)
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -1,6 +1,6 ##
/branches/10.x:43596-44410,44444-44836,44907
/branches/11.x:45702-47762
-/branches/12.x:47808-48250
+/branches/12.x:47808-48272
/branches/3.0:16998-18916
/branches/4.x:22817-23908
/branches/5.x:26025-26523,26527-28378
\ No newline at end of property
Modified: trunk/admin/include_performance.php
===================================================================
--- trunk/admin/include_performance.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/admin/include_performance.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -16,144 +16,14 @@
ask_ticket('admin-inc-performance');
-$opcode_cache = null;
-$stat_flag = null;
-$opcode_stats = array(
- 'warning_check' => false,
- 'warning_fresh' => false,
- 'warning_ratio' => false,
- 'warning_starve' => false,
- 'warning_low' => false,
- 'warning_xcache_blocked' => false,
-);
-if ( function_exists('apc_sma_info') && ini_get('apc.enabled') ) {
-
- if ( $_REQUEST['apc_clear']) {
- check_ticket('admin-inc-performance');
- apc_clear_cache();
- apc_clear_cache('user');
- apc_clear_cache('opcode');
- }
-
- $opcode_cache = 'APC';
-
- $sma = apc_sma_info();
- $mem_total = $sma['num_seg'] * $sma['seg_size'];
-
- $cache = apc_cache_info(null, true);
- $hit_total = $cache['num_hits'] + $cache['num_misses'];
- if (!$hit_total) { // cheat for chart after cache clear
- $hit_total = 1;
- $cache['num_misses'] = 1;
- }
-
- $stat_flag = 'apc.stat';
- $opcode_stats = array(
- 'memory_used' => ( $mem_total - $sma['avail_mem'] ) / $mem_total,
- 'memory_avail' => $sma['avail_mem'] / $mem_total,
- 'memory_total' => $mem_total,
- 'hit_hit' => $cache['num_hits'] / $hit_total,
- 'hit_miss' => $cache['num_misses'] / $hit_total,
- 'hit_total' => $hit_total,
- 'type' => 'apc',
- );
-} elseif ( function_exists('xcache_info') && ( ini_get('xcache.cacher') == '1' || ini_get('xcache.cacher') == 'On' ) ) {
- $opcode_cache = 'XCache';
-
- if ( ini_get('xcache.admin.enable_auth') == '1' || ini_get('xcache.admin.enable_auth') == 'On' ) {
- $opcode_stats['warning_xcache_blocked'] = true;
- } else {
- $stat_flag = 'xcache.stat';
- $opcode_stats = array(
- 'memory_used' => 0,
- 'memory_avail' => 0,
- 'memory_total' => 0,
- 'hit_hit' => 0,
- 'hit_miss' => 0,
- 'hit_total' => 0,
- 'type' => 'xcache',
- );
-
- foreach (range(0, xcache_count(XC_TYPE_PHP) - 1) as $index) {
- $info = xcache_info(XC_TYPE_PHP, $index);
-
- $opcode_stats['hit_hit'] += $info['hits'];
- $opcode_stats['hit_miss'] += $info['misses'];
- $opcode_stats['hit_total'] += $info['hits'] + $info['misses'];
-
- $opcode_stats['memory_used'] += $info['size'] - $info['avail'];
- $opcode_stats['memory_avail'] += $info['avail'];
- $opcode_stats['memory_total'] += $info['size'];
- }
-
- $opcode_stats['memory_used'] /= $opcode_stats['memory_total'];
- $opcode_stats['memory_avail'] /= $opcode_stats['memory_total'];
- $opcode_stats['hit_hit'] /= $opcode_stats['hit_total'];
- $opcode_stats['hit_miss'] /= $opcode_stats['hit_total'];
- }
-} elseif ( function_exists('wincache_ocache_fileinfo') && ( ini_get('wincache.ocenabled') == '1') ) {
- $opcode_cache = 'WinCache';
-
- $stat_flag = 'wincache.ocenabled';
- $opcode_stats = array(
- 'memory_used' => 0,
- 'memory_avail' => 0,
- 'memory_total' => 0,
- 'hit_hit' => 0,
- 'hit_miss' => 0,
- 'hit_total' => 0,
- 'type' => 'wincache',
- );
-
- $info = wincache_ocache_fileinfo();
- $opcode_stats['hit_hit'] = $info['total_hit_count'];
- $opcode_stats['hit_miss'] = $info['total_miss_count'];
- $opcode_stats['hit_total'] = $info['total_hit_count'] + $info['total_miss_count'];
-
- $memory = wincache_ocache_meminfo();
- $opcode_stats['memory_avail'] = $memory['memory_free'];
- $opcode_stats['memory_total'] = $memory['memory_total'];
- $opcode_stats['memory_used'] = $memory['memory_total'] - $memory['memory_free'];
-
- $opcode_stats['memory_used'] /= $opcode_stats['memory_total'];
- $opcode_stats['memory_avail'] /= $opcode_stats['memory_total'];
- $opcode_stats['hit_hit'] /= $opcode_stats['hit_total'];
- $opcode_stats['hit_miss'] /= $opcode_stats['hit_total'];
-}
-
-// Make results easier to read
-$opcode_stats['memory_used'] = round($opcode_stats['memory_used'], 2);
-$opcode_stats['memory_avail'] = round($opcode_stats['memory_avail'], 2);
-$opcode_stats['hit_hit'] = round($opcode_stats['hit_hit'], 2);
-$opcode_stats['hit_miss'] = round($opcode_stats['hit_miss'], 2);
-
-
+$opcode_stats = TikiLib::lib('admin')->getOpcodeCacheStatus();
+$stat_flag = $opcode_stats['stat_flag'];
if ( $stat_flag ) {
- $opcode_stats['warning_check'] = (bool) ini_get($stat_flag);
$smarty->assign('stat_flag', $stat_flag);
}
-if ( isset($opcode_stats['hit_total']) ) {
- $opcode_stats = array_merge(
- $opcode_stats,
- array(
- 'warning_fresh' => $opcode_stats['hit_total'] < 10000,
- 'warning_ratio' => $opcode_stats['hit_hit'] < 0.8,
- )
- );
-}
-
-if ( isset($opcode_stats['memory_total']) ) {
- $opcode_stats = array_merge(
- $opcode_stats,
- array(
- 'warning_starve' => $opcode_stats['memory_avail'] < 0.2,
- 'warning_low' => $opcode_stats['memory_total'] < 60*1024*1024,
- )
- );
-}
-
+$opcode_cache = $opcode_stats['opcode_cache'];
$smarty->assign('opcode_cache', $opcode_cache);
$smarty->assign('opcode_stats', $opcode_stats);
Modified: trunk/db/tiki-db.php
===================================================================
--- trunk/db/tiki-db.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/db/tiki-db.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -207,25 +207,16 @@
}
);
-try {
- $db = $initializer->getConnection($credentials['primary']);
-} catch (Exception $e) {
- echo $e;
- require_once 'lib/init/smarty.php';
+ini_set('display_errors', 1);
+$db = $initializer->getConnection($credentials['primary']);
- $smarty->assign('msg', $e->getMessage());
- $smarty->assign('where', 'connection');
- echo $smarty->fetch('database-connection-error.tpl');
- exit;
-}
-
if (! $db && ! defined('TIKI_IN_INSTALLER')) {
header('location: tiki-install.php');
exit;
+} elseif ($db) {
+ TikiDb::set($db);
}
-TikiDb::set($db);
-
if ($credentials['shadow']) {
global $dbMaster, $dbSlave;
// Set-up the replication
Modified: trunk/doc/devtools/satis.json
===================================================================
--- trunk/doc/devtools/satis.json 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/doc/devtools/satis.json 2013-10-31 16:58:45 UTC (rev 48273)
@@ -116,6 +116,17 @@
}
}
},
+ {
+ "type": "package",
+ "package": {
+ "name": "codemirror/codemirror",
+ "version": "3.16",
+ "dist": {
+ "url": "http://codemirror.net/codemirror-3.16.zip",
+ "type": "zip"
+ }
+ }
+ },
{
"type": "package",
"package": {
@@ -820,6 +831,17 @@
}
}
},
+ {
+ "type": "package",
+ "package": {
+ "name": "player/mp3",
+ "version": "1.0",
+ "dist": {
+ "url": "https://github.com/neolao/mp3-player/archive/master.zip",
+ "type": "zip"
+ }
+ }
+ },
{
"type": "package",
"package": {
Modified: trunk/lib/admin/adminlib.php
===================================================================
--- trunk/lib/admin/adminlib.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/lib/admin/adminlib.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -513,5 +513,160 @@
$logslib->add_log('dump', 'dump created');
}
+ public function getOpcodeCacheStatus()
+ {
+ $opcode_stats = array(
+ 'opcode_cache' => null,
+ 'stat_flag' => null,
+ 'warning_check' => false,
+ 'warning_fresh' => false,
+ 'warning_ratio' => false,
+ 'warning_starve' => false,
+ 'warning_low' => false,
+ 'warning_xcache_blocked' => false,
+ );
+
+ if ( function_exists('apc_sma_info') && ini_get('apc.enabled') ) {
+
+ if ( $_REQUEST['apc_clear']) {
+ check_ticket('admin-inc-performance');
+ apc_clear_cache();
+ apc_clear_cache('user');
+ apc_clear_cache('opcode');
+ }
+
+ $sma = apc_sma_info();
+ $mem_total = $sma['num_seg'] * $sma['seg_size'];
+
+ $cache = apc_cache_info(null, true);
+ $hit_total = $cache['num_hits'] + $cache['num_misses'];
+ if (!$hit_total) { // cheat for chart after cache clear
+ $hit_total = 1;
+ $cache['num_misses'] = 1;
+ }
+
+ $opcode_stats = array(
+ 'opcode_cache' => 'APC',
+ 'stat_flag' => 'apc.stat',
+ 'memory_used' => ( $mem_total - $sma['avail_mem'] ) / $mem_total,
+ 'memory_avail' => $sma['avail_mem'] / $mem_total,
+ 'memory_total' => $mem_total,
+ 'hit_hit' => $cache['num_hits'] / $hit_total,
+ 'hit_miss' => $cache['num_misses'] / $hit_total,
+ 'hit_total' => $hit_total,
+ 'type' => 'apc',
+ );
+ } elseif ( function_exists('xcache_info') && ( ini_get('xcache.cacher') == '1' || ini_get('xcache.cacher') == 'On' ) ) {
+ if ( ini_get('xcache.admin.enable_auth') == '1' || ini_get('xcache.admin.enable_auth') == 'On' ) {
+ $opcode_stats['warning_xcache_blocked'] = true;
+ } else {
+ $opcode_stats = array(
+ 'stat_flag' => 'xcache.stat',
+ 'memory_used' => 0,
+ 'memory_avail' => 0,
+ 'memory_total' => 0,
+ 'hit_hit' => 0,
+ 'hit_miss' => 0,
+ 'hit_total' => 0,
+ 'type' => 'xcache',
+ );
+
+ foreach (range(0, xcache_count(XC_TYPE_PHP) - 1) as $index) {
+ $info = xcache_info(XC_TYPE_PHP, $index);
+
+ $opcode_stats['hit_hit'] += $info['hits'];
+ $opcode_stats['hit_miss'] += $info['misses'];
+ $opcode_stats['hit_total'] += $info['hits'] + $info['misses'];
+
+ $opcode_stats['memory_used'] += $info['size'] - $info['avail'];
+ $opcode_stats['memory_avail'] += $info['avail'];
+ $opcode_stats['memory_total'] += $info['size'];
+ }
+
+ $opcode_stats['memory_used'] /= $opcode_stats['memory_total'];
+ $opcode_stats['memory_avail'] /= $opcode_stats['memory_total'];
+ $opcode_stats['hit_hit'] /= $opcode_stats['hit_total'];
+ $opcode_stats['hit_miss'] /= $opcode_stats['hit_total'];
+ }
+ $opcode_stats['opcode_cache'] = 'XCache';
+
+ } elseif ( function_exists('wincache_ocache_fileinfo') && ( ini_get('wincache.ocenabled') == '1') ) {
+ $opcode_stats = array(
+ 'opcode_cache' => 'WinCache',
+ 'stat_flag' => 'wincache.ocenabled',
+ 'memory_used' => 0,
+ 'memory_avail' => 0,
+ 'memory_total' => 0,
+ 'hit_hit' => 0,
+ 'hit_miss' => 0,
+ 'hit_total' => 0,
+ 'type' => 'wincache',
+ );
+
+ $info = wincache_ocache_fileinfo();
+ $opcode_stats['hit_hit'] = $info['total_hit_count'];
+ $opcode_stats['hit_miss'] = $info['total_miss_count'];
+ $opcode_stats['hit_total'] = $info['total_hit_count'] + $info['total_miss_count'];
+
+ $memory = wincache_ocache_meminfo();
+ $opcode_stats['memory_avail'] = $memory['memory_free'];
+ $opcode_stats['memory_total'] = $memory['memory_total'];
+ $opcode_stats['memory_used'] = $memory['memory_total'] - $memory['memory_free'];
+
+ $opcode_stats['memory_used'] /= $opcode_stats['memory_total'];
+ $opcode_stats['memory_avail'] /= $opcode_stats['memory_total'];
+ $opcode_stats['hit_hit'] /= $opcode_stats['hit_total'];
+ $opcode_stats['hit_miss'] /= $opcode_stats['hit_total'];
+ } elseif ( function_exists('opcache_get_status') && ini_get('opcache.enable') == '1' ) {
+ $opcode_stats['opcode_cache'] = 'OpCache';
+ $status = opcache_get_status();
+
+ $opcode_stats['hit_hit'] = $status['opcache_statistics']['hits'];
+ $opcode_stats['hit_miss'] = $status['opcache_statistics']['misses'];
+ $opcode_stats['hit_total'] = $status['opcache_statistics']['hits'] + $status['opcache_statistics']['misses'];
+
+ $opcode_stats['memory_avail'] = $status['memory_usage']['free_memory'];
+ $opcode_stats['memory_used'] = $status['memory_usage']['used_memory'];
+ $opcode_stats['memory_total'] = $status['memory_usage']['used_memory'] + $status['memory_usage']['free_memory'];
+
+ $opcode_stats['memory_used'] /= $opcode_stats['memory_total'];
+ $opcode_stats['memory_avail'] /= $opcode_stats['memory_total'];
+ $opcode_stats['hit_hit'] /= $opcode_stats['hit_total'];
+ $opcode_stats['hit_miss'] /= $opcode_stats['hit_total'];
+ }
+
+ // Make results easier to read
+ $opcode_stats['memory_used'] = round($opcode_stats['memory_used'], 2);
+ $opcode_stats['memory_avail'] = round($opcode_stats['memory_avail'], 2);
+ $opcode_stats['hit_hit'] = round($opcode_stats['hit_hit'], 2);
+ $opcode_stats['hit_miss'] = round($opcode_stats['hit_miss'], 2);
+
+ if ( isset($opcode_stats['hit_total']) ) {
+ $opcode_stats = array_merge(
+ $opcode_stats,
+ array(
+ 'warning_fresh' => $opcode_stats['hit_total'] < 10000,
+ 'warning_ratio' => $opcode_stats['hit_hit'] < 0.8,
+ )
+ );
+ }
+
+ if ( isset($opcode_stats['memory_total']) ) {
+ $opcode_stats = array_merge(
+ $opcode_stats,
+ array(
+ 'warning_starve' => $opcode_stats['memory_avail'] < 0.2,
+ 'warning_low' => $opcode_stats['memory_total'] < 60*1024*1024,
+ )
+ );
+ }
+
+ $stat_flag = $opcode_stats['stat_flag'];
+ if ( $stat_flag ) {
+ $opcode_stats['warning_check'] = (bool) ini_get($stat_flag);
+ }
+
+ return $opcode_stats;
+ }
}
global $adminlib; $adminlib = new AdminLib;
Modified: trunk/lib/core/TikiDb/Initializer/Pdo.php
===================================================================
--- trunk/lib/core/TikiDb/Initializer/Pdo.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/lib/core/TikiDb/Initializer/Pdo.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -44,19 +44,23 @@
// Setup SSL, if activated
$this->setupSSL($pdo_options);
- $dbTiki = new PDO("mysql:$db_hoststring;dbname={$credentials['dbs']}", $credentials['user'], $credentials['pass'], $pdo_options);
+ try {
+ $dbTiki = new PDO("mysql:$db_hoststring;dbname={$credentials['dbs']}", $credentials['user'], $credentials['pass'], $pdo_options);
- $dbTiki->setAttribute(PDO::ATTR_CASE, PDO::CASE_NATURAL);
- $dbTiki->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_WARNING);
- // $dbTiki->setAttribute(PDO::ATTR_ORACLE_NULLS, PDO::NULL_EMPTY_STRING);
+ $dbTiki->setAttribute(PDO::ATTR_CASE, PDO::CASE_NATURAL);
+ $dbTiki->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_WARNING);
+ // $dbTiki->setAttribute(PDO::ATTR_ORACLE_NULLS, PDO::NULL_EMPTY_STRING);
- $db = new TikiDb_Pdo($dbTiki);
+ $db = new TikiDb_Pdo($dbTiki);
- foreach ($pdo_post_queries as $query) {
- $db->query($query);
+ foreach ($pdo_post_queries as $query) {
+ $db->query($query);
+ }
+
+ return $db;
+ } catch (Exception $e) {
+ return null;
}
-
- return $db;
}
function setupSSL(&$pdo_options)
Modified: trunk/lib/userslib.php
===================================================================
--- trunk/lib/userslib.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/lib/userslib.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -1550,7 +1550,6 @@
// set the Auth options
- require_once('pear/Auth.php');
$a = new Auth('LDAP', $options);
// check if the login correct
Modified: trunk/lib/wiki-plugins/wikiplugin_trackerfilter.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_trackerfilter.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/lib/wiki-plugins/wikiplugin_trackerfilter.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -688,16 +688,17 @@
break;
case 'r':
$opts = array();
- $handler = $trklib->get_field_handler($field);
- $add = $handler->getFieldData();
- $selected = empty($_REQUEST['f_'.$fieldId])? '': $_REQUEST['f_'.$fieldId];
- $list = !empty($add['listdisplay']) ? 'listdisplay' : 'list'; // use listdisplay for labels if there
- foreach ($add[$list] as $id => $option) {
- $opts[] = array(
- 'id' => $id,
- 'name' => $option,
- 'selected' => $selected == $id,
- );
+ $list = $trklib->list_tracker_field_values($trackerId, $fieldId);
+ $list1 = $trklib->get_all_items($trackerId, $fieldId);
+ foreach ($list1 as $id => $option) {
+ $opt['id'] = $opt['name'] = $option;
+ if (!empty($_REQUEST['f_'.$fieldId]) && ((!is_array($_REQUEST['f_'.$fieldId]) && urldecode($_REQUEST['f_'.$fieldId]) == $option) || (is_array($_REQUEST['f_'.$fieldId]) && in_array($option, $_REQUEST['f_'.$fieldId])))) {
+ $opt['selected'] = 'y';
+ $selected = true;
+ } else {
+ $opt['selected'] = 'n';
+ }
+ $opts[] = $opt;
}
break;
Modified: trunk/styles/layout/design.css
===================================================================
--- trunk/styles/layout/design.css 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/styles/layout/design.css 2013-10-31 16:58:45 UTC (rev 48273)
@@ -1593,12 +1593,22 @@
font-size: 1.2em;
}
-#comment-container .buttons table {
- width: 100%;
+#comment-container .notitle h4 {
+ margin-bottom: 0.2em;
}
+#comment-container .buttons table td {
+ padding: 0;
+}
+#comment-container .buttons table .button {
+ margin: 0;
+}
+
/* Comments (article, blogs) */
+#comment-container .actions {
+ float: right;
+}
#comment-container ol {
list-style: none;
margin: 0 0 0 1em;
@@ -1609,6 +1619,19 @@
margin: 0 0 0 4em;
}
+#comment-container .avatar {
+ float: left;
+ margin-right: .7em;
+}
+
+#comment-container .author_info {
+ padding: 0;
+}
+
+#comment-container .date {
+ font-style: italic;
+}
+
/* Comment Annotations */
dl.note-list {
@@ -4600,4 +4623,9 @@
margin: 1em 0;
}
+/** Spreadsheet **/
+.tiki_sheet .ui-widget-header {
+ border: 0 !important;
+}
+
/* End of file */
Modified: trunk/templates/comment/list.tpl
===================================================================
--- trunk/templates/comment/list.tpl 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/templates/comment/list.tpl 2013-10-31 16:58:45 UTC (rev 48273)
@@ -1,17 +1,21 @@
-{if ! $parentId && $allow_lock}
- {self_link controller=comment action=lock type=$type objectId=$objectId _icon=lock _class="confirm-prompt" _confirm="{tr}Do you really want to lock comments?{/tr}"}{tr}Lock{/tr}{/self_link}
+<div class="actions">
+ {if ! $parentId && $allow_lock}
+ {self_link controller=comment action=lock type=$type objectId=$objectId _icon=lock _class="confirm-prompt" _confirm="{tr}Do you really want to lock comments?{/tr}"}{tr}Lock{/tr}{/self_link}
+ {/if}
+ {if ! $parentId && $allow_unlock}
+ {self_link controller=comment action=unlock type=$type objectId=$objectId _icon=lock_break _class="confirm-prompt" _confirm="{tr}Do you really want to unlock comments?{/tr}"}{tr}Unlock{/tr}{/self_link}
+ {/if}
+</div>
+{if ! $parentId}
+ <h3>{tr}Comments{/tr}</h3>
{/if}
-{if ! $parentId && $allow_unlock}
- {self_link controller=comment action=unlock type=$type objectId=$objectId _icon=lock_break _class="confirm-prompt" _confirm="{tr}Do you really want to unlock comments?{/tr}"}{tr}Unlock{/tr}{/self_link}
-{/if}
-
{if $cant gt 0}
<ol>
{foreach from=$comments item=comment}
<li class="comment {if $comment.archived eq 'y'}archived{/if} {if ! $parentId && $prefs.feature_wiki_paragraph_formatting eq 'y'}inline{/if}" data-comment-thread-id="{$comment.threadId|escape}">
<article>
- <div style="float: right;">
+ <div class="actions">
{if $allow_remove}
{self_link controller=comment action=remove threadId=$comment.threadId _icon=cross _class="confirm-prompt" _confirm="{tr}Are you sure you want to remove this comment?{/tr}"}{tr}Remove{/tr}{/self_link}
{/if}
@@ -28,11 +32,18 @@
{/if}
</div>
{if $prefs.comments_notitle eq 'y'}
- <h4>{tr _0=$comment.userName|userlink _1=$comment.commentDate|tiki_long_datetime}Comment posted by %0 on %1{/tr}</h4>
- {else}
- <h4 class="title">{$comment.title}</h4>
- <span class="avatar">{$comment.userName|avatarize}</span>
- <div class="author_info">{tr _0=$comment.userName|userlink _1=$comment.commentDate|tiki_long_datetime}Comment posted by %0 on %1{/tr}</div>
+ <div class="title notitle clearfix">
+ <span class="avatar">{$comment.userName|avatarize}</span>
+ <h4>{tr _0=$comment.userName|userlink}By %0{/tr}</h4>
+ <div class="date">{tr _0=$comment.commentDate|tiki_short_datetime}On %0{/tr}</div>
+ </div>
+ {else}
+ <div class="title clearfix">
+ <h4 class="title">{$comment.title}</h4>
+ <span class="avatar">{$comment.userName|avatarize}</span>
+ <div class="author_info">{tr _0=$comment.userName|userlink}Comment posted by %0{/tr}</div>
+ <div class="date">{tr _0=$comment.commentDate|tiki_short_datetime}On %0{/tr}</div>
+ </div>
{/if}
<div class="body">
{$comment.parsed}
Modified: trunk/templates/tiki-check.tpl
===================================================================
--- trunk/templates/tiki-check.tpl 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/templates/tiki-check.tpl 2013-10-31 16:58:45 UTC (rev 48273)
@@ -34,18 +34,6 @@
{norecords _colspan=4}
{/foreach}
</table>
-{if $haveMySQLSSL}
- {if $mysqlSSL === true}
- <p class="mysqlsslstatus"><img src="img/icons/lock.png" style="outline:lightgreen solid thin"/> {tr}MySQL SSL connection is active{/tr}</p>
- {else}
- <p class="mysqlsslstatus"><img src="img/icons/lock_open.png" style="outline:pink solid thin"/> {tr}MySQL connection is not encrypted{/tr}<br>
- {tr}To activate SSL, copy the keyfiles (.pem) til db/cert folder. The filenames must end with "-key.pem", "-cert.pem", "-ca.pem"{/tr}
- </p>
- {/if}
-{else}
- <p><img src="img/icons/lock_gray.png" style="outline:pink solid thin"/> {tr}MySQL Server does not have SSL activated{/tr}
- </p>
-{/if}
<h2>{tr}MySQL crashed Tables{/tr}</h2>
{remarksbox type="note" title="{tr}Be careful{/tr}"}{tr}The following list is just a very quick look at SHOW TABLE STATUS that tells you, if tables have been marked as crashed. If you are experiencing database problems you should still run CHECK TABLE or myisamchk to make sure{/tr}.{/remarksbox}
Modified: trunk/templates/wiki-plugins/wikiplugin_listexecute.tpl
===================================================================
--- trunk/templates/wiki-plugins/wikiplugin_listexecute.tpl 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/templates/wiki-plugins/wikiplugin_listexecute.tpl 2013-10-31 16:58:45 UTC (rev 48273)
@@ -1,4 +1,5 @@
<form method="post" action="">
+ <button class="listexecute-select-all">{tr}Select All{/tr}</button>
<ol>
{foreach from=$results item=entry}
<li>
@@ -21,3 +22,10 @@
</select>
<input type="submit" class="btn btn-default" value="{tr}Apply{/tr}">
</form>
+{jq}
+$('.listexecute-select-all').removeClass('listexecute-select-all')
+ .on('click', function (e) {
+ $(this).closest('form').find(':checkbox:not(:checked)').click();
+ e.preventDefault();
+ });
+{/jq}
Modified: trunk/tiki-check.php
===================================================================
--- trunk/tiki-check.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/tiki-check.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -1069,16 +1069,6 @@
);
}
- // MySQL SSL
- $haveMySQLSSL = $tikilib->haveMySQLSSL();
- $smarty->assign('haveMySQLSSL', $haveMySQLSSL);
- if ($haveMySQLSSL) {
- $isSSL = $tikilib->isMySQLConnSSL();
- } else {
- $isSSL = false;
- }
- $smarty->assign('mysqlSSL', $isSSL);
-
// MySQL Variables
$query = "SHOW VARIABLES;";
$result = query($query, $connection);
Modified: trunk/tiki-monitor.php
===================================================================
--- trunk/tiki-monitor.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/tiki-monitor.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -25,141 +25,8 @@
exit;
}
}
-$opcode_cache = null;
-$stat_flag = null;
-$opcode_stats = array(
- 'warning_check' => false,
- 'warning_fresh' => false,
- 'warning_ratio' => false,
- 'warning_starve' => false,
- 'warning_low' => false,
- 'warning_xcache_blocked' => false,
-);
+$opcode_stats = TikiLib::lib('admin')->getOpcodeCacheStatus();
-if ( function_exists('apc_sma_info') && ini_get('apc.enabled') ) {
- $opcode_cache = 'APC';
-
- $sma = apc_sma_info();
- $mem_total = $sma['num_seg'] * $sma['seg_size'];
-
- $cache = apc_cache_info(null, true);
- $hit_total = $cache['num_hits'] + $cache['num_misses'];
-
- $stat_flag = 'apc.stat';
- $opcode_stats = array(
- 'memory_used' => ( $mem_total - $sma['avail_mem'] ) / $mem_total,
- 'memory_avail' => $sma['avail_mem'] / $mem_total,
- 'memory_total' => $mem_total,
- 'hit_hit' => $cache['num_hits'] / $hit_total,
- 'hit_miss' => $cache['num_misses'] / $hit_total,
- 'hit_total' => $hit_total,
- );
-} elseif ( function_exists('xcache_info') && ( ini_get('xcache.cacher') == '1' || ini_get('xcache.cacher') == 'On' ) ) {
- $opcode_cache = 'XCache';
-
- if ( ini_get('xcache.admin.enable_auth') == '1' || ini_get('xcache.admin.enable_auth') == 'On' ) {
- $opcode_stats['warning_xcache_blocked'] = true;
- } else {
- $stat_flag = 'xcache.stat';
- $opcode_stats = array(
- 'memory_used' => 0,
- 'memory_avail' => 0,
- 'memory_total' => 0,
- 'hit_hit' => 0,
- 'hit_miss' => 0,
- 'hit_total' => 0,
- );
-
- foreach (range(0, xcache_count(XC_TYPE_PHP) - 1) as $index) {
- $info = xcache_info(XC_TYPE_PHP, $index);
-
- $opcode_stats['hit_hit'] += $info['hits'];
- $opcode_stats['hit_miss'] += $info['misses'];
- $opcode_stats['hit_total'] += $info['hits'] + $info['misses'];
-
- $opcode_stats['memory_used'] += $info['size'] - $info['avail'];
- $opcode_stats['memory_avail'] += $info['avail'];
- $opcode_stats['memory_total'] += $info['size'];
- }
-
- $opcode_stats['memory_used'] /= $opcode_stats['memory_total'];
- $opcode_stats['memory_avail'] /= $opcode_stats['memory_total'];
- $opcode_stats['hit_hit'] /= $opcode_stats['hit_total'];
- $opcode_stats['hit_miss'] /= $opcode_stats['hit_total'];
- }
-} elseif ( function_exists('wincache_ocache_fileinfo') && ( ini_get('wincache.ocenabled') == '1') ) {
- $opcode_cache = 'WinCache';
-
- $stat_flag = 'wincache.ocenabled';
- $opcode_stats = array(
- 'memory_used' => 0,
- 'memory_avail' => 0,
- 'memory_total' => 0,
- 'hit_hit' => 0,
- 'hit_miss' => 0,
- 'hit_total' => 0,
- );
-
- $info = wincache_ocache_fileinfo();
- $opcode_stats['hit_hit'] = $info['total_hit_count'];
- $opcode_stats['hit_miss'] = $info['total_miss_count'];
- $opcode_stats['hit_total'] = $info['total_hit_count'] + $info['total_miss_count'];
-
- $memory = wincache_ocache_meminfo();
- $opcode_stats['memory_avail'] = $memory['memory_free'];
- $opcode_stats['memory_total'] = $memory['memory_total'];
- $opcode_stats['memory_used'] = $memory['memory_total'] - $memory['memory_free'];
-
- $opcode_stats['memory_used'] /= $opcode_stats['memory_total'];
- $opcode_stats['memory_avail'] /= $opcode_stats['memory_total'];
- $opcode_stats['hit_hit'] /= $opcode_stats['hit_total'];
- $opcode_stats['hit_miss'] /= $opcode_stats['hit_total'];
-} elseif ( function_exists('opcache_get_status') && ( ini_get('opcache.enable') == '1') ) {
- $opcode_cache = 'OPCache';
- $status = opcache_get_status();
- $opcode_stats['memory_total'] = $status['memory_usage']['free_memory'] + $status['memory_usage']['used_memory'] + $status['memory_usage']['wasted_memory'];
- $opcode_stats['memory_avail'] = $status['memory_usage']['free_memory'];
- $opcode_stats['memory_used'] = $status['memory_usage']['used_memory'];
-
- $opcode_stats['memory_used'] /= $opcode_stats['memory_total'];
- $opcode_stats['memory_avail'] /= $opcode_stats['memory_total'];
-
- $opcode_stats['hit_total'] = $status['opcache_statistics']['hits'];
- $opcode_stats['hit_miss'] = (100 - $status['opcache_statistics']['opcache_hit_rate'] ) / 100;
- $opcode_stats['hit_hit'] = $status['opcache_statistics']['opcache_hit_rate'] / 100;
-}
-
-// Make results easier to read
-$opcode_stats['memory_used'] = round($opcode_stats['memory_used'], 2);
-$opcode_stats['memory_avail'] = round($opcode_stats['memory_avail'], 2);
-$opcode_stats['hit_hit'] = round($opcode_stats['hit_hit'], 2);
-$opcode_stats['hit_miss'] = round($opcode_stats['hit_miss'], 2);
-
-
-if ( $stat_flag ) {
- $opcode_stats['warning_check'] = (bool) ini_get($stat_flag);
-}
-
-if ( isset($opcode_stats['hit_total']) ) {
- $opcode_stats = array_merge(
- $opcode_stats,
- array(
- 'warning_fresh' => $opcode_stats['hit_total'] < 10000,
- 'warning_ratio' => $opcode_stats['hit_hit'] < 0.8,
- )
- );
-}
-
-if ( isset($opcode_stats['memory_total']) ) {
- $opcode_stats = array_merge(
- $opcode_stats,
- array(
- 'warning_starve' => $opcode_stats['memory_avail'] < 0.2,
- 'warning_low' => $opcode_stats['memory_total'] < 60*1024*1024,
- )
- );
-}
-
# TODO: The results will be wrong for WinCache
# The following is the relevant snippet from
# admin/include_performance.php
@@ -171,7 +38,7 @@
$txtUsed = tr('Available');
}
-$result['OPCodeCache'] = $opcode_cache;
+$result['OPCodeCache'] = $opcode_stats['opcode_cache'];
$result['OpCodeStats'] = $opcode_stats;
include_once ('installer/installlib.php');
Modified: trunk/vendor_extra/pear/Auth/Anonymous.php
===================================================================
--- trunk/vendor_extra/pear/Auth/Anonymous.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/vendor_extra/pear/Auth/Anonymous.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -24,11 +24,6 @@
*/
/**
- * Include Auth package
- */
-require_once 'Auth.php';
-
-/**
* Anonymous Authentication
*
* This class provides anonymous authentication if username and password
Modified: trunk/vendor_extra/pear/Auth/Auth.php
===================================================================
--- trunk/vendor_extra/pear/Auth/Auth.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/vendor_extra/pear/Auth/Auth.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -25,4 +25,3 @@
/**
* Include Auth package
*/
-require_once 'Auth.php';
Modified: trunk/vendor_extra/pear/Auth/Container/DB.php
===================================================================
--- trunk/vendor_extra/pear/Auth/Container/DB.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/vendor_extra/pear/Auth/Container/DB.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -22,14 +22,6 @@
* @link http://pear.php.net/package/Auth
*/
-/**
- * Include Auth_Container base class
- */
-require_once 'Auth/Container.php';
-/**
- * Include PEAR DB
- */
-require_once 'DB.php';
/**
* Storage driver for fetching login data from a database
Modified: trunk/vendor_extra/pear/Auth/Container/DBLite.php
===================================================================
--- trunk/vendor_extra/pear/Auth/Container/DBLite.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/vendor_extra/pear/Auth/Container/DBLite.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -24,15 +24,6 @@
*/
/**
- * Include Auth_Container base class
- */
-require_once 'Auth/Container.php';
-/**
- * Include PEAR DB package
- */
-require_once 'DB.php';
-
-/**
* A lighter storage driver for fetching login data from a database
*
* This driver is derived from the DB storage container but
Modified: trunk/vendor_extra/pear/Auth/Container/MDB.php
===================================================================
--- trunk/vendor_extra/pear/Auth/Container/MDB.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/vendor_extra/pear/Auth/Container/MDB.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -23,14 +23,6 @@
* @since File available since Release 1.2.3
*/
-/**
- * Include Auth_Container base class
- */
-require_once 'Auth/Container.php';
-/**
- * Include PEAR MDB package
- */
-require_once 'MDB.php';
/**
* Storage driver for fetching login data from a database
Modified: trunk/vendor_extra/pear/Auth/Container/MDB2.php
===================================================================
--- trunk/vendor_extra/pear/Auth/Container/MDB2.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/vendor_extra/pear/Auth/Container/MDB2.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -23,14 +23,6 @@
* @since File available since Release 1.3.0
*/
-/**
- * Include Auth_Container base class
- */
-require_once 'Auth/Container.php';
-/**
- * Include PEAR MDB2 package
- */
-require_once 'MDB2.php';
/**
* Storage driver for fetching login data from a database
Modified: trunk/vendor_extra/pear/Auth/Container/PEAR.php
===================================================================
--- trunk/vendor_extra/pear/Auth/Container/PEAR.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/vendor_extra/pear/Auth/Container/PEAR.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -23,14 +23,6 @@
* @since File available since Release 1.3.0
*/
-/**
- * Include PEAR HTTP_Client.
- */
-require_once 'HTTP/Client.php';
-/**
- * Include Auth_Container base class
- */
-require_once 'Auth/Container.php';
/**
* Storage driver for authenticating against PEAR website
Modified: trunk/vendor_extra/pear/Auth/Container/RADIUS.php
===================================================================
--- trunk/vendor_extra/pear/Auth/Container/RADIUS.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/vendor_extra/pear/Auth/Container/RADIUS.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -23,14 +23,6 @@
* @since File available since Release 1.2.0
*/
-/**
- * Include Auth_Container base class
- */
-require_once "Auth/Container.php";
-/**
- * Include PEAR Auth_RADIUS package
- */
-require_once "Auth/RADIUS.php";
/**
* Storage driver for authenticating users against RADIUS servers.
Modified: trunk/vendor_extra/pear/Auth/OpenID/AX.php
===================================================================
--- trunk/vendor_extra/pear/Auth/OpenID/AX.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/vendor_extra/pear/Auth/OpenID/AX.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -7,13 +7,6 @@
* @package OpenID
*/
-/**
- * Require utility classes and functions for the consumer.
- */
-require_once "Auth/OpenID/Extension.php";
-require_once "Auth/OpenID/Message.php";
-require_once "Auth/OpenID/TrustRoot.php";
-
define('Auth_OpenID_AX_NS_URI',
'http://openid.net/srv/ax/1.0');
Modified: trunk/vendor_extra/pear/Auth/OpenID/Association.php
===================================================================
--- trunk/vendor_extra/pear/Auth/OpenID/Association.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/vendor_extra/pear/Auth/OpenID/Association.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -15,21 +15,6 @@
*/
/**
- * @access private
- */
-require_once 'Auth/OpenID/CryptUtil.php';
-
-/**
- * @access private
- */
-require_once 'Auth/OpenID/KVForm.php';
-
-/**
- * @access private
- */
-require_once 'Auth/OpenID/HMAC.php';
-
-/**
* This class represents an association between a server and a
* consumer. In general, users of this library will never see
* instances of this object. The only exception is if you implement a
Modified: trunk/vendor_extra/pear/Auth/OpenID/BigMath.php
===================================================================
--- trunk/vendor_extra/pear/Auth/OpenID/BigMath.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/vendor_extra/pear/Auth/OpenID/BigMath.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -16,16 +16,6 @@
*/
/**
- * Needed for random number generation
- */
-require_once 'Auth/OpenID/CryptUtil.php';
-
-/**
- * Need Auth_OpenID::bytes().
- */
-require_once 'Auth/OpenID.php';
-
-/**
* The superclass of all big-integer math implementations
* @access private
* @package OpenID
Modified: trunk/vendor_extra/pear/Auth/OpenID/Consumer.php
===================================================================
--- trunk/vendor_extra/pear/Auth/OpenID/Consumer.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/vendor_extra/pear/Auth/OpenID/Consumer.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -158,22 +158,6 @@
*/
/**
- * Require utility classes and functions for the consumer.
- */
-require_once "Auth/OpenID.php";
-require_once "Auth/OpenID/Message.php";
-require_once "Auth/OpenID/HMAC.php";
-require_once "Auth/OpenID/Association.php";
-require_once "Auth/OpenID/CryptUtil.php";
-require_once "Auth/OpenID/DiffieHellman.php";
-require_once "Auth/OpenID/KVForm.php";
-require_once "Auth/OpenID/Nonce.php";
-require_once "Auth/OpenID/Discover.php";
-require_once "Auth/OpenID/URINorm.php";
-require_once "Auth/Yadis/Manager.php";
-require_once "Auth/Yadis/XRI.php";
-
-/**
* This is the status code returned when the complete method returns
* successfully.
*/
Modified: trunk/vendor_extra/pear/Auth/OpenID/DiffieHellman.php
===================================================================
--- trunk/vendor_extra/pear/Auth/OpenID/DiffieHellman.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/vendor_extra/pear/Auth/OpenID/DiffieHellman.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -14,9 +14,6 @@
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache
*/
-require_once 'Auth/OpenID.php';
-require_once 'Auth/OpenID/BigMath.php';
-
function Auth_OpenID_getDefaultMod()
{
return '155172898181473697471232257763715539915724801'.
Modified: trunk/vendor_extra/pear/Auth/OpenID/Discover.php
===================================================================
--- trunk/vendor_extra/pear/Auth/OpenID/Discover.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/vendor_extra/pear/Auth/OpenID/Discover.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -4,12 +4,6 @@
* The OpenID and Yadis discovery implementation for OpenID 1.2.
*/
-require_once "Auth/OpenID.php";
-require_once "Auth/OpenID/Parse.php";
-require_once "Auth/OpenID/Message.php";
-require_once "Auth/Yadis/XRIRes.php";
-require_once "Auth/Yadis/Yadis.php";
-
// XML namespace value
define('Auth_OpenID_XMLNS_1_0', 'http://openid.net/xmlns/1.0');
Modified: trunk/vendor_extra/pear/Auth/OpenID/DumbStore.php
===================================================================
--- trunk/vendor_extra/pear/Auth/OpenID/DumbStore.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/vendor_extra/pear/Auth/OpenID/DumbStore.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -15,12 +15,6 @@
*/
/**
- * Import the interface for creating a new store class.
- */
-require_once 'Auth/OpenID/Interface.php';
-require_once 'Auth/OpenID/HMAC.php';
-
-/**
* This is a store for use in the worst case, when you have no way of
* saving state on the consumer site. Using this store makes the
* consumer vulnerable to replay attacks, as it's unable to use
Modified: trunk/vendor_extra/pear/Auth/OpenID/Extension.php
===================================================================
--- trunk/vendor_extra/pear/Auth/OpenID/Extension.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/vendor_extra/pear/Auth/OpenID/Extension.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -7,11 +7,6 @@
*/
/**
- * Require the Message implementation.
- */
-require_once 'Auth/OpenID/Message.php';
-
-/**
* A base class for accessing extension request and response data for
* the OpenID 2 protocol.
*
Modified: trunk/vendor_extra/pear/Auth/OpenID/FileStore.php
===================================================================
--- trunk/vendor_extra/pear/Auth/OpenID/FileStore.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/vendor_extra/pear/Auth/OpenID/FileStore.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -15,14 +15,6 @@
*/
/**
- * Require base class for creating a new interface.
- */
-require_once 'Auth/OpenID.php';
-require_once 'Auth/OpenID/Interface.php';
-require_once 'Auth/OpenID/HMAC.php';
-require_once 'Auth/OpenID/Nonce.php';
-
-/**
* This is a filesystem-based store for OpenID associations and
* nonces. This store should be safe for use in concurrent systems on
* both windows and unix (excluding NFS filesystems). There are a
Modified: trunk/vendor_extra/pear/Auth/OpenID/HMAC.php
===================================================================
--- trunk/vendor_extra/pear/Auth/OpenID/HMAC.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/vendor_extra/pear/Auth/OpenID/HMAC.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -14,8 +14,6 @@
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache
*/
-require_once 'Auth/OpenID.php';
-
/**
* SHA1_BLOCKSIZE is this module's SHA1 blocksize used by the fallback
* implementation.
Modified: trunk/vendor_extra/pear/Auth/OpenID/MemcachedStore.php
===================================================================
--- trunk/vendor_extra/pear/Auth/OpenID/MemcachedStore.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/vendor_extra/pear/Auth/OpenID/MemcachedStore.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -16,11 +16,6 @@
*/
/**
- * Import the interface for creating a new store class.
- */
-require_once 'Auth/OpenID/Interface.php';
-
-/**
* This is a memcached-based store for OpenID associations and
* nonces.
*
Modified: trunk/vendor_extra/pear/Auth/OpenID/Message.php
===================================================================
--- trunk/vendor_extra/pear/Auth/OpenID/Message.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/vendor_extra/pear/Auth/OpenID/Message.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -9,10 +9,6 @@
/**
* Import tools needed to deal with messages.
*/
-require_once 'Auth/OpenID.php';
-require_once 'Auth/OpenID/KVForm.php';
-require_once 'Auth/Yadis/XML.php';
-require_once 'Auth/OpenID/Consumer.php'; // For Auth_OpenID_FailureResponse
// This doesn't REALLY belong here, but where is better?
define('Auth_OpenID_IDENTIFIER_SELECT',
Modified: trunk/vendor_extra/pear/Auth/OpenID/MySQLStore.php
===================================================================
--- trunk/vendor_extra/pear/Auth/OpenID/MySQLStore.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/vendor_extra/pear/Auth/OpenID/MySQLStore.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -7,11 +7,6 @@
*/
/**
- * Require the base class file.
- */
-require_once "Auth/OpenID/SQLStore.php";
-
-/**
* An SQL store that uses MySQL as its backend.
*
* @package OpenID
Modified: trunk/vendor_extra/pear/Auth/OpenID/Nonce.php
===================================================================
--- trunk/vendor_extra/pear/Auth/OpenID/Nonce.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/vendor_extra/pear/Auth/OpenID/Nonce.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -7,11 +7,6 @@
*/
/**
- * Need CryptUtil to generate random strings.
- */
-require_once 'Auth/OpenID/CryptUtil.php';
-
-/**
* This is the characters that the nonces are made from.
*/
define('Auth_OpenID_Nonce_CHRS',"abcdefghijklmnopqrstuvwxyz" .
Modified: trunk/vendor_extra/pear/Auth/OpenID/PAPE.php
===================================================================
--- trunk/vendor_extra/pear/Auth/OpenID/PAPE.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/vendor_extra/pear/Auth/OpenID/PAPE.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -8,8 +8,6 @@
* http://openid.net/developers/specs/
*/
-require_once "Auth/OpenID/Extension.php";
-
define('Auth_OpenID_PAPE_NS_URI',
"http://specs.openid.net/extensions/pape/1.0");
Modified: trunk/vendor_extra/pear/Auth/OpenID/Parse.php
===================================================================
--- trunk/vendor_extra/pear/Auth/OpenID/Parse.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/vendor_extra/pear/Auth/OpenID/Parse.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -79,11 +79,6 @@
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache
*/
-/**
- * Require Auth_OpenID::arrayGet().
- */
-require_once "Auth/OpenID.php";
-
class Auth_OpenID_Parse {
/**
Modified: trunk/vendor_extra/pear/Auth/OpenID/PostgreSQLStore.php
===================================================================
--- trunk/vendor_extra/pear/Auth/OpenID/PostgreSQLStore.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/vendor_extra/pear/Auth/OpenID/PostgreSQLStore.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -7,11 +7,6 @@
*/
/**
- * Require the base class file.
- */
-require_once "Auth/OpenID/SQLStore.php";
-
-/**
* An SQL store that uses PostgreSQL as its backend.
*
* @package OpenID
Modified: trunk/vendor_extra/pear/Auth/OpenID/SQLStore.php
===================================================================
--- trunk/vendor_extra/pear/Auth/OpenID/SQLStore.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/vendor_extra/pear/Auth/OpenID/SQLStore.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -14,22 +14,6 @@
*/
/**
- * @access private
- */
-require_once 'Auth/OpenID/Interface.php';
-require_once 'Auth/OpenID/Nonce.php';
-
-/**
- * @access private
- */
-require_once 'Auth/OpenID.php';
-
-/**
- * @access private
- */
-require_once 'Auth/OpenID/Nonce.php';
-
-/**
* This is the parent class for the SQL stores, which contains the
* logic common to all of the SQL stores.
*
Modified: trunk/vendor_extra/pear/Auth/OpenID/SQLiteStore.php
===================================================================
--- trunk/vendor_extra/pear/Auth/OpenID/SQLiteStore.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/vendor_extra/pear/Auth/OpenID/SQLiteStore.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -7,11 +7,6 @@
*/
/**
- * Require the base class file.
- */
-require_once "Auth/OpenID/SQLStore.php";
-
-/**
* An SQL store that uses SQLite as its backend.
*
* @package OpenID
Modified: trunk/vendor_extra/pear/Auth/OpenID/SReg.php
===================================================================
--- trunk/vendor_extra/pear/Auth/OpenID/SReg.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/vendor_extra/pear/Auth/OpenID/SReg.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -39,12 +39,6 @@
* @package OpenID
*/
-/**
- * Import message and extension internals.
- */
-require_once 'Auth/OpenID/Message.php';
-require_once 'Auth/OpenID/Extension.php';
-
// The data fields that are listed in the sreg spec
global $Auth_OpenID_sreg_data_fields;
$Auth_OpenID_sreg_data_fields = array(
Modified: trunk/vendor_extra/pear/Auth/OpenID/Server.php
===================================================================
--- trunk/vendor_extra/pear/Auth/OpenID/Server.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/vendor_extra/pear/Auth/OpenID/Server.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -89,20 +89,6 @@
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache
*/
-/**
- * Required imports
- */
-require_once "Auth/OpenID.php";
-require_once "Auth/OpenID/Association.php";
-require_once "Auth/OpenID/CryptUtil.php";
-require_once "Auth/OpenID/BigMath.php";
-require_once "Auth/OpenID/DiffieHellman.php";
-require_once "Auth/OpenID/KVForm.php";
-require_once "Auth/OpenID/TrustRoot.php";
-require_once "Auth/OpenID/ServerRequest.php";
-require_once "Auth/OpenID/Message.php";
-require_once "Auth/OpenID/Nonce.php";
-
define('AUTH_OPENID_HTTP_OK', 200);
define('AUTH_OPENID_HTTP_REDIRECT', 302);
define('AUTH_OPENID_HTTP_ERROR', 400);
Modified: trunk/vendor_extra/pear/Auth/OpenID/ServerRequest.php
===================================================================
--- trunk/vendor_extra/pear/Auth/OpenID/ServerRequest.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/vendor_extra/pear/Auth/OpenID/ServerRequest.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -15,11 +15,6 @@
*/
/**
- * Imports
- */
-require_once "Auth/OpenID.php";
-
-/**
* Object that holds the state of a request to the OpenID server
*
* With accessor functions to get at the internal request data.
Modified: trunk/vendor_extra/pear/Auth/OpenID/TrustRoot.php
===================================================================
--- trunk/vendor_extra/pear/Auth/OpenID/TrustRoot.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/vendor_extra/pear/Auth/OpenID/TrustRoot.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -12,8 +12,6 @@
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache
*/
-require_once 'Auth/OpenID/Discover.php';
-
/**
* A regular expression that matches a domain ending in a top-level domains.
* Used in checking trust roots for sanity.
Modified: trunk/vendor_extra/pear/Auth/OpenID/URINorm.php
===================================================================
--- trunk/vendor_extra/pear/Auth/OpenID/URINorm.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/vendor_extra/pear/Auth/OpenID/URINorm.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -9,8 +9,6 @@
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache
*/
-require_once 'Auth/Yadis/Misc.php';
-
// from appendix B of rfc 3986 (http://www.ietf.org/rfc/rfc3986.txt)
function Auth_OpenID_getURIPattern()
{
Modified: trunk/vendor_extra/pear/Auth/OpenID.php
===================================================================
--- trunk/vendor_extra/pear/Auth/OpenID.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/vendor_extra/pear/Auth/OpenID.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -22,13 +22,6 @@
*/
define('Auth_OpenID_VERSION', '2.2.2');
-/**
- * Require the fetcher code.
- */
-require_once "Auth/Yadis/PlainHTTPFetcher.php";
-require_once "Auth/Yadis/ParanoidHTTPFetcher.php";
-require_once "Auth/OpenID/BigMath.php";
-require_once "Auth/OpenID/URINorm.php";
/**
* Status code returned by the server when the only option is to show
Modified: trunk/vendor_extra/pear/Auth/Yadis/HTTPFetcher.php
===================================================================
--- trunk/vendor_extra/pear/Auth/Yadis/HTTPFetcher.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/vendor_extra/pear/Auth/Yadis/HTTPFetcher.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -13,10 +13,6 @@
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache
*/
-/**
- * Require logging functionality
- */
-require_once "Auth/OpenID.php";
define('Auth_OpenID_FETCHER_MAX_RESPONSE_KB', 1024);
define('Auth_OpenID_USER_AGENT',
Modified: trunk/vendor_extra/pear/Auth/Yadis/ParanoidHTTPFetcher.php
===================================================================
--- trunk/vendor_extra/pear/Auth/Yadis/ParanoidHTTPFetcher.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/vendor_extra/pear/Auth/Yadis/ParanoidHTTPFetcher.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -13,13 +13,7 @@
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache
*/
-/**
- * Interface import
- */
-require_once "Auth/Yadis/HTTPFetcher.php";
-require_once "Auth/OpenID.php";
-
/**
* A paranoid {@link Auth_Yadis_HTTPFetcher} class which uses CURL
* for fetching.
Modified: trunk/vendor_extra/pear/Auth/Yadis/PlainHTTPFetcher.php
===================================================================
--- trunk/vendor_extra/pear/Auth/Yadis/PlainHTTPFetcher.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/vendor_extra/pear/Auth/Yadis/PlainHTTPFetcher.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -14,10 +14,6 @@
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache
*/
-/**
- * Interface import
- */
-require_once "Auth/Yadis/HTTPFetcher.php";
/**
* This class implements a plain, hand-built socket-based fetcher
Modified: trunk/vendor_extra/pear/Auth/Yadis/XRDS.php
===================================================================
--- trunk/vendor_extra/pear/Auth/Yadis/XRDS.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/vendor_extra/pear/Auth/Yadis/XRDS.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -14,11 +14,6 @@
*/
/**
- * Require the XPath implementation.
- */
-require_once 'Auth/Yadis/XML.php';
-
-/**
* This match mode means a given service must match ALL filters passed
* to the Auth_Yadis_XRDS::services() call.
*/
Modified: trunk/vendor_extra/pear/Auth/Yadis/XRI.php
===================================================================
--- trunk/vendor_extra/pear/Auth/Yadis/XRI.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/vendor_extra/pear/Auth/Yadis/XRI.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -9,10 +9,6 @@
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache
*/
-require_once 'Auth/Yadis/Misc.php';
-require_once 'Auth/Yadis/Yadis.php';
-require_once 'Auth/OpenID.php';
-
function Auth_Yadis_getDefaultProxy()
{
return 'http://xri.net/';
Modified: trunk/vendor_extra/pear/Auth/Yadis/XRIRes.php
===================================================================
--- trunk/vendor_extra/pear/Auth/Yadis/XRIRes.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/vendor_extra/pear/Auth/Yadis/XRIRes.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -4,9 +4,6 @@
* Code for using a proxy XRI resolver.
*/
-require_once 'Auth/Yadis/XRDS.php';
-require_once 'Auth/Yadis/XRI.php';
-
class Auth_Yadis_ProxyResolver {
function Auth_Yadis_ProxyResolver($fetcher, $proxy_url = null)
{
Modified: trunk/vendor_extra/pear/Auth/Yadis/Yadis.php
===================================================================
--- trunk/vendor_extra/pear/Auth/Yadis/Yadis.php 2013-10-31 16:32:20 UTC (rev 48272)
+++ trunk/vendor_extra/pear/Auth/Yadis/Yadis.php 2013-10-31 16:58:45 UTC (rev 48273)
@@ -14,23 +14,6 @@
*/
/**
- * Need both fetcher types so we can use the right one based on the
- * presence or absence of CURL.
- */
-require_once "Auth/Yadis/PlainHTTPFetcher.php";
-require_once "Auth/Yadis/ParanoidHTTPFetcher.php";
-
-/**
- * Need this for parsing HTML (looking for META tags).
- */
-require_once "Auth/Yadis/ParseHTML.php";
-
-/**
- * Need this to parse the XRDS document during Yadis discovery.
- */
-require_once "Auth/Yadis/XRDS.php";
-
-/**
* XRDS (yadis) content type
*/
define('Auth_Yadis_CONTENT_TYPE', 'application/xrds+xml');
Modified: trunk/vendor_extra/pear/DB/dbase.php
===================================================================
--- trunk/vendor_extra/pear/DB/dbase.php 2013-10-31 16:32:20 UTC...
[truncated message content] |