Index: /trunk/devel/run =================================================================== --- /trunk/devel/run (revision 1052) +++ /trunk/devel/run (revision 1053) @@ -198,8 +198,8 @@ ;; dc) - exec ./php-cli -c devel.ini ./mod_disassembler/bin/phpdc.phpr "${args[@]}" | tee decompiled.php + exec ./php-cli -c devel.ini ./bin/phpdc.phpr "${args[@]}" | tee decompiled.php ;; dop) - exec ./php-cli -c devel.ini ./mod_disassembler/bin/phpdop.phpr "${args[@]}" + exec ./php-cli -c devel.ini ./bin/phpdop.phpr "${args[@]}" ;; retest) Index: /trunk/htdocs/cacher/cacher-en.lang.php =================================================================== --- /trunk/htdocs/cacher/cacher-en.lang.php (revision 1053) +++ /trunk/htdocs/cacher/cacher-en.lang.php (revision 1053) @@ -0,0 +1,81 @@ + 'Cache|', + 'cache.slots' + => 'Slots|Number of hash slots. the setting from your php.ini', + 'cache.size' + => 'Size|Cache Size, Size of the cache (or cache chunk), in bytes', + 'cache.avail' + => 'Avail|Available Memory, free memory in bytes of this cache', + 'cache.used' + => 'Used|Used Memory, used memory in bytes of this cache', + 'cache.blocksgraph' + => 'Percent Graph|Shows how much memory available in percent, and memory blocks status in graph', + 'cache.operations' + => 'Operations|Press the clear button to clean this cache', + 'cache.compiling' + => 'Comp.|Compiling flag, "yes" if the cache is busy compiling php script', + 'cache.hits' + => 'Hits|Cache Hits, hit=a var/php is loaded from this cache', + 'cache.hits_avg_h' + => 'Hits/H|Average Hits per Hour. Only last 24 hours is logged', + 'cache.hits_graph' + => 'Hits*24H|Hits graph of last 24 hours', + 'cache.hits_avg_s' + => 'Hits/S|Average Hits per Second. Only last 5 seconds is logged', + 'cache.updates' + => 'Updates|Cache Updates', + 'cache.clogs' + => 'Clogs|Compiling Clogs, clog=compiling is needed but avoided to wait(be blocked) when the cache is busy compiling already', + 'cache.ooms' + => 'OOMs|Out Of Memory, how many times a new item should be stored but there isn\'t enough memory in the cache, think of increasing the xcache.size or xcache.var_size', + 'cache.errors' + => 'Errs|Compiler errors, how many times your script is compiled but failed. You should really check what is happening if you see this value increase. (See Help for more information)', + 'cache.readonly_protected' + => 'Protected|Whether readonly_protection is available and enable on this cache (See help for more information)', + 'cache.cached' + => 'Cached|Number of entries stored in this cache', + 'cache.deleted' + => 'Deleted|Number of entries is pending in delete list (expired but referenced)', + 'cache.gc_timer' + => 'GC|Seconds count down of Garbage Collection', + 'entry.id' + => 'Id|', + 'entry.name' + => 'Entry name|The entry name or filename', + 'entry.hits' + => 'Hits|Times this entry is hit (loaded from this cache)', + 'entry.size' + => 'Size|Size in bytes of this entry in the cache', + 'entry.refcount' + => 'Refs|Reference count of this entry is holded by a php request', + 'entry.phprefcount' + => 'Shares|Count of entry sharing this php data', + 'entry.file_size' + => 'Src Size|Size of the source file', + 'entry.file_mtime' + => 'Modified|Last modified time of the source file', + 'entry.file_device' + => 'dev|device number of the source file', + 'entry.file_inode' + => 'ino|inode number of the source file', + 'entry.class_cnt' + => 'Cls.|Count of classes', + 'entry.function_cnt' + => 'Funcs|Count of functions', + 'entry.hash' + => 'Hash|Hash value of this entry', + 'entry.atime' + => 'Access|Last time when this entry is accessed', + 'entry.ctime' + => 'Create|The time when this entry is stored', + 'entry.delete' + => 'Delete|The time when this entry is deleted', + 'entry.remove' + => 'Remove|', +); + Index: /trunk/htdocs/cacher/cacher-zh-simplified.lang.php =================================================================== --- /trunk/htdocs/cacher/cacher-zh-simplified.lang.php (revision 1053) +++ /trunk/htdocs/cacher/cacher-zh-simplified.lang.php (revision 1053) @@ -0,0 +1,131 @@ + 'XCache 帮助信息', + 'Help' + => '帮助', + 'Clear' + => '清除', + 'Sure to clear?' + => '确认要清除吗?', + '% Free' + => '% 剩余', + '% Used' + => '% 已用', + 'Hits' + => '命中', + 'Modify' + => '修改', + 'See also' + => '建议参考', + 'Legends:' + => '图例:', + 'Used Blocks' + => '已用块', + 'Free Blocks' + => '未用块', + 'Total' + => '总共', + 'Caches' + => '缓存区', + 'php Cached' + => '缓存的 php 脚本', + 'php Deleted' + => '待删 php 缓存', + 'var Cached' + => '缓存的变量', + 'var Deleted' + => '待删变量', + 'Statistics' + => '统计信息', + 'List PHP' + => '列出PHP', + 'List Var Data' + => '列变量数据', + 'XCache %s Administration' + => 'XCache %s 管理页面', + 'Module Info' + => '模块信息', + 'Remove Selected' + => '删除所选', + 'Editing Variable %s' + => '正在编辑变量 %s', + 'Set %s in config to enable' + => '请在配置文件中设置 %s 启用本功能', + 'cache.cache' + => '缓存|', + 'cache.slots' + => '槽|Hash 槽个数, 对应 php.ini 里的设置', + 'cache.size' + => '大小|共享内存区大小, 单位: 字节', + 'cache.avail' + => '剩余|可用内存, 对应共享内存区的剩余内存字节数', + 'cache.used' + => '已用|已用内存, 对应共享内存区的已用内存字节数', + 'cache.blocksgraph' + => '百分比图|条状显示可用内存的比例, 以及显示分配块状态', + 'cache.operations' + => '操作|点击按钮清除对应共享内存区的数据', + 'cache.compiling' + => '编译中|编译标记, 当共享内存区正在编译 php 脚本时标记为 "yes"', + 'cache.hits' + => '命中|共享内存命中次数, 命中=从该共享内存载入php或者变量', + 'cache.hits_avg_h' + => '命中/H|每小时命中次数. 只统计最后 24 小时', + 'cache.hits_graph' + => '24H 分布|24 小时命中分布图. 图表现是最后 24 小时的命中次数', + 'cache.hits_avg_s' + => '命中/S|每秒命中次数. 只统计最后 5 秒', + 'cache.updates' + => '更新|共享内存更新次数', + 'cache.clogs' + => '阻塞|编译阻塞跳过, 阻塞=当需该共享内存区负责编译时, 其他进程/现成无法访问此共享内存. 跳过=XCache 自动判断阻塞的共享内存区自动跳过阻塞等待, 直接使用非共享内存方式继续处理请求', + 'cache.ooms' + => '内存不足|内存不足次数, 显示需要存储新数据但是共享内存区内存不足的次数. 如果出现太频繁请考虑加大配置中的 xcache.size 或者 xcache.var_size', + 'cache.errors' + => '错误|编译错误, 显示您的脚本被编译时出错的次数. 如果您发现这个数字不断增长, 您应该检查什么脚本产生错误. 参考 帮助 获取更多信息', + 'cache.readonly_protected' + => '保护|显示该 Cache 是否支持并启用 readonly_protection. 参考 帮助 获取更多信息', + 'cache.cached' + => '缓存|共享内存于该共享内存区的项目条数', + 'cache.deleted' + => '待删|共享内存区内将要删除的项目 (已经删除但是还被某些进程占用)', + 'cache.gc_timer' + => 'GC|垃圾回收的倒计时', + 'entry.id' + => 'Id|', + 'entry.name' + => '项目名/文件名|项目名或者文件名', + 'entry.hits' + => '命中|该项目被命中的次数 (从共享内存区载入)', + 'entry.size' + => '大小|项目在共享内存里占用字节数', + 'entry.refcount' + => '引用数|项目依然被其他进程占据的引用次数', + 'entry.phprefcount' + => '共享数|与本项目相同 PHP 代码的个数', + 'entry.file_size' + => '源大小|源文件大小', + 'entry.file_mtime' + => '修改|源文件最后修改时间', + 'entry.file_device' + => 'dev|源文件所在设备ID', + 'entry.file_inode' + => 'ino|源文件的 inode', + 'entry.class_cnt' + => '类|类个数', + 'entry.function_cnt' + => '函数|函数个数', + 'entry.hash' + => '哈希|该项目的哈希值', + 'entry.atime' + => '访问|最后访问该项目的时间', + 'entry.ctime' + => '创建|该项目被创建于共享内的时间', + 'entry.delete' + => '删除|该项目被决定删除的时间', + 'entry.remove' + => '删除|', +); + Index: /trunk/htdocs/cacher/cacher-zh-traditional.lang.php =================================================================== --- /trunk/htdocs/cacher/cacher-zh-traditional.lang.php (revision 1053) +++ /trunk/htdocs/cacher/cacher-zh-traditional.lang.php (revision 1053) @@ -0,0 +1,131 @@ + 'XCache 說明訊息', + 'Help' + => '說明', + 'Clear' + => '清除', + 'Sure to clear?' + => '確認要清除嗎?', + '% Free' + => '% 剩余', + '% Used' + => '% 已用', + 'Hits' + => '命中', + 'Modify' + => '修改', + 'See also' + => '建議參考', + 'Legends:' + => '图例:', + 'Used Blocks' + => '已用块', + 'Free Blocks' + => '未用块', + 'Total' + => '总共', + 'Caches' + => '快取', + 'php Cached' + => '快取的 php 指令', + 'php Deleted' + => '待刪 php 指令', + 'var Cached' + => '快取的變數', + 'var Deleted' + => '待刪變數', + 'Statistics' + => '統計訊息', + 'List PHP' + => '列出PHP', + 'List Var Data' + => '列變數資料', + 'XCache %s Administration' + => 'XCache %s 管理頁面', + 'Module Info' + => '組元訊息', + 'Remove Selected' + => '移除所选', + 'Editing Variable %s' + => '正在编辑变量 %s', + 'Set %s in config to enable' + => '請在配置文件中設置 %s 啟用本功能', + 'cache.cache' + => '快取|', + 'cache.slots' + => '槽|Hash 槽個數，對應 php.ini 裡的設置', + 'cache.size' + => '大小|共享記憶體區大小，單位：位元', + 'cache.avail' + => '剩餘|可用記憶體，對應共享記憶體區的剩餘記憶體位元數', + 'cache.used' + => '已用|已用内存, 对应共享内存区的已用内存字节数', + 'cache.blocksgraph' + => '百分比图|條狀顯示可用記憶體的比例', + 'cache.operations' + => '操作按鈕|點擊按鈕清除對應共享記憶體區的資料', + 'cache.compiling' + => '編譯中|編譯標記，當共享記憶體區正在編譯 php 指令時標記為 "yes"', + 'cache.hits' + => '命中|共享記憶體命中次數，命中=從該共享記憶體載入php或者變數', + 'cache.hits_avg_h' + => '命中/H|每小时命中次数. 只统计最后 24 小时', + 'cache.hits_graph' + => '24H 分布|24 小时命中分布图. 图表现是最后 24 小时的命中次数', + 'cache.hits_avg_s' + => '命中/S|每秒命中次数. 只统计最后 5 秒', + 'cache.updates' + => '更新|共享記憶更新過次數', + 'cache.clogs' + => '阻塞|編譯阻塞跳過，阻塞=當需該共享記憶體區負責編譯時，其他程序/現成無法存取此共享記憶體. 跳過=XCache 自動判斷阻塞的共享記憶體區自動跳過阻塞等待，直接使用非共享記憶體方式繼續處理請求', + 'cache.ooms' + => '記憶體不足|記憶體不足次數，顯示需要儲存新資料但是共享記憶體區記憶體不足的次數. 如果出現太頻繁請考慮加大配置中的 xcache.size 或者 xcache.var_size', + 'cache.errors' + => '错误|编译错误, 显示您的脚本被编译时出错的次数. 如果您发现这个数字不断增长, 您应该检查什么脚本产生错误. 参考 說明', + 'cache.readonly_protected' + => 'Protected|顯示該 Cache 是否支援並啟用 readonly_protection. 参考 說明', + 'cache.cached' + => '快取|共享記憶體於該共享記憶體區的項目個數', + 'cache.deleted' + => '待刪|共享記憶體區內將要刪除的項目 (已經刪除但是還被某些程序佔用)', + 'cache.gc_timer' + => 'GC|垃圾回收的倒數計時', + 'entry.id' + => 'Id|', + 'entry.name' + => '項目名稱/檔案名稱|項目名稱或者檔案名稱', + 'entry.hits' + => '命中|該項目被命中的次數 (從共享記憶體區載入)', + 'entry.size' + => '大小|項目在共享記憶體裡佔用位元數', + 'entry.refcount' + => '引用數|項目依然被其他程序佔用的引用次數', + 'entry.phprefcount' + => '共享|與本項目相同 PHP 內容的个數', + 'entry.file_size' + => '源大小|原始檔案大小', + 'entry.file_mtime' + => '修改|原始檔案最後修改時間', + 'entry.file_device' + => 'dev|原始檔案所在設備ID', + 'entry.file_inode' + => 'ino|原始檔案的inode', + 'entry.class_cnt' + => '类|类个数', + 'entry.function_cnt' + => '函数|函数个数', + 'entry.hash' + => 'Hash|Hash', + 'entry.atime' + => '存取|最後存取該項目的時間', + 'entry.ctime' + => '建立|該項目被建立於共享內的時間', + 'entry.delete' + => '移除|該項目被移除於共享內的時間', + 'entry.remove' + => '移除|', +); + Index: /trunk/htdocs/cacher/cacher.css =================================================================== --- /trunk/htdocs/cacher/cacher.css (revision 1053) +++ /trunk/htdocs/cacher/cacher.css (revision 1053) @@ -0,0 +1,35 @@ +td, th { white-space: pre; } +.phpinfo table { border: 1px solid black; margin-bottom: 1px; } +.phpinfo table th, .phpinfo table td { border: 1px solid black; } +.phpinfo table th { font-weight: bold; } +.phpinfo .e {background-color: #ccccff; font-weight: bold; color: #000000;} +.phpinfo .h {background-color: #9999cc; font-weight: bold; color: #000000;} +.phpinfo .v {background-color: #cccccc; color: #000000;} +.button { } +span.sortarrow { color: white; text-decoration: none; } +form {margin: 0; padding: 0} + +.percent { height: 3px; margin-bottom: 1px; border: 1px solid gray; } +.percent div { float: left; height: 100%; } +.pvalue { background: limegreen; } + +.blocksgraph { height: 16px; } +.blocksgraph div { float: left; height: 3px; width: 4px; border: solid gray; border-width: 0 0px 1px 0; } +.blocksgraph { border: 1px solid gray; border-bottom: 0px; } + +.hitsgraph { height: 20px; margin: auto; } +.hitsgraph div { float: left; width: 2px; height: 100%; } +.hitsgraph div:hover { background: gray; } +.hitsgraph div div { float: none; width: 100%; } +.hitsgraph div div.barf { border: 0px solid gray; border-width: 1px 0 0 0; } +.hitsgraph div div.barv { border: 0px solid gray; border-width: 0 0 1px 0; } +.hitsgraph div div.barf.active { border-color: yellow; } +.hitsgraph div div.barv.active { border-color: yellow; } + +#help { display: block; float: right; } +dl { overflow: hidden; } +dt { font-weight: bold; clear: both; float: left; width: 100px; text-align: right; margin: 0; } +dd { margin: 0; } +.blockarea { overflow: hidden; _width: 1px; } +div.legend { float: left; border: 1px solid gray; font: 12px/12px monospace; } +div.legendtitle { float: left; padding: 2px; padding-right: 10px; font: 12px/12px monospace; } Index: /trunk/htdocs/cacher/cacher.php =================================================================== --- /trunk/htdocs/cacher/cacher.php (revision 1053) +++ /trunk/htdocs/cacher/cacher.php (revision 1053) @@ -0,0 +1,308 @@ + $v) { + if ($config['percent_graph_type'] != 'free') { + $v = 1 - $v; + } + $v = (int) ($v * $c); + $r = $g = $c - $v; + $b = $c; + $html[] = '
'; + } + return implode('', $html); +} + +function calc_total(&$total, $data) +{ + foreach ($data as $k => $v) { + switch ($k) { + case 'type': + case 'cache_name': + case 'cacheid': + case 'free_blocks': + continue 2; + } + if (!isset($total[$k])) { + $total[$k] = $v; + } + else { + switch ($k) { + case 'hits_by_hour': + case 'hits_by_second': + foreach ($data[$k] as $kk => $vv) { + $total[$k][$kk] += $vv; + } + break; + + default: + $total[$k] += $v; + } + } + } +} + +function array_avg($a) +{ + if (count($a) == 0) { + return ''; + } + return array_sum($a) / count($a); +} + +function bar_hits_percent($v, $percent, $active) +{ + $r = 220 + (int) ($percent * 25); + $g = $b = 220 - (int) ($percent * 220); + $percent = (int) ($percent * 100); + $a = $active ? ' active' : ''; + return '
' + . '
' + . '
' + . '
'; +} + +function hits_to_graph($hits) +{ + $max = 0; + foreach ($hits as $v) { + if ($max < $v) { + $max = $v; + } + } + if (!$max) { + return ''; + } + $t = (time() / (60 * 60)) % 24; + $html = array(); + foreach ($hits as $i => $v) { + $html[] = bar_hits_percent($v, $v / $max, $i == $t); + } + return implode('', $html); +} + +$module = "cacher"; +if (!extension_loaded('XCache')) { + include("../common/header.tpl.php"); + echo '

XCache is not loaded

'; + ob_start(); + phpinfo(INFO_GENERAL); + $info = ob_get_clean(); + if (preg_match_all("![^<]*]*>[^<]*(?:Configuration|ini|Server API)[^<]*[^<]*]*>[^<]*[^<]*!s", $info, $m)) { + echo '
'; + echo 'PHP Info'; + echo ''; + echo implode('', $m[0]); + echo '
'; + echo '
'; + } + if (preg_match('!(.*?\\.ini)!', $info, $m)) { + echo "Please check $m[1]"; + } + else if (preg_match('!Configuration File \\(php.ini\\) Path *([^<]+)!', $info, $m)) { + echo "Please put a php.ini in $m[1] and load XCache extension"; + } + else { + echo "You don't even have a php.ini yet?"; + } + echo "(See above)"; + include("../common/footer.tpl.php"); + exit; +} +$pcnt = xcache_count(XC_TYPE_PHP); +$vcnt = xcache_count(XC_TYPE_VAR); + +if ($_SERVER['REQUEST_METHOD'] == 'POST') { + $remove = @ $_POST['remove']; + if ($remove && is_array($remove)) { + foreach ($remove as $name) { + xcache_unset($name); + } + } +} + +$moduleinfo = null; +$type_none = -1; +if (!isset($_GET['type'])) { + $_GET['type'] = $type_none; +} +$_GET['type'] = $type = (int) $_GET['type']; + +// {{{ process clear +function processClear() +{ + $type = isset($_POST['type']) ? $_POST['type'] : null; + if ($type != XC_TYPE_PHP && $type != XC_TYPE_VAR) { + $type = null; + } + if (isset($type)) { + $cacheid = (int) (isset($_POST['cacheid']) ? $_POST['cacheid'] : 0); + if (isset($_POST['clearcache'])) { + $count = xcache_count($type); + if ($cacheid >= 0) { + for ($cacheid = 0; $cacheid < $count; $cacheid ++) { + xcache_clear_cache($type, $cacheid); + } + } + else { + xcache_clear_cache($type); + } + } + } +} +processClear(); +// }}} +// {{{ load info/list +$cacheinfos = array(); +$total = array(); +for ($i = 0; $i < $pcnt; $i ++) { + $data = xcache_info(XC_TYPE_PHP, $i); + if ($type === XC_TYPE_PHP) { + $data += xcache_list(XC_TYPE_PHP, $i); + } + $data['type'] = XC_TYPE_PHP; + $data['cache_name'] = "php#$i"; + $data['cacheid'] = $i; + $cacheinfos[] = $data; + if ($pcnt >= 2) { + calc_total($total, $data); + } +} + +if ($pcnt >= 2) { + $total['type'] = XC_TYPE_PHP; + $total['cache_name'] = _('Total'); + $total['cacheid'] = -1; + $total['gc'] = null; + $total['istotal'] = true; + $cacheinfos[] = $total; +} + +$total = array(); +for ($i = 0; $i < $vcnt; $i ++) { + $data = xcache_info(XC_TYPE_VAR, $i); + if ($type === XC_TYPE_VAR) { + $data += xcache_list(XC_TYPE_VAR, $i); + } + $data['type'] = XC_TYPE_VAR; + $data['cache_name'] = "var#$i"; + $data['cacheid'] = $i; + $cacheinfos[] = $data; + if ($vcnt >= 2) { + calc_total($total, $data); + } +} + +if ($vcnt >= 2) { + $total['type'] = XC_TYPE_VAR; + $total['cache_name'] = _('Total'); + $total['cacheid'] = -1; + $total['gc'] = null; + $total['istotal'] = true; + $cacheinfos[] = $total; +} +// }}} +// {{{ merge the list +switch ($type) { +case XC_TYPE_PHP: +case XC_TYPE_VAR: + $cachelist = array('type' => $type, 'cache_list' => array(), 'deleted_list' => array()); + if ($type == XC_TYPE_VAR) { + $cachelist['type_name'] = 'var'; + } + else { + $cachelist['type_name'] = 'php'; + } + foreach ($cacheinfos as $i => $c) { + if (!empty($c['istotal'])) { + continue; + } + if ($c['type'] == $type && isset($c['cache_list'])) { + foreach ($c['cache_list'] as $e) { + $e['cache_name'] = $c['cache_name']; + $cachelist['cache_list'][] = $e; + } + foreach ($c['deleted_list'] as $e) { + $e['cache_name'] = $c['cache_name']; + $cachelist['deleted_list'][] = $e; + } + } + } + if ($type == XC_TYPE_PHP) { + $inodes = array(); + $haveinode = false; + foreach ($cachelist['cache_list'] as $e) { + if (isset($e['file_inode'])) { + $haveinode = true; + break; + } + } + if (!$haveinode) { + foreach ($cachelist['deleted_list'] as $e) { + if (isset($e['file_inode'])) { + $haveinode = true; + break; + } + } + } + } + unset($data); + break; + +default: + $_GET['type'] = $type_none; + $cachelist = array(); + ob_start(); + phpinfo(INFO_MODULES); + $moduleinfo = ob_get_clean(); + if (preg_match_all('!(XCache[^<>]*)(.*?)

!is', $moduleinfo, $m)) { + $moduleinfo = array(); + foreach ($m[1] as $i => $dummy) { + $moduleinfo[] = '

' . trim($m[1][$i]) . '

'; + $moduleinfo[] = str_replace('
', '', trim($m[2][$i])); + } + $moduleinfo = implode('', $moduleinfo); + } + else { + $moduleinfo = null; + } + break; +} +// }}} + +$type_php = XC_TYPE_PHP; +$type_var = XC_TYPE_VAR; +$listTypes = array($type_none => _('Statistics'), $type_php => _('List PHP'), $type_var => _('List Var Data')); + +include("cacher.tpl.php"); + +?> Index: /trunk/htdocs/cacher/cacher.tpl.php =================================================================== --- /trunk/htdocs/cacher/cacher.tpl.php (revision 1053) +++ /trunk/htdocs/cacher/cacher.tpl.php (revision 1053) @@ -0,0 +1,303 @@ + +
+
+ » +
+ + + + + + + + + + + + + + + + + + + + + + next(); ?>> + + + $ci) { + echo " + next(), ">"; + $pvalue = (int) ($ci['avail'] / $ci['size'] * 100); + $pempty = 100 - $pvalue; + if ($config['percent_graph_type'] == 'used') { + // swap + $tmp = $pvalue; + $pvalue = $pempty; + $pempty = $tmp; + } + + $w = $config['percent_graph_width']; + if (empty($ci['istotal'])) { + $graph = freeblock_to_graph($ci['free_blocks'], $ci['size']); + $blocksgraph = "
{$graph}
"; + } + else { + $blocksgraph = ''; + } + + $ci_slots = size($ci['slots']); + $ci_size = size($ci['size']); + $ci_avail = size($ci['avail']); + $ci = number_formats($ci, $numkeys); + + $hits_avg_h = number_format(array_avg($ci['hits_by_hour']), 2); + $hits_avg_s = number_format(array_avg($ci['hits_by_second']), 2); + $hits_graph_h = hits_to_graph($ci['hits_by_hour']); + $hits_graph_h_w = count($ci['hits_by_hour']) * 2; + + if (!empty($ci['istotal'])) { + $ci['compiling'] = '-'; + $ci['can_readonly'] = '-'; + } + else { + $ci['compiling'] = $ci['type'] == $type_php ? ($ci['compiling'] ? 'yes' : 'no') : '-'; + $ci['can_readonly'] = $ci['can_readonly'] ? 'yes' : 'no'; + } + echo <<{$ci['cache_name']} + + + + + + + + + + + + + + + + + + +EOS; + + $b->reset(); + ?> + + +
{$ci_slots}{$ci_size}{$ci_avail}
{$blocksgraph}
{$ci['compiling']}{$ci['hits']}
{$hits_graph_h}
{$hits_avg_h}{$hits_avg_s}{$ci['updates']}{$ci['clogs']}{$ci['ooms']}{$ci['errors']}{$ci['can_readonly']}{$ci['cached']}{$ci['deleted']}{$ci['gc']}
+
+
+
  
+
+
  
+
+
  
+
+
+ $cachelist['cache_list'], 'Deleted' => $cachelist['deleted_list']) as $listname => $entries) { + $a->reset(); + ?> + +
+ + + next(), ">"; + ?> + + + + $entry) { + echo " + next(), ">"; + $name = htmlspecialchars($entry['name']); + $hits = number_format($entry['hits']); + $size = size($entry['size']); + if ($isphp) { + $class_cnt = number_format($entry['class_cnt']); + $function_cnt = number_format($entry['function_cnt']); + $phprefcount = number_format($entry['phprefcount']); + $file_size = size($entry['file_size']); + } + + if ($isphp) { + $file_mtime = age($entry['file_mtime']); + } + $ctime = age($entry['ctime']); + $atime = age($entry['atime']); + if ($listname == 'Deleted') { + $dtime = age($entry['dtime']); + } + + if ($isphp) { + $namelink = $name; + echo <<{$entry['cache_name']} {$i} +ENTRY; + } + else { + echo << +ENTRY; + $uname = urlencode($entry['name']); + $namelink = "$name"; + } + + echo <<{$namelink} + + +ENTRY; + if ($isphp) { + $refcount = number_format($entry['refcount']); + echo <<{$entry['refcount']} + + + + + +ENTRY; + if (isset($entry['file_inode'])) { + echo <<{$entry['file_device']} + +ENTRY; + } + } + echo <<{$entry['hvalue']} + + +ENTRY; + if ($listname == 'Deleted') { + echo <<{$dtime} +ENTRY; + } + + echo " + + "; + } + ?> + +
{$entry['hits']}{$size}{$phprefcount}{$class_cnt}{$function_cnt}{$file_size}{$file_mtime}{$entry['file_inode']}{$atime}{$ctime}
+ + "> + +
+$t_moduleinfo +
$moduleinfo
+HTML; +} +?> + Index: unk/htdocs/cacher/common-en.lang.php =================================================================== --- /trunk/htdocs/cacher/common-en.lang.php (revision 1052) +++ (revision ) @@ -1,81 +1,0 @@ - 'Cache|', - 'cache.slots' - => 'Slots|Number of hash slots. the setting from your php.ini', - 'cache.size' - => 'Size|Cache Size, Size of the cache (or cache chunk), in bytes', - 'cache.avail' - => 'Avail|Available Memory, free memory in bytes of this cache', - 'cache.used' - => 'Used|Used Memory, used memory in bytes of this cache', - 'cache.blocksgraph' - => 'Percent Graph|Shows how much memory available in percent, and memory blocks status in graph', - 'cache.operations' - => 'Operations|Press the clear button to clean this cache', - 'cache.compiling' - => 'Comp.|Compiling flag, "yes" if the cache is busy compiling php script', - 'cache.hits' - => 'Hits|Cache Hits, hit=a var/php is loaded from this cache', - 'cache.hits_avg_h' - => 'Hits/H|Average Hits per Hour. Only last 24 hours is logged', - 'cache.hits_graph' - => 'Hits*24H|Hits graph of last 24 hours', - 'cache.hits_avg_s' - => 'Hits/S|Average Hits per Second. Only last 5 seconds is logged', - 'cache.updates' - => 'Updates|Cache Updates', - 'cache.clogs' - => 'Clogs|Compiling Clogs, clog=compiling is needed but avoided to wait(be blocked) when the cache is busy compiling already', - 'cache.ooms' - => 'OOMs|Out Of Memory, how many times a new item should be stored but there isn\'t enough memory in the cache, think of increasing the xcache.size or xcache.var_size', - 'cache.errors' - => 'Errs|Compiler errors, how many times your script is compiled but failed. You should really check what is happening if you see this value increase. (See Help for more information)', - 'cache.readonly_protected' - => 'Protected|Whether readonly_protection is available and enable on this cache (See help for more information)', - 'cache.cached' - => 'Cached|Number of entries stored in this cache', - 'cache.deleted' - => 'Deleted|Number of entries is pending in delete list (expired but referenced)', - 'cache.gc_timer' - => 'GC|Seconds count down of Garbage Collection', - 'entry.id' - => 'Id|', - 'entry.name' - => 'Entry name|The entry name or filename', - 'entry.hits' - => 'Hits|Times this entry is hit (loaded from this cache)', - 'entry.size' - => 'Size|Size in bytes of this entry in the cache', - 'entry.refcount' - => 'Refs|Reference count of this entry is holded by a php request', - 'entry.phprefcount' - => 'Shares|Count of entry sharing this php data', - 'entry.file_size' - => 'Src Size|Size of the source file', - 'entry.file_mtime' - => 'Modified|Last modified time of the source file', - 'entry.file_device' - => 'dev|device number of the source file', - 'entry.file_inode' - => 'ino|inode number of the source file', - 'entry.class_cnt' - => 'Cls.|Count of classes', - 'entry.function_cnt' - => 'Funcs|Count of functions', - 'entry.hash' - => 'Hash|Hash value of this entry', - 'entry.atime' - => 'Access|Last time when this entry is accessed', - 'entry.ctime' - => 'Create|The time when this entry is stored', - 'entry.delete' - => 'Delete|The time when this entry is deleted', - 'entry.remove' - => 'Remove|', -); - Index: unk/htdocs/cacher/common-zh-simplified-utf-8.lang.php =================================================================== --- /trunk/htdocs/cacher/common-zh-simplified-utf-8.lang.php (revision 1052) +++ (revision ) @@ -1,131 +1,0 @@ - 'XCache 帮助信息', - 'Help' - => '帮助', - 'Clear' - => '清除', - 'Sure to clear?' - => '确认要清除吗?', - '% Free' - => '% 剩余', - '% Used' - => '% 已用', - 'Hits' - => '命中', - 'Modify' - => '修改', - 'See also' - => '建议参考', - 'Legends:' - => '图例:', - 'Used Blocks' - => '已用块', - 'Free Blocks' - => '未用块', - 'Total' - => '总共', - 'Caches' - => '缓存区', - 'php Cached' - => '缓存的 php 脚本', - 'php Deleted' - => '待删 php 缓存', - 'var Cached' - => '缓存的变量', - 'var Deleted' - => '待删变量', - 'Statistics' - => '统计信息', - 'List PHP' - => '列出PHP', - 'List Var Data' - => '列变量数据', - 'XCache %s Administration' - => 'XCache %s 管理页面', - 'Module Info' - => '模块信息', - 'Remove Selected' - => '删除所选', - 'Editing Variable %s' - => '正在编辑变量 %s', - 'Set %s in config to enable' - => '请在配置文件中设置 %s 启用本功能', - 'cache.cache' - => '缓存|', - 'cache.slots' - => '槽|Hash 槽个数, 对应 php.ini 里的设置', - 'cache.size' - => '大小|共享内存区大小, 单位: 字节', - 'cache.avail' - => '剩余|可用内存, 对应共享内存区的剩余内存字节数', - 'cache.used' - => '已用|已用内存, 对应共享内存区的已用内存字节数', - 'cache.blocksgraph' - => '百分比图|条状显示可用内存的比例, 以及显示分配块状态', - 'cache.operations' - => '操作|点击按钮清除对应共享内存区的数据', - 'cache.compiling' - => '编译中|编译标记, 当共享内存区正在编译 php 脚本时标记为 "yes"', - 'cache.hits' - => '命中|共享内存命中次数, 命中=从该共享内存载入php或者变量', - 'cache.hits_avg_h' - => '命中/H|每小时命中次数. 只统计最后 24 小时', - 'cache.hits_graph' - => '24H 分布|24 小时命中分布图. 图表现是最后 24 小时的命中次数', - 'cache.hits_avg_s' - => '命中/S|每秒命中次数. 只统计最后 5 秒', - 'cache.updates' - => '更新|共享内存更新次数', - 'cache.clogs' - => '阻塞|编译阻塞跳过, 阻塞=当需该共享内存区负责编译时, 其他进程/现成无法访问此共享内存. 跳过=XCache 自动判断阻塞的共享内存区自动跳过阻塞等待, 直接使用非共享内存方式继续处理请求', - 'cache.ooms' - => '内存不足|内存不足次数, 显示需要存储新数据但是共享内存区内存不足的次数. 如果出现太频繁请考虑加大配置中的 xcache.size 或者 xcache.var_size', - 'cache.errors' - => '错误|编译错误, 显示您的脚本被编译时出错的次数. 如果您发现这个数字不断增长, 您应该检查什么脚本产生错误. 参考 帮助 获取更多信息', - 'cache.readonly_protected' - => '保护|显示该 Cache 是否支持并启用 readonly_protection. 参考 帮助 获取更多信息', - 'cache.cached' - => '缓存|共享内存于该共享内存区的项目条数', - 'cache.deleted' - => '待删|共享内存区内将要删除的项目 (已经删除但是还被某些进程占用)', - 'cache.gc_timer' - => 'GC|垃圾回收的倒计时', - 'entry.id' - => 'Id|', - 'entry.name' - => '项目名/文件名|项目名或者文件名', - 'entry.hits' - => '命中|该项目被命中的次数 (从共享内存区载入)', - 'entry.size' - => '大小|项目在共享内存里占用字节数', - 'entry.refcount' - => '引用数|项目依然被其他进程占据的引用次数', - 'entry.phprefcount' - => '共享数|与本项目相同 PHP 代码的个数', - 'entry.file_size' - => '源大小|源文件大小', - 'entry.file_mtime' - => '修改|源文件最后修改时间', - 'entry.file_device' - => 'dev|源文件所在设备ID', - 'entry.file_inode' - => 'ino|源文件的 inode', - 'entry.class_cnt' - => '类|类个数', - 'entry.function_cnt' - => '函数|函数个数', - 'entry.hash' - => '哈希|该项目的哈希值', - 'entry.atime' - => '访问|最后访问该项目的时间', - 'entry.ctime' - => '创建|该项目被创建于共享内的时间', - 'entry.delete' - => '删除|该项目被决定删除的时间', - 'entry.remove' - => '删除|', -); - Index: unk/htdocs/cacher/common-zh-traditional-utf-8.lang.php =================================================================== --- /trunk/htdocs/cacher/common-zh-traditional-utf-8.lang.php (revision 1052) +++ (revision ) @@ -1,131 +1,0 @@ - 'XCache 說明訊息', - 'Help' - => '說明', - 'Clear' - => '清除', - 'Sure to clear?' - => '確認要清除嗎?', - '% Free' - => '% 剩余', - '% Used' - => '% 已用', - 'Hits' - => '命中', - 'Modify' - => '修改', - 'See also' - => '建議參考', - 'Legends:' - => '图例:', - 'Used Blocks' - => '已用块', - 'Free Blocks' - => '未用块', - 'Total' - => '总共', - 'Caches' - => '快取', - 'php Cached' - => '快取的 php 指令', - 'php Deleted' - => '待刪 php 指令', - 'var Cached' - => '快取的變數', - 'var Deleted' - => '待刪變數', - 'Statistics' - => '統計訊息', - 'List PHP' - => '列出PHP', - 'List Var Data' - => '列變數資料', - 'XCache %s Administration' - => 'XCache %s 管理頁面', - 'Module Info' - => '組元訊息', - 'Remove Selected' - => '移除所选', - 'Editing Variable %s' - => '正在编辑变量 %s', - 'Set %s in config to enable' - => '請在配置文件中設置 %s 啟用本功能', - 'cache.cache' - => '快取|', - 'cache.slots' - => '槽|Hash 槽個數，對應 php.ini 裡的設置', - 'cache.size' - => '大小|共享記憶體區大小，單位：位元', - 'cache.avail' - => '剩餘|可用記憶體，對應共享記憶體區的剩餘記憶體位元數', - 'cache.used' - => '已用|已用内存, 对应共享内存区的已用内存字节数', - 'cache.blocksgraph' - => '百分比图|條狀顯示可用記憶體的比例', - 'cache.operations' - => '操作按鈕|點擊按鈕清除對應共享記憶體區的資料', - 'cache.compiling' - => '編譯中|編譯標記，當共享記憶體區正在編譯 php 指令時標記為 "yes"', - 'cache.hits' - => '命中|共享記憶體命中次數，命中=從該共享記憶體載入php或者變數', - 'cache.hits_avg_h' - => '命中/H|每小时命中次数. 只统计最后 24 小时', - 'cache.hits_graph' - => '24H 分布|24 小时命中分布图. 图表现是最后 24 小时的命中次数', - 'cache.hits_avg_s' - => '命中/S|每秒命中次数. 只统计最后 5 秒', - 'cache.updates' - => '更新|共享記憶更新過次數', - 'cache.clogs' - => '阻塞|編譯阻塞跳過，阻塞=當需該共享記憶體區負責編譯時，其他程序/現成無法存取此共享記憶體. 跳過=XCache 自動判斷阻塞的共享記憶體區自動跳過阻塞等待，直接使用非共享記憶體方式繼續處理請求', - 'cache.ooms' - => '記憶體不足|記憶體不足次數，顯示需要儲存新資料但是共享記憶體區記憶體不足的次數. 如果出現太頻繁請考慮加大配置中的 xcache.size 或者 xcache.var_size', - 'cache.errors' - => '错误|编译错误, 显示您的脚本被编译时出错的次数. 如果您发现这个数字不断增长, 您应该检查什么脚本产生错误. 参考 說明', - 'cache.readonly_protected' - => 'Protected|顯示該 Cache 是否支援並啟用 readonly_protection. 参考 說明', - 'cache.cached' - => '快取|共享記憶體於該共享記憶體區的項目個數', - 'cache.deleted' - => '待刪|共享記憶體區內將要刪除的項目 (已經刪除但是還被某些程序佔用)', - 'cache.gc_timer' - => 'GC|垃圾回收的倒數計時', - 'entry.id' - => 'Id|', - 'entry.name' - => '項目名稱/檔案名稱|項目名稱或者檔案名稱', - 'entry.hits' - => '命中|該項目被命中的次數 (從共享記憶體區載入)', - 'entry.size' - => '大小|項目在共享記憶體裡佔用位元數', - 'entry.refcount' - => '引用數|項目依然被其他程序佔用的引用次數', - 'entry.phprefcount' - => '共享|與本項目相同 PHP 內容的个數', - 'entry.file_size' - => '源大小|原始檔案大小', - 'entry.file_mtime' - => '修改|原始檔案最後修改時間', - 'entry.file_device' - => 'dev|原始檔案所在設備ID', - 'entry.file_inode' - => 'ino|原始檔案的inode', - 'entry.class_cnt' - => '类|类个数', - 'entry.function_cnt' - => '函数|函数个数', - 'entry.hash' - => 'Hash|Hash', - 'entry.atime' - => '存取|最後存取該項目的時間', - 'entry.ctime' - => '建立|該項目被建立於共享內的時間', - 'entry.delete' - => '移除|該項目被移除於共享內的時間', - 'entry.remove' - => '移除|', -); - Index: unk/htdocs/cacher/common.php =================================================================== --- /trunk/htdocs/cacher/common.php (revision 1052) +++ (revision ) @@ -1,152 +1,0 @@ - 'zh-simplified', - 'zh-hk' => 'zh-traditional', - 'zh-tw' => 'zh-traditional', - ); - static $smap = array( - 'gbk' => 'gb2312', - 'gb18030' => 'gb2312', - ); - - if (isset($lmap[$l])) { - $l = $lmap[$l]; - } - $file = "$name-$l-$s.lang.php"; - if (xcache_validateFileName($file) && file_exists($file)) { - return $file; - } - if (isset($smap[$s])) { - $s = $smap[$s]; - $file = "$name-$l-$s.lang.php"; - if (xcache_validateFileName($file) && file_exists($file)) { - return $file; - } - } - $file = "$name-$l.lang.php"; - if (xcache_validateFileName($file) && file_exists($file)) { - return $file; - } - return null; -} - -function get_language_file($name) -{ - global $config; - $s = strtolower($config['charset']); - if (!empty($config['lang'])) { - $l = strtolower($config['lang']); - $file = get_language_file_ex($name, $l, $s); - if (!isset($file)) { - $l = strtok($l, ':-'); - $file = get_language_file_ex($name, $l, $s); - } - } - else if (!empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) { - foreach (explode(',', str_replace(' ', '', $_SERVER['HTTP_ACCEPT_LANGUAGE'])) as $l) { - $l = strtok($l, ':;'); - $file = get_language_file_ex($name, $l, $s); - if (isset($file)) { - $config['lang'] = $l; - break; - } - if (strpos($l, '-') !== false) { - $ll = strtok($l, ':-'); - $file = get_language_file_ex($name, $ll, $s); - if (isset($file)) { - $config['lang'] = $l; - break; - } - } - } - } - return isset($file) ? $file : "$name-en.lang.php"; -} - -function _($str) -{ - if (isset($GLOBALS['strings'][$str])) { - return $GLOBALS['strings'][$str]; - } - if (!empty($GLOBALS['config']['show_todo_strings'])) { - return '' . htmlspecialchars($str) . '|'; - } - return $str; -} - -function __($str) -{ - return _($str); -} - -function N_($str) -{ - return $str; -} - -function stripaddslashes_array($value, $mqs = false) -{ - if (is_array($value)) { - foreach($value as $k => $v) { - $value[$k] = stripaddslashes_array($v, $mqs); - } - } - else if(is_string($value)) { - $value = $mqs ? str_replace('\'\'', '\'', $value) : stripslashes($value); - } - return $value; -} - -function ob_filter_path_nicer_default($list_html) -{ - $sep = DIRECTORY_SEPARATOR; - $docRoot = $_SERVER['DOCUMENT_ROOT']; - if ($sep != '/') { - $docRoot = str_replace('/', $sep, $docRoot); - } - $list_html = str_replace(">$docRoot", ">{DOCROOT}" . (substr($docRoot, -1) == $sep ? $sep : ""), $list_html); - $xcachedir = realpath(dirname(__FILE__) . "$sep..$sep"); - $list_html = str_replace(">$xcachedir$sep", ">{XCache}$sep", $list_html); - if ($sep == '/') { - $list_html = str_replace(">/home/", ">{H}/", $list_html); - } - return $list_html; -} - - -error_reporting(E_ALL); -ini_set('display_errors', 'On'); -define('REQUEST_TIME', time()); - -if (function_exists('get_magic_quotes_gpc') && @get_magic_quotes_gpc()) { - $mqs = (bool) ini_get('magic_quotes_sybase'); - $_GET = stripaddslashes_array($_GET, $mqs); - $_POST = stripaddslashes_array($_POST, $mqs); - $_REQUEST = stripaddslashes_array($_REQUEST, $mqs); - unset($mqs); -} -ini_set('magic_quotes_runtime', '0'); - -$config = array(); -include("./config.default.php"); -if (file_exists("./config.php")) { - include("./config.php"); -} - -include(get_language_file("common")); -if (empty($config['lang'])) { - $config['lang'] = 'en-us'; -} - -header("Cache-Control: no-cache, must-revalidate"); -header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); - -?> Index: /trunk/htdocs/cacher/config.default.php =================================================================== --- /trunk/htdocs/cacher/config.default.php (revision 1052) +++ /trunk/htdocs/cacher/config.default.php (revision 1053) @@ -1,15 +1,8 @@ Index: /trunk/htdocs/cacher/config.example.php =================================================================== --- /trunk/htdocs/cacher/config.example.php (revision 1052) +++ /trunk/htdocs/cacher/config.example.php (revision 1053) @@ -1,16 +1,13 @@ Index: /trunk/htdocs/cacher/edit.php =================================================================== --- /trunk/htdocs/cacher/edit.php (revision 1052) +++ /trunk/htdocs/cacher/edit.php (revision 1053) @@ -37,7 +37,5 @@ } -$php_version = phpversion(); -$xcache_version = XCACHE_VERSION; -$xcache_modules = XCACHE_MODULES; +$module = "cacher"; include("edit.tpl.php"); Index: /trunk/htdocs/cacher/edit.tpl.php =================================================================== --- /trunk/htdocs/cacher/edit.tpl.php (revision 1052) +++ /trunk/htdocs/cacher/edit.tpl.php (revision 1053) @@ -1,3 +1,3 @@ - + - + Index: unk/htdocs/cacher/footer.tpl.php =================================================================== --- /trunk/htdocs/cacher/footer.tpl.php (revision 1052) +++ (revision ) @@ -1,9 +1,0 @@ -
- -
- - - Index: unk/htdocs/cacher/header.tpl.php =================================================================== --- /trunk/htdocs/cacher/header.tpl.php (revision 1052) +++ (revision ) @@ -1,17 +1,0 @@ - - - - - - -HEAD; -?> - - - <?php echo sprintf(_("XCache %s Administration"), $xcache_version); ?> - - - -

Index: unk/htdocs/cacher/help-zh-simplified-utf-8.lang.php =================================================================== --- /trunk/htdocs/cacher/help-zh-simplified-utf-8.lang.php (revision 1052) +++ (revision ) @@ -1,4 +1,0 @@ -
-
编译错误:
ini.error-log and ini.display-errors
-
只读保护:
ReadonlyProtection
-
Index: /trunk/htdocs/cacher/help-zh-simplified.lang.php =================================================================== --- /trunk/htdocs/cacher/help-zh-simplified.lang.php (revision 1053) +++ /trunk/htdocs/cacher/help-zh-simplified.lang.php (revision 1053) @@ -0,0 +1,4 @@ +
+
编译错误:
ini.error-log and ini.display-errors
+
只读保护:
ReadonlyProtection
+
Index: unk/htdocs/cacher/help-zh-traditional-utf-8.lang.php =================================================================== --- /trunk/htdocs/cacher/help-zh-traditional-utf-8.lang.php (revision 1052) +++ (revision ) @@ -1,4 +1,0 @@ -
-
编译错误:
ini.error-log and ini.display-errors
-
只读保护:
ReadonlyProtection
-
Index: /trunk/htdocs/cacher/help-zh-traditional.lang.php =================================================================== --- /trunk/htdocs/cacher/help-zh-traditional.lang.php (revision 1053) +++ /trunk/htdocs/cacher/help-zh-traditional.lang.php (revision 1053) @@ -0,0 +1,4 @@ +
+
编译错误:
ini.error-log and ini.display-errors
+
只读保护:
ReadonlyProtection
+
Index: /trunk/htdocs/cacher/index.php =================================================================== --- /trunk/htdocs/cacher/index.php (revision 1052) +++ /trunk/htdocs/cacher/index.php (revision 1053) @@ -1,3 +1,3 @@ values = func_get_args(); - $this->i = -1; - $this->count = count($this->values); - } - - function next() - { - $this->i = ($this->i + 1) % $this->count; - return $this->values[$this->i]; - } - - function cur() - { - return $this->values[$this->i]; - } - - function reset() - { - $this->i = -1; - } -} - -function number_formats($a, $keys) -{ - foreach ($keys as $k) { - $a[$k] = number_format($a[$k]); - } - return $a; -} - -function size($size) -{ - $size = (int) $size; - if ($size < 1024) - return number_format($size, 2) . ' b'; - - if ($size < 1048576) - return number_format($size / 1024, 2) . ' K'; - - return number_format($size / 1048576, 2) . ' M'; -} - -function age($time) -{ - if (!$time) return ''; - $delta = REQUEST_TIME - $time; - - if ($delta < 0) { - $delta = -$delta; - } - - static $seconds = array(1, 60, 3600, 86400, 604800, 2678400, 31536000); - static $name = array('s', 'm', 'h', 'd', 'w', 'M', 'Y'); - - for ($i = 6; $i >= 0; $i --) { - if ($delta >= $seconds[$i]) { - $ret = (int) ($delta / $seconds[$i]); - return $ret . ' ' . $name[$i]; - } - } - - return '0 s'; -} - -function freeblock_to_graph($freeblocks, $size) -{ - global $config; - - // cached in static variable - static $graph_initial; - if (!isset($graph_initial)) { - $graph_initial = array_fill(0, $config['percent_graph_width'], 0); - } - $graph = $graph_initial; - foreach ($freeblocks as $b) { - $begin = $b['offset'] / $size * $config['percent_graph_width']; - $end = ($b['offset'] + $b['size']) / $size * $config['percent_graph_width']; - - if ((int) $begin == (int) $end) { - $v = $end - $begin; - $graph[(int) $v] += $v - (int) $v; - } - else { - $graph[(int) $begin] += 1 - ($begin - (int) $begin); - $graph[(int) $end] += $end - (int) $end; - for ($i = (int) $begin + 1, $e = (int) $end; $i < $e; $i ++) { - $graph[$i] += 1; - } - } - } - $html = array(); - $c = 255; - foreach ($graph as $k => $v) { - if ($config['percent_graph_type'] != 'free') { - $v = 1 - $v; - } - $v = (int) ($v * $c); - $r = $g = $c - $v; - $b = $c; - $html[] = '
'; - } - return implode('', $html); -} - -function calc_total(&$total, $data) -{ - foreach ($data as $k => $v) { - switch ($k) { - case 'type': - case 'cache_name': - case 'cacheid': - case 'free_blocks': - continue 2; - } - if (!isset($total[$k])) { - $total[$k] = $v; - } - else { - switch ($k) { - case 'hits_by_hour': - case 'hits_by_second': - foreach ($data[$k] as $kk => $vv) { - $total[$k][$kk] += $vv; - } - break; - - default: - $total[$k] += $v; - } - } - } -} - -function array_avg($a) -{ - if (count($a) == 0) { - return ''; - } - return array_sum($a) / count($a); -} - -function bar_hits_percent($v, $percent, $active) -{ - $r = 220 + (int) ($percent * 25); - $g = $b = 220 - (int) ($percent * 220); - $percent = (int) ($percent * 100); - $a = $active ? ' active' : ''; - return '
' - . '
' - . '
' - . '
'; -} - -function hits_to_graph($hits) -{ - $max = 0; - foreach ($hits as $v) { - if ($max < $v) { - $max = $v; - } - } - if (!$max) { - return ''; - } - $t = (time() / (60 * 60)) % 24; - $html = array(); - foreach ($hits as $i => $v) { - $html[] = bar_hits_percent($v, $v / $max, $i == $t); - } - return implode('', $html); -} - -function switcher($name, $options) -{ - $n = isset($_GET[$name]) ? $_GET[$name] : null; - $html = array(); - foreach ($options as $k => $v) { - $html[] = sprintf('%s', $name, $k, $k == $n ? ' class="active"' : '', $v); - } - return implode('', $html); -} - -function th($name, $attrs = null) -{ - $translated = __($name); - if ($translated == $name) { - $translated = "$name|$name"; - } - list($text, $title) = explode('|', $translated, 2); - return sprintf('%s%s%s' - , "\t" - , $attrs ? " $attrs" : "" - , $name, htmlspecialchars(trim($title)), trim($text) - , "\n"); -} - -$php_version = phpversion(); -$xcache_version = XCACHE_VERSION; -$xcache_modules = XCACHE_MODULES; - -if (!extension_loaded('XCache')) { - include("header.tpl.php"); - echo '

XCache is not loaded

'; - ob_start(); - phpinfo(INFO_GENERAL); - $info = ob_get_clean(); - if (preg_match_all("![^<]*]*>[^<]*(?:Configuration|ini|Server API)[^<]*[^<]*]*>[^<]*[^<]*!s", $info, $m)) { - echo '
'; - echo 'PHP Info'; - echo ''; - echo implode('', $m[0]); - echo '
'; - echo '
'; - } - if (preg_match('!(.*?\\.ini)!', $info, $m)) { - echo "Please check $m[1]"; - } - else if (preg_match('!Configuration File \\(php.ini\\) Path *([^<]+)!', $info, $m)) { - echo "Please put a php.ini in $m[1] and load XCache extension"; - } - else { - echo "You don't even have a php.ini yet?"; - } - echo "(See above)"; - include("footer.tpl.php"); - exit; -} -$pcnt = xcache_count(XC_TYPE_PHP); -$vcnt = xcache_count(XC_TYPE_VAR); - -if ($_SERVER['REQUEST_METHOD'] == 'POST') { - $remove = @ $_POST['remove']; - if ($remove && is_array($remove)) { - foreach ($remove as $name) { - xcache_unset($name); - } - } -} - -$moduleinfo = null; -$type_none = -1; -if (!isset($_GET['type'])) { - $_GET['type'] = $type_none; -} -$_GET['type'] = $type = (int) $_GET['type']; - -// {{{ process clear -function processClear() -{ - $type = isset($_POST['type']) ? $_POST['type'] : null; - if ($type != XC_TYPE_PHP && $type != XC_TYPE_VAR) { - $type = null; - } - if (isset($type)) { - $cacheid = (int) (isset($_POST['cacheid']) ? $_POST['cacheid'] : 0); - if (isset($_POST['clearcache'])) { - $count = xcache_count($type); - if ($cacheid >= 0) { - for ($cacheid = 0; $cacheid < $count; $cacheid ++) { - xcache_clear_cache($type, $cacheid); - } - } - else { - xcache_clear_cache($type); - } - } - } -} -processClear(); -// }}} -// {{{ load info/list -$cacheinfos = array(); -$total = array(); -for ($i = 0; $i < $pcnt; $i ++) { - $data = xcache_info(XC_TYPE_PHP, $i); - if ($type === XC_TYPE_PHP) { - $data += xcache_list(XC_TYPE_PHP, $i); - } - $data['type'] = XC_TYPE_PHP; - $data['cache_name'] = "php#$i"; - $data['cacheid'] = $i; - $cacheinfos[] = $data; - if ($pcnt >= 2) { - calc_total($total, $data); - } -} - -if ($pcnt >= 2) { - $total['type'] = XC_TYPE_PHP; - $total['cache_name'] = _('Total'); - $total['cacheid'] = -1; - $total['gc'] = null; - $total['istotal'] = true; - $cacheinfos[] = $total; -} - -$total = array(); -for ($i = 0; $i < $vcnt; $i ++) { - $data = xcache_info(XC_TYPE_VAR, $i); - if ($type === XC_TYPE_VAR) { - $data += xcache_list(XC_TYPE_VAR, $i); - } - $data['type'] = XC_TYPE_VAR; - $data['cache_name'] = "var#$i"; - $data['cacheid'] = $i; - $cacheinfos[] = $data; - if ($vcnt >= 2) { - calc_total($total, $data); - } -} - -if ($vcnt >= 2) { - $total['type'] = XC_TYPE_VAR; - $total['cache_name'] = _('Total'); - $total['cacheid'] = -1; - $total['gc'] = null; - $total['istotal'] = true; - $cacheinfos[] = $total; -} -// }}} -// {{{ merge the list -switch ($type) { -case XC_TYPE_PHP: -case XC_TYPE_VAR: - $cachelist = array('type' => $type, 'cache_list' => array(), 'deleted_list' => array()); - if ($type == XC_TYPE_VAR) { - $cachelist['type_name'] = 'var'; - } - else { - $cachelist['type_name'] = 'php'; - } - foreach ($cacheinfos as $i => $c) { - if (!empty($c['istotal'])) { - continue; - } - if ($c['type'] == $type && isset($c['cache_list'])) { - foreach ($c['cache_list'] as $e) { - $e['cache_name'] = $c['cache_name']; - $cachelist['cache_list'][] = $e; - } - foreach ($c['deleted_list'] as $e) { - $e['cache_name'] = $c['cache_name']; - $cachelist['deleted_list'][] = $e; - } - } - } - if ($type == XC_TYPE_PHP) { - $inodes = array(); - $haveinode = false; - foreach ($cachelist['cache_list'] as $e) { - if (isset($e['file_inode'])) { - $haveinode = true; - break; - } - } - if (!$haveinode) { - foreach ($cachelist['deleted_list'] as $e) { - if (isset($e['file_inode'])) { - $haveinode = true; - break; - } - } - } - } - unset($data); - break; - -default: - $_GET['type'] = $type_none; - $cachelist = array(); - ob_start(); - phpinfo(INFO_MODULES); - $moduleinfo = ob_get_clean(); - if (preg_match_all('!(XCache[^<>]*)(.*?)

!is', $moduleinfo, $m)) { - $moduleinfo = array(); - foreach ($m[1] as $i => $dummy) { - $moduleinfo[] = '

' . trim($m[1][$i]) . '

'; - $moduleinfo[] = str_replace('
', '', trim($m[2][$i])); - } - $moduleinfo = implode('', $moduleinfo); - } - else { - $moduleinfo = null; - } - break; -} -// }}} - -$type_php = XC_TYPE_PHP; -$type_var = XC_TYPE_VAR; -$types = array($type_none => _('Statistics'), $type_php => _('List PHP'), $type_var => _('List Var Data')); - -include("xcache.tpl.php"); - -?> Index: unk/htdocs/cacher/xcache.tpl.php =================================================================== --- /trunk/htdocs/cacher/xcache.tpl.php (revision 1052) +++ (revision ) @@ -1,301 +1,0 @@ - -
- » -
-
- - - - - - - - - - - - - - - - - - - - - - next(); ?>> - - - $ci) { - echo " - next(), ">"; - $pvalue = (int) ($ci['avail'] / $ci['size'] * 100); - $pempty = 100 - $pvalue; - if ($config['percent_graph_type'] == 'used') { - // swap - $tmp = $pvalue; - $pvalue = $pempty; - $pempty = $tmp; - } - - $w = $config['percent_graph_width']; - if (empty($ci['istotal'])) { - $graph = freeblock_to_graph($ci['free_blocks'], $ci['size']); - $blocksgraph = "
{$graph}
"; - } - else { - $blocksgraph = ''; - } - - $ci_slots = size($ci['slots']); - $ci_size = size($ci['size']); - $ci_avail = size($ci['avail']); - $ci = number_formats($ci, $numkeys); - - $hits_avg_h = number_format(array_avg($ci['hits_by_hour']), 2); - $hits_avg_s = number_format(array_avg($ci['hits_by_second']), 2); - $hits_graph_h = hits_to_graph($ci['hits_by_hour']); - $hits_graph_h_w = count($ci['hits_by_hour']) * 2; - - if (!empty($ci['istotal'])) { - $ci['compiling'] = '-'; - $ci['can_readonly'] = '-'; - } - else { - $ci['compiling'] = $ci['type'] == $type_php ? ($ci['compiling'] ? 'yes' : 'no') : '-'; - $ci['can_readonly'] = $ci['can_readonly'] ? 'yes' : 'no'; - } - echo <<{$ci['cache_name']} - - - - - - - - - - - - - - - - - - -EOS; - - $b->reset(); - ?> - - -
{$ci_slots}{$ci_size}{$ci_avail}
{$blocksgraph}
{$ci['compiling']}{$ci['hits']}
{$hits_graph_h}
{$hits_avg_h}{$hits_avg_s}{$ci['updates']}{$ci['clogs']}{$ci['ooms']}{$ci['errors']}{$ci['can_readonly']}{$ci['cached']}{$ci['deleted']}{$ci['gc']}
-
-
-
  
-
-
  
-
-
  
-
-
- $cachelist['cache_list'], 'Deleted' => $cachelist['deleted_list']) as $listname => $entries) { - $a->reset(); - ?> - -
- - - next(), ">"; - ?> - - - - $entry) { - echo " - next(), ">"; - $name = htmlspecialchars($entry['name']); - $hits = number_format($entry['hits']); - $size = size($entry['size']); - $class_cnt = number_format($entry['class_cnt']); - $function_cnt = number_format($entry['function_cnt']); - if ($isphp) { - $phprefcount = number_format($entry['phprefcount']); - $file_size = size($entry['file_size']); - } - - if ($isphp) { - $file_mtime = age($entry['file_mtime']); - } - $ctime = age($entry['ctime']); - $atime = age($entry['atime']); - if ($listname == 'Deleted') { - $dtime = age($entry['dtime']); - } - - if (!$isphp) { - echo << -ENTRY; - $uname = urlencode($entry['name']); - $namelink = "$name"; - } - else { - $namelink = $name; - } - - echo <<{$entry['cache_name']} {$i} - - - -ENTRY; - if ($isphp) { - $refcount = number_format($entry['refcount']); - echo <<{$entry['refcount']} - - - - - -ENTRY; - if (isset($entry['file_inode'])) { - echo <<{$entry['file_device']} - -ENTRY; - } - } - echo <<{$entry['hvalue']} - - -ENTRY; - if ($listname == 'Deleted') { - echo <<{$dtime} -ENTRY; - } - - echo " - - "; - } - ?> - -
{$namelink}{$entry['hits']}{$size}{$phprefcount}{$class_cnt}{$function_cnt}{$file_size}{$file_mtime}{$entry['file_inode']}{$atime}{$ctime}
- - "> - -
-$t_moduleinfo -
$moduleinfo
-HTML; -} -?> - Index: /trunk/htdocs/common/common-en.lang.php =================================================================== --- /trunk/htdocs/common/common-en.lang.php (revision 1053) +++ /trunk/htdocs/common/common-en.lang.php (revision 1053) @@ -0,0 +1,4 @@ +values = func_get_args(); + $this->i = -1; + $this->count = count($this->values); + } + + function next() + { + $this->i = ($this->i + 1) % $this->count; + return $this->values[$this->i]; + } + + function cur() + { + return $this->values[$this->i]; + } + + function reset() + { + $this->i = -1; + } +} + +function switcher($name, $options) +{ + $n = isset($_GET[$name]) ? $_GET[$name] : null; + $html = array(); + foreach ($options as $k => $v) { + $html[] = sprintf('%s', $name, $k, $k == $n ? ' class="active"' : '', $v); + } + return implode('', $html); +} + +function moduleswitcher() +{ + global $module, $modules; + $html = array(); + foreach ($modules as $k => $v) { + $html[] = sprintf('%s', $k, $k == $module ? ' class="active"' : '', $v); + } + return implode('', $html); +} + +function th($name, $attrs = null) +{ + $translated = __($name); + if ($translated == $name) { + $translated = "$name|$name"; + } + list($text, $title) = explode('|', $translated, 2); + return sprintf('%s%s%s' + , "\t" + , $attrs ? " $attrs" : "" + , $name, htmlspecialchars(trim($title)), trim($text) + , "\n"); +} + +function xcache_validateFileName($name) +{ + return preg_match('!^[a-zA-Z0-9._-]+$!', $name); +} + +function get_language_file_ex($name, $lang) +{ + static $langMap = array( + 'zh' => 'zh-simplified', + 'zh-hk' => 'zh-traditional', + 'zh-tw' => 'zh-traditional', + ); + + if (isset($langMap[$lang])) { + $lang = $langMap[$lang]; + } + $file = "$name-$lang.lang.php"; + if (xcache_validateFileName($file) && file_exists($file)) { + return $file; + } + return null; +} + +function get_language_file($name) +{ + global $config; + if (!empty($config['lang'])) { + $lang = strtolower($config['lang']); + $file = get_language_file_ex($name, $lang); + if (!isset($file)) { + $lang = strtok($lang, ':-'); + $file = get_language_file_ex($name, $lang); + } + } + else if (!empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) { + foreach (explode(',', str_replace(' ', '', $_SERVER['HTTP_ACCEPT_LANGUAGE'])) as $lang) { + $lang = strtok($lang, ':;'); + $file = get_language_file_ex($name, $lang); + if (isset($file)) { + $config['lang'] = $lang; + break; + } + if (strpos($lang, '-') !== false) { + $file = get_language_file_ex($name, strtok($lang, ':-')); + if (isset($file)) { + $config['lang'] = $lang; + break; + } + } + } + } + return isset($file) ? $file : "$name-en.lang.php"; +} + +function _($str) +{ + if (isset($GLOBALS['strings'][$str])) { + return $GLOBALS['strings'][$str]; + } + if (!empty($GLOBALS['config']['show_todo_strings'])) { + return '' . htmlspecialchars($str) . '|'; + } + return $str; +} + +function __($str) +{ + return _($str); +} + +function N_($str) +{ + return $str; +} + +function number_formats($a, $keys) +{ + foreach ($keys as $k) { + $a[$k] = number_format($a[$k]); + } + return $a; +} + +function size($size) +{ + $size = (int) $size; + if ($size < 1024) + return number_format($size, 2) . ' b'; + + if ($size < 1048576) + return number_format($size / 1024, 2) . ' K'; + + return number_format($size / 1048576, 2) . ' M'; +} + +function age($time) +{ + if (!$time) return ''; + $delta = REQUEST_TIME - $time; + + if ($delta < 0) { + $delta = -$delta; + } + + static $seconds = array(1, 60, 3600, 86400, 604800, 2678400, 31536000); + static $name = array('s', 'm', 'h', 'd', 'w', 'M', 'Y'); + + for ($i = 6; $i >= 0; $i --) { + if ($delta >= $seconds[$i]) { + $ret = (int) ($delta / $seconds[$i]); + return $ret . ' ' . $name[$i]; + } + } + + return '0 s'; +} + +function stripaddslashes_array($value, $mqs = false) +{ + if (is_array($value)) { + foreach($value as $k => $v) { + $value[$k] = stripaddslashes_array($v, $mqs); + } + } + else if(is_string($value)) { + $value = $mqs ? str_replace('\'\'', '\'', $value) : stripslashes($value); + } + return $value; +} + +function ob_filter_path_nicer_default($list_html) +{ + $sep = DIRECTORY_SEPARATOR; + $docRoot = $_SERVER['DOCUMENT_ROOT']; + if ($sep != '/') { + $docRoot = str_replace('/', $sep, $docRoot); + } + $list_html = str_replace(">$docRoot", ">{DOCROOT}" . (substr($docRoot, -1) == $sep ? $sep : ""), $list_html); + $xcachedir = realpath(dirname(__FILE__) . "$sep..$sep"); + $list_html = str_replace(">$xcachedir$sep", ">{XCache}$sep", $list_html); + if ($sep == '/') { + $list_html = str_replace(">/home/", ">{H}/", $list_html); + } + return $list_html; +} + +error_reporting(E_ALL); +ini_set('display_errors', 'On'); +define('REQUEST_TIME', time()); + +if (function_exists('get_magic_quotes_gpc') && @get_magic_quotes_gpc()) { + $mqs = (bool) ini_get('magic_quotes_sybase'); + $_GET = stripaddslashes_array($_GET, $mqs); + $_POST = stripaddslashes_array($_POST, $mqs); + $_REQUEST = stripaddslashes_array($_REQUEST, $mqs); + unset($mqs); +} +ini_set('magic_quotes_runtime', '0'); + +$config = array(); +if (file_exists("./config.default.php")) { + include("./config.default.php"); +} +include("../config.default.php"); +if (file_exists("../config.php")) { + include("../config.php"); +} +if (file_exists("./config.php")) { + include("./config.php"); +} + +include(get_language_file("common")); + +$modules = array(); +if (file_exists("../cacher/index.php")) { + $modules["cacher"] = _("Cacher"); +} +if (file_exists("../coverager/index.php")) { + $modules["coverager"] = _("Coverager"); +} +header("Cache-Control: no-cache, must-revalidate"); +header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); + +?> Index: /trunk/htdocs/common/footer.tpl.php =================================================================== --- /trunk/htdocs/common/footer.tpl.php (revision 1053) +++ /trunk/htdocs/common/footer.tpl.php (revision 1053) @@ -0,0 +1,13 @@ +
+PHP Powered By: XCache , + +
+ + + Index: /trunk/htdocs/common/header.tpl.php =================================================================== --- /trunk/htdocs/common/header.tpl.php (revision 1053) +++ /trunk/htdocs/common/header.tpl.php (revision 1053) @@ -0,0 +1,15 @@ + + + + + + + + + + <?php echo $title = sprintf("XCache %s", $xcache_version = defined('XCACHE_VERSION') ? XCACHE_VERSION : '') . " - " . ucfirst($GLOBALS['module']); ?> + + + +

+
Index: /trunk/htdocs/config.default.php =================================================================== --- /trunk/htdocs/config.default.php (revision 1053) +++ /trunk/htdocs/config.default.php (revision 1053) @@ -0,0 +1,17 @@ + Index: unk/htdocs/coverager/common-zh-simplified-gb2312.lang.php =================================================================== --- /trunk/htdocs/coverager/common-zh-simplified-gb2312.lang.php (revision 1052) +++ (revision ) @@ -1,25 +1,0 @@ - '¿ªÊ¼', - 'Directory' - => 'Ŀ¼', - 'File' - => 'Îļþ', - 'Percent' - => '¸²¸ÇÂÊ', - 'Hits' - => 'ÃüÖÐ', - 'Lines' - => 'ÐÐÊý', - 'TODO' - => 'ÏÐÖÃÎļþ', - 'XCache PHP Code Coverage Viewer' - => 'XCache PHP ´úÂ븲¸Ç²é¿´Æ÷', - 'module' - => 'Ä£¿é', - '' - => '', - ); - Index: unk/htdocs/coverager/common-zh-simplified-utf-8.lang.php =================================================================== --- /trunk/htdocs/coverager/common-zh-simplified-utf-8.lang.php (revision 1052) +++ (revision ) @@ -1,25 +1,0 @@ - '开始', - 'Directory' - => '目录', - 'File' - => '文件', - 'Percent' - => '覆盖率', - 'Hits' - => '命中', - 'Lines' - => '行数', - 'TODO' - => '闲置文件', - 'XCache PHP Code Coverage Viewer' - => 'XCache PHP 代码覆盖查看器', - 'module' - => '模块', - '' - => '', - ); - Index: /trunk/htdocs/coverager/common.php =================================================================== --- /trunk/htdocs/coverager/common.php (revision 1052) +++ /trunk/htdocs/coverager/common.php (revision 1053) @@ -1,112 +1,7 @@ 'zh-simplified', - 'zh-hk' => 'zh-traditional', - 'zh-tw' => 'zh-traditional', - ); - static $smap = array( - 'gbk' => 'gb2312', - 'gb18030' => 'gb2312', - ); +require_once "../common/common.php"; - if (isset($lmap[$l])) { - $l = $lmap[$l]; - } - if (file_exists($file = "$name-$l-$s.lang.php")) { - return $file; - } - if (isset($smap[$s])) { - $s = $smap[$s]; - if (file_exists($file = "$name-$l-$s.lang.php")) { - return $file; - } - } - if (file_exists($file = "$name-$l.lang.php")) { - return $file; - } - return null; -} +include(get_language_file("coverager")); +$module = "coverager"; -function get_language_file($name) -{ - global $charset, $lang; - $s = strtolower($charset); - if (isset($lang)) { - $l = strtolower($lang); - $file = get_language_file_ex($name, $l, $s); - if (!isset($file)) { - $l = strtok($l, '-'); - $file = get_language_file_ex($name, $l, $s); - } - } - else if (!empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) { - foreach (explode(',', str_replace(' ', '', $_SERVER['HTTP_ACCEPT_LANGUAGE'])) as $l) { - $l = strtok($l, ';'); - $file = get_language_file_ex($name, $l, $s); - if (isset($file)) { - $lang = $l; - break; - } - if (strpos($l, '-') !== false) { - $ll = strtok($l, '-'); - $file = get_language_file_ex($name, $ll, $s); - if (isset($file)) { - $lang = $l; - break; - } - } - } - } - return isset($file) ? $file : "$name-en.lang.php"; -} - -function _T($str) -{ - if (isset($GLOBALS['strings'][$str])) { - return $GLOBALS['strings'][$str]; - } - if (!empty($GLOBALS['show_todo_strings'])) { - return '' . htmlspecialchars($str) . ''; - } - return $str; -} - -function stripaddslashes_array($value, $mqs = false) -{ - if (is_array($value)) { - foreach($value as $k => $v) { - $value[$k] = stripaddslashes_array($v, $mqs); - } - } - else if(is_string($value)) { - $value = $mqs ? str_replace('\'\'', '\'', $value) : stripslashes($value); - } - return $value; -} - -error_reporting(E_ALL); -ini_set('display_errors', 'On'); -define('REQUEST_TIME', time()); - -if (get_magic_quotes_gpc()) { - $mqs = (bool) ini_get('magic_quotes_sybase'); - $_GET = stripaddslashes_array($_GET, $mqs); - $_POST = stripaddslashes_array($_POST, $mqs); - $_REQUEST = stripaddslashes_array($_REQUEST, $mqs); -} -ini_set('magic_quotes_runtime', '0'); - -$charset = "UTF-8"; -if (file_exists("./config.php")) { - include("./config.php"); -} - -include(get_language_file("common")); -if (!isset($lang)) { - $lang = 'en-us'; -} - -?> Index: /trunk/htdocs/coverager/config.example.php =================================================================== --- /trunk/htdocs/coverager/config.example.php (revision 1053) +++ /trunk/htdocs/coverager/config.example.php (revision 1053) @@ -0,0 +1,19 @@ + Index: /trunk/htdocs/coverager/coverager-en.lang.php =================================================================== --- /trunk/htdocs/coverager/coverager-en.lang.php (revision 1053) +++ /trunk/htdocs/coverager/coverager-en.lang.php (revision 1053) @@ -0,0 +1,5 @@ + Index: /trunk/htdocs/coverager/coverager-zh-simplified.lang.php =================================================================== --- /trunk/htdocs/coverager/coverager-zh-simplified.lang.php (revision 1053) +++ /trunk/htdocs/coverager/coverager-zh-simplified.lang.php (revision 1053) @@ -0,0 +1,25 @@ + '开始', + 'Directory' + => '目录', + 'File' + => '文件', + 'Percent' + => '覆盖率', + 'Hits' + => '命中', + 'Lines' + => '行数', + 'TODO' + => '闲置文件', + 'XCache PHP Code Coverage Viewer' + => 'XCache PHP 代码覆盖查看器', + 'module' + => '模块', + '' + => '', + ); + Index: /trunk/htdocs/coverager/coverager.css =================================================================== --- /trunk/htdocs/coverager/coverager.css (revision 1052) +++ /trunk/htdocs/coverager/coverager.css (revision 1053) @@ -1,14 +1,4 @@ -h1 { text-align: center; display: block; } -input, table { font-family: sans-serif; font-size: 11px; } -th { font-size: 12px; } -table { border-collapse: collapse; } table.center { margin-left: auto; margin-right: auto; } table\-center { text-align: center; } -table.cycles { border: 1px solid black; margin-top: 5px; margin-bottom: 5px; } -table.cycles .col1 { background-color: #f5f5f5; } -table.cycles .col2 { background-color: #e0e0e0; } -table.cycles th, table.cycles td { border: 1px solid black; font-family: monospace; } -table.cycles th { background-color: #9999cc; color: black; font-weight: bold; height: 20px; line-height: 20px; font-family: serif; } -th a { color: black; font-weight: bold; display: block; width: 100%; height: 100%; } .coverFile { @@ -68,4 +58,3 @@ } -.footnote { text-align: right; font-size: 12px; } .error { color: red; } Index: /trunk/htdocs/coverager/coverager.php =================================================================== --- /trunk/htdocs/coverager/coverager.php (revision 1052) +++ /trunk/htdocs/coverager/coverager.php (revision 1053) @@ -2,39 +2,9 @@ include("./common.php"); - -class Cycle -{ - var $values; - var $i; - var $count; - - function Cycle($v) - { - $this->values = func_get_args(); - $this->i = -1; - $this->count = count($this->values); - } - - function next() - { - $this->i = ($this->i + 1) % $this->count; - return $this->values[$this->i]; - } - - function cur() - { - return $this->values[$this->i]; - } - - function reset() - { - $this->i = -1; - } -} class XcacheCoverageViewer { - var $syntaxhiglight = true; - var $usecache = false; + var $syntax_higlight = true; + var $use_cache = false; var $include_paths = array(); var $exclude_paths = array(); @@ -50,8 +20,8 @@ $this->datadir = ini_get('xcache.coveragedump_directory'); - // copy config - foreach (array('charset', 'include_paths', 'exclude_paths', 'syntaxhiglight', 'usecache', 'datadir', 'lang') as $k) { - if (isset($GLOBALS[$k])) { - $this->{$k} = $GLOBALS[$k]; + global $config; + foreach (array('charset', 'include_paths', 'exclude_paths', 'syntax_higlight', 'use_cache', 'datadir', 'lang') as $k) { + if (isset($config[$k])) { + $this->{$k} = $config[$k]; } } @@ -79,5 +49,5 @@ $prefix_len = strlen($path) + 1; $dirinfo = $this->loadDir($this->outpath); - if (!$this->usecache) { + if (!$this->use_cache) { ksort($dirinfo['subdirs']); ksort($dirinfo['files']); @@ -104,5 +74,5 @@ } } - if ($this->syntaxhiglight) { + if ($this->syntax_higlight) { $source = implode('', $lines); ob_start(); @@ -130,5 +100,5 @@ else if (!$this->datadir) { $action = 'error'; - $error = 'require `ini:xcache.coveragedump_directory` or `config:$datadir` to be set'; + $error = 'require `xcache.coveragedump_directory` in ini or `$datadir` in config to be set'; } else { @@ -137,5 +107,5 @@ } - $xcache_version = defined('XCACHE_VERSION') ? XCACHE_VERSION : ''; + global $config; include("coverager.tpl.php"); } @@ -143,5 +113,5 @@ function loadDir($outdir, $addtodo = null) { - if ($this->usecache) { + if ($this->use_cache) { $cachefile = $outdir . "/.pcovcache"; if (file_exists($cachefile)) { @@ -210,5 +180,5 @@ } - if ($this->usecache) { + if ($this->use_cache) { ksort($subdirs); ksort($files); @@ -223,5 +193,5 @@ ); - if ($this->usecache) { + if ($this->use_cache) { $fp = fopen($cachefile, "wb"); fwrite($fp, serialize($info)); @@ -233,5 +203,5 @@ function loadFile($file) { - if ($this->usecache) { + if ($this->use_cache) { $cachefile = $file . "cache"; if (file_exists($cachefile)) { @@ -243,5 +213,5 @@ unset($info['cov']); - if ($this->usecache) { + if ($this->use_cache) { $fp = fopen($cachefile, "wb"); fwrite($fp, serialize($info)); Index: /trunk/htdocs/coverager/coverager.tpl.php =================================================================== --- /trunk/htdocs/coverager/coverager.tpl.php (revision 1052) +++ /trunk/htdocs/coverager/coverager.tpl.php (revision 1053) @@ -1,18 +1,3 @@ - - - -charset" /> - - -HEAD; -?> - - - <?php echo _T("XCache PHP Code Coverage Viewer"); ?> - - -

+ @@ -114,8 +99,8 @@ global $cycle; $cycle = new Cycle('class="col1"', 'class="col2"'); - $l_fil = _T("File"); - $l_per = _T("Percent"); - $l_hit = _T("Hits"); - $l_lns = _T("Lines"); + $l_fil = _("File"); + $l_per = _("Percent"); + $l_hit = _("Hits"); + $l_lns = _("Lines"); return << @@ -168,5 +153,5 @@ } -$l_root = _T("root"); +$l_root = _("root"); if ($action == 'dir') { if (function_exists('ob_filter_path_nicer')) { @@ -246,8 +231,4 @@ ?> -
-Powered By: XCache coverager -
- - - + +