Changeset 500 for trunk/bin

Timestamp:

Nov 15, 2014 9:34:39 PM (9 years ago)

Author:

anonymous

Message:

Many auth and crypto changes; various other bugfixes while working on pulso.

Location:

trunk/bin/module_maker

Files:

• _config.inc.php (modified) (2 diffs)
• module.cli.php (modified) (5 diffs)
• skel/admin.php (modified) (1 diff)

trunk/bin/module_maker/_config.inc.php

@@ -35 +35 @@
 
 // Make sure necessary files exist.
-if (!file_exists(COMMON_BASE . '/global/db_auth.inc.php')) {
+$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("Error: First argument directory must contain the global/db_auth.inc.php file with valid MySQL credentials.\n");
 }
@@ -63 +73 @@
     'log_screen_priority' => LOG_DEBUG,
 ));
-require_once 'global/db_auth.inc.php';
+require_once $db_auth_file;
 
 // Start application-based functionality: database, session, environment, ini setup, etc.

trunk/bin/module_maker/module.cli.php

@@ -5 +5 @@
  * For details visit the project site: <http://trac.strangecode.com/codebase/>
  * Copyright 2001-2012 Strangecode, LLC
- * 
+ *
  * This file is part of The Strangecode Codebase.
  *
@@ -12 +12 @@
  * Free Software Foundation, either version 3 of the License, or (at your option)
  * any later version.
- * 
+ *
  * The Strangecode Codebase is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
  * details.
- * 
+ *
  * You should have received a copy of the GNU General Public License along with
  * The Strangecode Codebase. If not, see <http://www.gnu.org/licenses/>.
@@ -39 +39 @@
 
     " . basename($_SERVER['argv'][0]) . " site_directory name_singular name_plural [operation]
-    
+
 Valid operations include: " . join(', ', $valid_ops) . "
 
@@ -149 +149 @@
     if (!is_dir("$public_tpl_dir")) {
         die(basename($_SERVER['argv'][0]) . " Error: public_tpl_dir '$public_tpl_dir' directory not found.\n");
-    }    
+    }
 }
 
@@ -196 +196 @@
         $type = preg_replace('/^(\w+).*$/', '\\1', $col[1]);
         $default = $col[4];
-        
+
         if (mb_strpos($default, '0000') !== false || '0' == $default) {
             $default = '';

trunk/bin/module_maker/skel/admin.php

@@ -408 +408 @@
     ";
 
-    // Use a cash hash to determine if the result-set has changed.
+    // Use a cache hash to determine if the result-set has changed.
     // A unique key for this query, with the total_items in case db records
     // were added since the last cache. This identifies a unique set of