Changeset 523 for trunk/bin

Timestamp:

May 24, 2015 3:01:42 PM (9 years ago)

Author:

anonymous

Message:

First set of changes towards 2.2.0. Improved functinoality with integration in wordpress; bugs fixed.

Location:

trunk/bin/module_maker

Files:

• _config.inc.php (modified) (3 diffs)
• form_template.cli.php (modified) (1 diff)

trunk/bin/module_maker/_config.inc.php

@@ -36 +36 @@
 // Make sure necessary files exist.
 $db_auth_file = false;
+$db_json_file = false;
 $rii = new RecursiveIteratorIterator(new RecursiveDirectoryIterator(COMMON_BASE));
 $rii->setMaxDepth(2);
 foreach ($rii as $filename => $file) {
+    if (mb_strpos($filename, 'db_auth.json') !== false) {
+        $db_json_file = $filename;
+        break;
+    }
     if (mb_strpos($filename, 'db_auth.inc.php') !== false) {
         $db_auth_file = $filename;
@@ -45 +50 @@
 }
 
-if (!$db_auth_file) {
+if (!$db_auth_file && !$db_json_file) {
     die("Error: First argument directory must contain the global/db_auth.inc.php file with valid MySQL credentials.\n");
 }
@@ -72 +77 @@
     'error_reporting' => E_ALL,
     'log_screen_priority' => LOG_DEBUG,
+    'log_directory' => COMMON_BASE . '/log',
 ));
-require_once $db_auth_file;
+
+if ($db_json_file) {
+    $app->setParam(array(
+        'db_auth_file' => $db_json_file,
+    ));
+} else {
+    require_once $db_auth_file;
+}
 
 // Start application-based functionality: database, session, environment, ini setup, etc.
 // Most configuration parameters must be set before starting the App.
+define('_CLI', true);
 $app->start();
 

trunk/bin/module_maker/form_template.cli.php

@@ -100 +100 @@
     <label for="$field"><\x3fphp echo _("$title"); \x3f></label>
     <input type="file" name="$field" id="$field" />
-    <\x3fphp if ('' != \$upload->getFilenameGlob(getFormData('$primary_key') . '_*') && getFormData('op') == 'edit' || getFormData('op') == 'update') { \x3f>
-        <div class="sc-help"><\x3fphp printf(_("The current file <a href=\"%s/%2\\$s\"><strong>%2\\$s</strong></a> will be deleted if a new file is selected for upload."), '/_db_files/__///__', \$upload->getFilenameGlob(getFormData('$primary_key') . '_*')) \x3f></div>
+    <\x3fphp if ('' != \$upload->getFilenameGlob(getFormData('$primary_key') . '_*') && (getFormData('op') == 'edit' || getFormData('op') == 'update')) { \x3f>
+        <div class="sc-help"><\x3fphp printf(_("The current file <a href=\"%s/%2\\\$s\"><strong>%2\\\$s</strong></a> will be deleted if a new file is selected for upload."), '/_db_files/__///__', \$upload->getFilenameGlob(getFormData('$primary_key') . '_*')) \x3f></div>
     <\x3fphp } \x3f>
     <div class="sc-help"><\x3fphp printf(_("Allowed file types: %s."), join(', ', \$upload->getParam('valid_file_extensions'))) \x3f></div>