Changeset 119 for trunk/bin

Timestamp:

May 20, 2006 2:12:12 AM (18 years ago)

Author:

scdev

Message:

Q - making codebase 2 work with php5. Rewrote ImageThumb? class to work with GD

File:

• trunk/bin/module_maker/module.cli.php (modified) (2 diffs)

trunk/bin/module_maker/module.cli.php

@@ -442 +442 @@
 
 if ('var' == $op) {
-    if (isset($replace[$_SERVER['argv'][5]])) {
+    if (isset($_SERVER['argv'][5]) && isset($replace[$_SERVER['argv'][5]])) {
         echo "\n\n" . $replace[$_SERVER['argv'][5]] . "\n\n";
-    } else if (isset($skel_files[$_SERVER['argv'][5]])) {
+    } else if (isset($_SERVER['argv'][5]) && isset($skel_files[$_SERVER['argv'][5]])) {
         echo "\n\n" . preg_replace($search, $replace, $skel_files[$_SERVER['argv'][5]]) . "\n\n";
     } else {
-        die(basename($_SERVER['argv'][0]) . " Error: variable " . $_SERVER['argv'][5] . " not defined. Please choose one of:\n" . join(', ', array_keys(array_merge($replace, $skel_files))) . "\n");
+        die(basename($_SERVER['argv'][0]) . " Error: variable " . (isset($_SERVER['argv'][5]) ? $_SERVER['argv'][5] : '') . " not defined. Please choose one of:\n" . join(', ', array_keys(array_merge($replace, $skel_files))) . "\n");
     }
     die;
@@ -549 +549 @@
     // Make user trash folder.
     if (!is_dir($user_trash_folder)) {
+        echo "Attempting to create user trash folder: $user_trash_folder/\n";
         mkdir($user_trash_folder);
-        chmod($user_trash_folder, 0777);
-        echo "Attempting to create user trash folder: $user_trash_folder/\n";
+        chmod($user_trash_folder, 0700);
     }
     if (!is_dir("$user_trash_folder/") || !is_writable("$user_trash_folder/")) {