Changeset 502 for trunk/bin

Timestamp:

Dec 30, 2014 10:24:51 PM (9 years ago)

Author:

anonymous

Message:

Many minor fixes during pulso development

File:

• trunk/bin/acl.cli.php (modified) (8 diffs)

trunk/bin/acl.cli.php

@@ -44 +44 @@
 // Make sure necessary files exist.
 define('COMMON_BASE', realpath('.'));
-$db_quth_file = COMMON_BASE . '/global/db_auth.inc.php';
-if (!file_exists($db_quth_file)) {
-    die(sprintf("%s error: the current directory must be common site directory (i.e. the parent directory of the document root) AND the global/db_auth.inc.php file must exist.\n", $this_script));
-}
-
-if (fileowner($db_quth_file) != getmyuid()) {
+$db_auth_file = false;
+$rii = new RecursiveIteratorIterator(new RecursiveDirectoryIterator(COMMON_BASE));
+$rii->setMaxDepth(2);
+foreach ($rii as $filename => $file) {
+    if (mb_strpos($filename, 'db_auth.inc.php') !== false) {
+        $db_auth_file = $filename;
+        break;
+    }
+}
+if (!$db_auth_file) {
+    die(sprintf("%s error: the current directory must be common site directory (i.e. the parent directory of the document root) AND the db_auth.inc.php file must exist.\n", $this_script));
+}
+if (fileowner($db_auth_file) != getmyuid()) {
     die(sprintf("%s error: you must execute this script as the owner of the web files.\n", $this_script));
 }
 
 // Set include path.
-ini_set('include_path', get_include_path()
-    . PATH_SEPARATOR . COMMON_BASE
-);
+ini_set('include_path', get_include_path() . PATH_SEPARATOR . COMMON_BASE);
 
 /********************************************************************
@@ -83 +88 @@
     'log_filename' => 'site_log',
 ));
-require_once 'global/db_auth.inc.php';
+require_once $db_auth_file;
 
 // Start application-based functionality: database, session, environment, ini setup, etc.
@@ -104 +109 @@
 if (!$db->tableExists('acl_tbl')) {
     printf("This project doesn't appear to be using ACL (there is no acl_tbl in the %s DB).\n", $app->getParam('db_name'));
+    $app->stop();
     die;
 }
@@ -220 +226 @@
     break;
 }
+
+$app->stop();
+die;
 
 
@@ -309 +318 @@
     case 'aro' :
         $tbl = 'aro_tbl';
-        printf("%-35s %-5s %-5s %s\n", 'Request objects', 'lft', 'rgt', 'Added');
+        printf("%-45s %s\n", 'Request objects', 'Added');
         break;
     case 'aco' :
         $tbl = 'aco_tbl';
-        printf("%-35s %-5s %-5s %s\n", 'Control objects', 'lft', 'rgt', 'Added');
+        printf("%-45s %s\n", 'Control objects', 'Added');
         break;
     case 'axo' :
         $tbl = 'axo_tbl';
-        printf("%-35s %-5s %-5s %s\n", 'Xtra objects', 'lft', 'rgt', 'Added');
+        printf("%-45s %s\n", 'Xtra objects', 'Added');
         break;
     default :
@@ -325 +334 @@
     }
 
-    echo "-----------------------------------------------------------\n";
+    echo "---------------------------------------------------------------------\n";
 
     // Retrieve the left and right value of the $root node.
@@ -342 +351 @@
 
         // Display indented node title.
-        printf("%-35s %-5s %-5s %s\n", str_repeat('    ', sizeof($depth)) . $name, $lft, $rgt, date($app->getParam('date_format'), strtotime($added_datetime)));
+        printf("%-45s %s\n", str_repeat('    ', sizeof($depth)) . $name, date($app->getParam('date_format') . ' ' . $app->getParam('time_format'), strtotime($added_datetime)));
 
         // Add this node to the stack.
@@ -373 +382 @@
     ");
     echo "\n";
-    printf("%-25s %-25s %-25s %-6s %-10s\n", 'Request objects', 'Control objects', 'Xtra objects', '', 'Added');
+    printf("%-25s %-25s %-25s %-6s %-10s\n", 'Request objects', 'Control objects', 'Xtra objects', 'Grant', 'Added');
     echo "------------------------------------------------------------------------------------------------\n";
     while ($p = mysql_fetch_assoc($qid)) {