Commit 2704d46f authored by changi67's avatar changi67

[MOD] Just remove <pre> and <die>. Better for release

parent 4259b156
......@@ -96,8 +96,6 @@ if ((!isset($_REQUEST["thumb"])) && (!isset($_REQUEST["nocount"]))) {
$type = $imagegallib->filetype;
//echo"<pre>";print_r(get_defined_vars());echo"</pre>";
// close the session for speedup
session_write_close();
......@@ -118,4 +116,3 @@ header ("Content-Disposition: inline; filename=\"" . $imagegallib->filename.'"')
//} else {
echo $imagegallib->image;
//}
// ????? echo $data;
......@@ -390,7 +390,6 @@ if (isset($_REQUEST['graph'])) {
$widthUser = 70 * $userContributions['nbCols'] + 100 + $legendWidth + $yTickWidth;
$widthGroup = 70 * count($groupContributions) + 100 + $legendWidth + $yTickWidth;
$space = 20;
//echo "$legendWidth _ $xUserTickWidth _ $xGroupTickWidth _ $yTickWidth _$widthWeek _ $widthTotal _ $widthUser _ $widthGroup";die;
if ($prefs['feature_jpgraph'] == 'y') {
require_once ('lib/jpgraph/src/jpgraph.php');
require_once ('lib/jpgraph/src/jpgraph_bar.php');
......@@ -428,7 +427,6 @@ if (isset($_REQUEST['graph'])) {
} else {
$title = sprintf(tra('%s Contributions: Addition') , $user);
}
//echo '<pre>XXX';print_r($userContributions);print_r($series); die;
if ($prefs['feature_jpgraph'] == 'y') {
$graph = new Graph($widthUser, $height + $xUserTickWidth);
$graph->img->SetImgFormat($ext);
......@@ -464,7 +462,6 @@ if (isset($_REQUEST['graph'])) {
} else {
$title = sprintf(tra('%s Contributions: Suppression') , $user);
}
//echo '<pre>XXX';print_r($userContributions);print_r($series); die;
if ($prefs['feature_jpgraph'] == 'y') {
$graph = new Graph($widthUser, $height + $xUserTickWidth);
$graph->img->SetImgFormat($ext);
......@@ -502,7 +499,6 @@ if (isset($_REQUEST['graph'])) {
$title = tra('Total Contributions Addition per Week');
$title2 = tra('Weeks');
}
//echo '<pre>XXX';print_r($contributionStat);print_r($series); die;
if ($prefs['feature_jpgraph'] == 'y') {
$graph = new Graph($widthWeek, $height);
$graph->img->SetImgFormat($ext);
......@@ -537,7 +533,6 @@ if (isset($_REQUEST['graph'])) {
$title = tra('Total Contributions Suppression per Week');
$title2 = tra('Weeks');
}
//echo '<pre>XXX';print_r($contributionStat);print_r($series); die;
if ($prefs['feature_jpgraph'] == 'y') {
$graph = new Graph($widthWeek, $height);
$graph->img->SetImgFormat($ext);
......@@ -566,7 +561,6 @@ if (isset($_REQUEST['graph'])) {
$series = $logslib->draw_contribution_vol($contributionStat, 'add', $contributions);
if ($series['totalVol']) {
$title = tra('Total Contributions: Addition');
//echo "<pre>";print_r($contributionStat);print_r($series);die;
if ($prefs['feature_jpgraph'] == 'y') {
$graph = new Graph($widthTotal, $height);
$graph->img->SetImgFormat($ext);
......@@ -593,7 +587,6 @@ if (isset($_REQUEST['graph'])) {
$series = $logslib->draw_contribution_vol($contributionStat, 'del', $contributions);
if ($series['totalVol']) {
$title = tra('Total Contributions: Suppression');
//echo "<pre>";print_r($contributionStat);print_r($series);die;
if ($prefs['feature_jpgraph'] == 'y') {
$graph = new Graph($widthTotal, $height);
$graph->img->SetImgFormat($ext);
......@@ -620,7 +613,6 @@ if (isset($_REQUEST['graph'])) {
$series = $logslib->draw_contribution_group($groupContributions, 'add', $contributions);
if ($series['totalVol']) {
$title = tra('Groups Contributions: Addition');
//echo "<pre>";print_r($groupContributions);print_r($series);die;
if ($prefs['feature_jpgraph'] == 'y') {
$graph = new Graph($widthGroup, $height + $xGroupTickWidth);
$graph->img->SetImgFormat($ext);
......@@ -650,7 +642,6 @@ if (isset($_REQUEST['graph'])) {
$series = $logslib->draw_contribution_group($groupContributions, 'del', $contributions);
if ($series['totalVol']) {
$title = tra('Groups Contributions: Suppression');
//echo "<pre>";print_r($groupContributions);print_r($series);die;
if ($prefs['feature_jpgraph'] == 'y') {
$graph = new Graph($widthGroup, $height + $xGroupTickWidth);
$graph->img->SetImgFormat($ext);
......
......@@ -287,7 +287,6 @@ function md5_check_dir($dir, &$result) { // save all suspicious files in $result
}
}
}
// echo "<pre>";print_r($valid_tikiver);echo"</pre>";
if ($is_tikifile == false) {
$result[$entry] = tra('This is not a Tikiwiki file. Check if this file was uploaded and if it is dangerous.');
} else if ($is_tikifile == true && count($is_tikiver) == 0) {
......@@ -324,8 +323,6 @@ if (isset($_REQUEST['check_files'])) {
$tiki_versions = $version->tikiVersions();
$result = array();
md5_check_dir(".", $result);
// echo "<pre>"; print_r($tikimd5);echo "</pre><br />";
// echo "<pre>"; print_r($result);echo "</pre><br />";
$smarty->assign('filecheck', true);
$smarty->assign_by_ref('tikifiles', $result);
}
......@@ -390,7 +387,6 @@ function check_dir_perms($dir, &$result) {
if (isset($_REQUEST['check_file_permissions'])) {
$fileperms = array();
check_dir_perms('.', $fileperms);
// echo "<pre>"; print_r($fileperms);echo "</pre><br />";
// walk throug array to find problematic entries
$worldwritable = array();
$suid = array();
......
......@@ -73,17 +73,12 @@ if ((!empty($activeWS)) and $isHomePage)
if (!empty($preferences['wsHomepage']))
$_REQUEST['page'] = $preferences['wsHomepage'];
}
//echo "<pre>-- tiki-index.php: before get_page_name_from_id, \n\$_REQUEST['page']='".$_REQUEST['page']."'\n\$_REQUEST['page_id']=".$_REQUEST['page_id']."\n\$page='$page'\n\$smarty->get_template_vars('page')='".$smarty->get_template_vars('page')."'</pre>\n";
//die("-- dying so can see traces");
// If a page have been requested, then show the page.
if (isset($_REQUEST['page_id'])) {
$_REQUEST['page'] = $tikilib->get_page_name_from_id($_REQUEST['page_id']);
//TODO: introduce a get_info_from_id to save a sql request
}
//echo "<pre>-- tiki-index.php: after get_page_name_from_id, \n\$_REQUEST['page']='".$_REQUEST['page']."'\n\$_REQUEST['page_id']=".$_REQUEST['page_id']."\n\$page='$page'\n\$smarty->get_template_vars('page')='".$smarty->get_template_vars('page')."'</pre>\n";
//die("-- dying so can see traces");
if ((!isset($_REQUEST['page']) || $_REQUEST['page'] == '') and !isset($_REQUEST['page_ref_id'])) {
if ($objectperms->view) {
......@@ -96,8 +91,6 @@ if ((!isset($_REQUEST['page']) || $_REQUEST['page'] == '') and !isset($_REQUEST[
$use_best_language = $multilinguallib->useBestLanguage();
//echo "<pre>-- tiki-index.php: \$use_best_language='"; var_dump($use_best_language); echo "'</pre>\n";
$info = null;
$structs_with_perm = array();
......@@ -143,7 +136,6 @@ if( $prefs['feature_wiki_structure'] == 'y' ) {
if (!empty($page_ref_id)) {
$page_info = $structlib->s_get_page_info($page_ref_id);
// echo "<pre>-- tiki-index.php: after calling s_get_page_info, \$page_info="; var_dump($page_info); echo "</pre>\n";
$info = null;
// others still need a good set page name or they will get confused.
......@@ -158,8 +150,6 @@ if (!empty($page_ref_id)) {
$page = $_REQUEST['page'];
$smarty->assign_by_ref('page',$page);
//echo "<pre>-- tiki-index.php: before function_exists('utf8, \$page='$page', \$_REQUEST['page']='".$_REQUEST['page']."'\n\$smarty->get_template_vars('page')='".$smarty->get_template_vars('page')."'</pre>\n";
if ( function_exists('utf8_encode') ) {
$pagename_utf8 = utf8_encode($page);
if ( $page != $pagename_utf8 && ! $tikilib->page_exists($page) && $tikilib->page_exists($pagename_utf8) ) {
......@@ -180,12 +170,8 @@ if(empty($info) && !($user && $prefs['feature_wiki_userpage'] == 'y' && strcasec
$url = 'tiki-index.php?page='.$prefs['feature_wiki_userpage_prefix'].$user;
if ($prefs['feature_sefurl'] == 'y') {
include_once('tiki-sefurl.php');
// echo "<pre>-- tiki-index.php: header 1, location='".urlencode(filter_out_sefurl($url, $smarty, 'wiki'))."'</pre>\n";
// die("-- dying so you can see the traces go by");
header('location: '. urlencode(filter_out_sefurl($url, $smarty, 'wiki')));
} else {
// echo "<pre>-- tiki-index.php: header 2, location='".$url."'</pre>\n";
// die("-- dying so you can see the traces go by");
header("Location: $url");
}
die;
......@@ -206,8 +192,6 @@ if(empty($info) && !($user && $prefs['feature_wiki_userpage'] == 'y' && strcasec
if (empty($info) && $user && $prefs['feature_wiki_userpage'] == 'y' && (strcasecmp($prefs['feature_wiki_userpage_prefix'].$user, $page) == 0 || strcasecmp($prefs['feature_wiki_userpage_prefix'], $page) == 0 )) {
// echo "<pre>-- tiki-index.php: header 2, location='".'tiki-editpage.php?page='.$prefs['feature_wiki_userpage_prefix'].$user."'</pre>\n";
// die("-- dying so you can see the traces go by");
header('Location: tiki-editpage.php?page='.$prefs['feature_wiki_userpage_prefix'].$user);
die;
......@@ -263,8 +247,6 @@ if( ! $pageRenderer->canView ) {
// Convert page to structure
if (isset($_REQUEST['convertstructure']) && isset($structs) && count($structs) == 0) {
$page_ref_id = $structlib->s_create_page(0, null, $page);
// echo "<pre>-- tiki-index.php: header 3, location='".'tiki-index.php?page_ref_id='.$page_ref_id."'</pre>\n";
// die;
header('Location: tiki-index.php?page_ref_id='.$page_ref_id );
exit;
}
......@@ -462,9 +444,6 @@ if (!empty($_REQUEST['machine_translate_to_lang'])) {
$smarty->assign('mid','tiki-show_page.tpl');
//echo "<pre>-- tiki-index.php: Just before display, smarty variables are:\n"; var_dump($smarty->get_template_vars()); echo "</pre>\n";
//echo "<pre>-- tiki-index.php: Just before display, \$_REQUEST=:\n"; var_dump($_REQUEST); echo "</pre>\n";
$smarty->display("tiki.tpl");
// xdebug_dump_function_profile(XDEBUG_PROFILER_CPU);
......
......@@ -69,7 +69,6 @@ foreach($pollIds as $pK => $pId) { // iterate each poll
$vote_from_date = $vote_to_date = 0;
}
$options = $polllib->list_poll_options($pId, $vote_from_date, $vote_to_date);
//echo '<pre>'; print_r($options); echo '</pre>';
$poll_info_arr[$pK] = $poll_info;
if ($vote_from_date != 0) {
$poll_info_arr[$pK]['votes'] = 0;
......@@ -101,7 +100,7 @@ foreach($pollIds as $pK => $pId) { // iterate each poll
$poll_info_arr[$pK]['options'] = $options;
$poll_info_arr[$pK]['total'] = $total;
} // end iterate each poll
//echo '<pre>'; print_r($poll_info_arr); echo '</pre>';
function scoresort($a, $b) {
if (isset($_REQUEST['scoresort_asc'])) {
$i = $_REQUEST['scoresort_asc'];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment