Menu
▾
▴
[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[43728] branches/10.x/permissioncheck
|
From: <fm...@us...> - 2012-10-30 21:41:46
|
Revision: 43728
http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=43728&view=rev
Author: fmg-sf
Date: 2012-10-30 21:41:40 +0000 (Tue, 30 Oct 2012)
Log Message:
-----------
[FIX] summarized output per permission must be checked external via HTTP request
Modified Paths:
--------------
branches/10.x/permissioncheck/check.php
branches/10.x/permissioncheck/functions.inc.php
branches/10.x/permissioncheck/index.php
branches/10.x/permissioncheck/insane/check.php
branches/10.x/permissioncheck/mixed/check.php
branches/10.x/permissioncheck/morepain/check.php
branches/10.x/permissioncheck/moreworry/check.php
branches/10.x/permissioncheck/paranoia/check.php
branches/10.x/permissioncheck/paranoia-suphp/check.php
branches/10.x/permissioncheck/risky/check.php
branches/10.x/permissioncheck/worry/check.php
Modified: branches/10.x/permissioncheck/check.php
===================================================================
--- branches/10.x/permissioncheck/check.php 2012-10-30 19:56:28 UTC (rev 43727)
+++ branches/10.x/permissioncheck/check.php 2012-10-30 21:41:40 UTC (rev 43728)
@@ -4,6 +4,9 @@
//echo 'This model works';
$check_if_model_works = true;
return $check_if_model_works;
+} else {
+ echo 'Tiki Read Check: this model works';
+ return;
}
?>
<!DOCTYPE html>
Modified: branches/10.x/permissioncheck/functions.inc.php
===================================================================
--- branches/10.x/permissioncheck/functions.inc.php 2012-10-30 19:56:28 UTC (rev 43727)
+++ branches/10.x/permissioncheck/functions.inc.php 2012-10-30 21:41:40 UTC (rev 43728)
@@ -95,6 +95,21 @@
return $username;
}
+// page url
+function get_page_url($filename)
+{
+ $page_basename = 'http';
+ if ( $_SERVER["HTTPS"] == "on" ) {
+ $page_basename .= 's';
+ }
+ $page_basename .= '://';
+ $page_basename .= $_SERVER["SERVER_NAME"];
+ $page_basename .= dirname($_SERVER['PHP_SELF']);
+ $page_basename .= '/' . $filename;
+
+ return $page_basename;
+}
+
// all permission data by reference
function get_perm_data($filename, &$username, &$groupname, &$perms_asc, &$perms_oct)
{
Modified: branches/10.x/permissioncheck/index.php
===================================================================
--- branches/10.x/permissioncheck/index.php 2012-10-30 19:56:28 UTC (rev 43727)
+++ branches/10.x/permissioncheck/index.php 2012-10-30 21:41:40 UTC (rev 43728)
@@ -183,18 +183,30 @@
echo '<tr>'.'<td><em class="'.$css_class.'">'.$perms_file.'</em></td>'.'<td>'.$username.'</td><td>'.$groupname.'</td>';
echo '<td class="' . $css_class_writable . '">'.$perms_asc.'</td><td>'.$perms_oct.'</td>';
echo '<td><a href="'.$filename.'" target="_blank">permissioncheck/'.$filename."</a></td></tr>\n ";
- // include this file
+ // include this file as external one via HTTP request
echo $html_almost_empty_table_row;
-
echo '<td>';
- $check_if_model_works = false;
- include $filename;
- if ( $check_if_model_works ) {
- $check_if_model_works_text = '<span class="modelworksyes">Read: this model works for you</span>';
+ // $check_if_model_works = false;
+ // include $filename;
+ // if ( $check_if_model_works ) {
+ // $check_if_model_works_text = '<span class="modelworksyes">Read: this model works for you</span>';
+ // } else {
+ // $check_if_model_works_text = '<span class="modelworksno">Read: this model does not work for you!</span>';
+ // }
+ $url_name = get_page_url($filename);
+ //print $url_name;
+ $http_request = 'foo';
+ $http_request = @file_get_contents($url_name);
+ if ($http_request === false) {
+ $http_output = '<span class="modelworksno">' . 'THIS DOES NOT WORK' . '</span>';
} else {
- $check_if_model_works_text = '<span class="modelworksno">Read: this model does not work for you!</span>';
+ $http_output = '<span class="modelworksyes">' . $http_request . '</span>';
}
- echo $check_if_model_works_text . '</td>'."\n ";
+ //print file_get_contents($url_name) or print 'THIS DOES NOT WORK';
+ echo $http_output;
+ //echo $check_if_model_works_text;
+ //echo $check_if_model_works_text . '</td>'."\n ";
+ echo '</td>'."\n ";
}
// general data for special checks
$perms_unknown='???';
Modified: branches/10.x/permissioncheck/insane/check.php
===================================================================
--- branches/10.x/permissioncheck/insane/check.php 2012-10-30 19:56:28 UTC (rev 43727)
+++ branches/10.x/permissioncheck/insane/check.php 2012-10-30 21:41:40 UTC (rev 43728)
@@ -4,6 +4,9 @@
//echo 'This model works';
$check_if_model_works = true;
return $check_if_model_works;
+} else {
+ echo 'Tiki Read Check: this model works';
+ return;
}
?>
<!DOCTYPE html>
Modified: branches/10.x/permissioncheck/mixed/check.php
===================================================================
--- branches/10.x/permissioncheck/mixed/check.php 2012-10-30 19:56:28 UTC (rev 43727)
+++ branches/10.x/permissioncheck/mixed/check.php 2012-10-30 21:41:40 UTC (rev 43728)
@@ -4,6 +4,9 @@
//echo 'This model works';
$check_if_model_works = true;
return $check_if_model_works;
+} else {
+ echo 'Tiki Read Check: this model works';
+ return;
}
?>
<!DOCTYPE html>
Modified: branches/10.x/permissioncheck/morepain/check.php
===================================================================
--- branches/10.x/permissioncheck/morepain/check.php 2012-10-30 19:56:28 UTC (rev 43727)
+++ branches/10.x/permissioncheck/morepain/check.php 2012-10-30 21:41:40 UTC (rev 43728)
@@ -4,6 +4,9 @@
//echo 'This model works';
$check_if_model_works = true;
return $check_if_model_works;
+} else {
+ echo 'Tiki Read Check: this model works';
+ return;
}
?>
<!DOCTYPE html>
Modified: branches/10.x/permissioncheck/moreworry/check.php
===================================================================
--- branches/10.x/permissioncheck/moreworry/check.php 2012-10-30 19:56:28 UTC (rev 43727)
+++ branches/10.x/permissioncheck/moreworry/check.php 2012-10-30 21:41:40 UTC (rev 43728)
@@ -4,6 +4,9 @@
//echo 'This model works';
$check_if_model_works = true;
return $check_if_model_works;
+} else {
+ echo 'Tiki Read Check: this model works';
+ return;
}
?>
<!DOCTYPE html>
Modified: branches/10.x/permissioncheck/paranoia/check.php
===================================================================
--- branches/10.x/permissioncheck/paranoia/check.php 2012-10-30 19:56:28 UTC (rev 43727)
+++ branches/10.x/permissioncheck/paranoia/check.php 2012-10-30 21:41:40 UTC (rev 43728)
@@ -4,6 +4,9 @@
//echo 'This model works';
$check_if_model_works = true;
return $check_if_model_works;
+} else {
+ echo 'Tiki Read Check: this model works';
+ return;
}
?>
<!DOCTYPE html>
Modified: branches/10.x/permissioncheck/paranoia-suphp/check.php
===================================================================
--- branches/10.x/permissioncheck/paranoia-suphp/check.php 2012-10-30 19:56:28 UTC (rev 43727)
+++ branches/10.x/permissioncheck/paranoia-suphp/check.php 2012-10-30 21:41:40 UTC (rev 43728)
@@ -4,6 +4,9 @@
//echo 'This model works';
$check_if_model_works = true;
return $check_if_model_works;
+} else {
+ echo 'Tiki Read Check: this model works';
+ return;
}
?>
<!DOCTYPE html>
Modified: branches/10.x/permissioncheck/risky/check.php
===================================================================
--- branches/10.x/permissioncheck/risky/check.php 2012-10-30 19:56:28 UTC (rev 43727)
+++ branches/10.x/permissioncheck/risky/check.php 2012-10-30 21:41:40 UTC (rev 43728)
@@ -4,6 +4,9 @@
//echo 'This model works';
$check_if_model_works = true;
return $check_if_model_works;
+} else {
+ echo 'Tiki Read Check: this model works';
+ return;
}
?>
<!DOCTYPE html>
Modified: branches/10.x/permissioncheck/worry/check.php
===================================================================
--- branches/10.x/permissioncheck/worry/check.php 2012-10-30 19:56:28 UTC (rev 43727)
+++ branches/10.x/permissioncheck/worry/check.php 2012-10-30 21:41:40 UTC (rev 43728)
@@ -4,6 +4,9 @@
//echo 'This model works';
$check_if_model_works = true;
return $check_if_model_works;
+} else {
+ echo 'Tiki Read Check: this model works';
+ return;
}
?>
<!DOCTYPE html>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|