Changeset 154

Timestamp:

Jun 8, 2006 5:36:10 AM (18 years ago)

Author:

scdev

Message:

${1}

Location:

trunk

Files:

• bin/module_maker/form_template.cli.php (modified) (3 diffs)
• bin/module_maker/list_template.cli.php (modified) (4 diffs)
• bin/module_maker/module.cli.php (modified) (5 diffs)
• bin/module_maker/skel/adm_list.ihtml (modified) (2 diffs)
• bin/module_maker/skel/admin.php (modified) (6 diffs)
• bin/module_maker/skel/public.ihtml (modified) (1 diff)
• bin/module_maker/skel/public.php (modified) (2 diffs)
• bin/module_maker/skel/public_list.ihtml (modified) (1 diff)
• bin/module_maker/sql.cli.php (modified) (1 diff)
• docs/example_script_template.php (modified) (1 diff)
• lib/App.inc.php (modified) (12 diffs)
• lib/Auth_File.inc.php (modified) (8 diffs)
• lib/Auth_SQL.inc.php (modified) (9 diffs)
• lib/Cache.inc.php (modified) (6 diffs)
• lib/ImageThumb.inc.php (modified) (3 diffs)
• lib/PageNumbers.inc.php (modified) (1 diff)
• lib/Prefs.inc.php (modified) (11 diffs)
• lib/SortOrder.inc.php (modified) (1 diff)
• lib/Utilities.inc.php (modified) (2 diffs)
• tests/AppTest.php (modified) (1 diff)
• tests/Auth_FileTest.php (modified) (2 diffs)
• tests/Auth_SQLTest.php (modified) (1 diff)
• tests/EmailTest.php (modified) (1 diff)

trunk/bin/module_maker/form_template.cli.php

@@ -34 +34 @@
 
 $exclude = array('added_by_user_id', 'added_datetime', 'hit_count', 'modified_datetime', 'modified_by_user_id');
-$primary_key = '<##>';
+$primary_key = '__///__';
 $output = array();
 
@@ -64 +64 @@
 
 <label for="$field"<\x3fphp \$fv->err('$field') \x3f>><\x3fphp echo _("$title"); \x3f></label>
-<select name="$field" id="$field" class="sc-small"><\x3fphp printSelectForm('<##>_tbl', "CONCAT(<##>_id, '&mdash;', <##>)", '$field', \$frm['$field'], true, 'ORDER BY $field ASC'); \x3f></select>
-    <span class="commanditem commandtext"><a href="<\x3fphp echo \$app->oHREF('<##>.php?op=add&boomerang=true'); \x3f>" onClick="javascript:return confirm('<\x3fphp echo _("Notice: You are about to leave this form page and any changes you may have made without saving will be lost."); \x3f>')"><\x3fphp echo _("Add <##>") \x3f></a></span>
-    <\x3fphp if ('' != \$frm['<##>_id']) { \x3f>
-    <span class="commanditem commandtext"><a href="<\x3fphp echo \$app->oHREF('<##>.php?op=edit&boomerang=true&<##>_id=' . \$frm['<##>_id']); \x3f>" onClick="javascript:return confirm('<\x3fphp echo _("Notice: You are about to leave this form page and any changes you may have made without saving will be lost."); \x3f>')"><\x3fphp echo sprintf(_("Edit <##> <em>%s</em>"), \$frm['<##>']) \x3f></a></span>
+<select name="$field" id="$field" class="sc-small"><\x3fphp printSelectForm('__///___tbl', "CONCAT(__///___id, '&mdash;', __///__)", '$field', \$frm['$field'], true, 'ORDER BY $field ASC'); \x3f></select>
+    <span class="commanditem commandtext"><a href="<\x3fphp echo \$app->oHREF('__///__.php?op=add&boomerang=true'); \x3f>" onClick="javascript:return confirm('<\x3fphp echo _("Notice: You are about to leave this form page and any changes you may have made without saving will be lost."); \x3f>')"><\x3fphp echo _("Add __///__") \x3f></a></span>
+    <\x3fphp if ('' != \$frm['__///___id']) { \x3f>
+    <span class="commanditem commandtext"><a href="<\x3fphp echo \$app->oHREF('__///__.php?op=edit&boomerang=true&__///___id=' . \$frm['__///___id']); \x3f>" onClick="javascript:return confirm('<\x3fphp echo _("Notice: You are about to leave this form page and any changes you may have made without saving will be lost."); \x3f>')"><\x3fphp echo sprintf(_("Edit __///__ <em>%s</em>"), \$frm['__///__']) \x3f></a></span>
     <\x3fphp } \x3f>
 E_O_F;
@@ -80 +80 @@
 <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>
+    <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(_("File to upload must have one of the following file-name extensions: %s."), join(', ', \$upload->getParam('valid_file_extensions'))) \x3f></div>

trunk/bin/module_maker/list_template.cli.php

@@ -46 +46 @@
 }
 
-$primary_key = '<##>';
+$primary_key = '__///__';
 
 // Loop through columns
@@ -111 +111 @@
 <form action="<\x3fphp echo \$_SERVER['PHP_SELF']; \x3f>" method="get">
 <\x3fphp \$app->printHiddenSession(false); \x3f>
-    <span class="sc-nowrap commandtext"><a href="<\x3fphp echo \$app->oHREF(\$_SERVER['PHP_SELF'] . '?op=add'); \x3f>"><\x3fphp echo _("Add <##>"); \x3f></a></span>
+    <span class="sc-nowrap commandtext"><a href="<\x3fphp echo \$app->oHREF(\$_SERVER['PHP_SELF'] . '?op=add'); \x3f>"><\x3fphp echo _("Add __///__"); \x3f></a></span>
     <br />
 
-    <input type="text" class="sc-small" size="20" name="search_query" value="<\x3fphp echo getFormData('search_query'); \x3f>" title="<\x3fphp echo oTxt(_("Fields searched: <##>.")); \x3f>" />
-    <select name="filter_<##>">
-        <\x3fphp // printSelectForm('<##>_tbl', "CONCAT(<##>_id, '&mdash;', city, '&mdash;', title)", '<##>_id', getFormData('filter_<##>'), array('Any <##>'), 'ORDER BY <##> ASC'); \x3f>
+    <input type="text" class="sc-small" size="20" name="search_query" value="<\x3fphp echo getFormData('search_query'); \x3f>" title="<\x3fphp echo oTxt(_("Fields searched: __///__.")); \x3f>" />
+    <select name="filter___///__">
+        <\x3fphp // printSelectForm('__///___tbl', "CONCAT(__///___id, '&mdash;', city, '&mdash;', title)", '__///___id', getFormData('filter___///__'), array('Any __///__'), 'ORDER BY __///__ ASC'); \x3f>
     </select>
     <input type="submit" name="list" value="<\x3fphp echo _("Search"); \x3f>" />
@@ -149 +149 @@
     <\x3fphp for (\$i = 0; \$i <= \$page->last_item - \$page->first_item && \$page->total_items > 0; \$i++) { \x3f>
     <tr>
-        <td class="sc-nowrap"><a title="<\x3fphp printf(_("Edit %s"), oTxt(\$list[\$i]['<##>'])) \x3f>" href="<\x3fphp echo \$app->oHREF(\$_SERVER['PHP_SELF'] . '?op=edit&$primary_key=' . \$list[\$i]['$primary_key']); \x3f>"><img src="/admin/_widgets/edit.gif" alt="Edit" width="14" height="18" border="0"></a> &nbsp;</td>
-        <td class="sc-nowrap"><a title="<\x3fphp printf(_("Versions of %s"), oTxt(\$list[\$i]['<##>'])) \x3f>" href="<\x3fphp echo \$app->oHREF("/admin/versions.php?record_table=$db_tbl&record_key=$primary_key&boomerang=true&record_val=" . \$list[\$i]['$primary_key']); \x3f>"><img src="/admin/_widgets/subcategory.gif" alt="" width="18" height="14" border="0" /></a> &nbsp;</td>
+        <td class="sc-nowrap"><a title="<\x3fphp printf(_("Edit %s"), oTxt(\$list[\$i]['__///__'])) \x3f>" href="<\x3fphp echo \$app->oHREF(\$_SERVER['PHP_SELF'] . '?op=edit&$primary_key=' . \$list[\$i]['$primary_key']); \x3f>"><img src="/admin/_widgets/edit.gif" alt="Edit" width="14" height="18" border="0"></a> &nbsp;</td>
+        <td class="sc-nowrap"><a title="<\x3fphp printf(_("Versions of %s"), oTxt(\$list[\$i]['__///__'])) \x3f>" href="<\x3fphp echo \$app->oHREF("/admin/versions.php?record_table=$db_tbl&record_key=$primary_key&boomerang=true&record_val=" . \$list[\$i]['$primary_key']); \x3f>"><img src="/admin/_widgets/subcategory.gif" alt="" width="18" height="14" border="0" /></a> &nbsp;</td>
 
 E_O_F;
@@ -164 +164 @@
 
 echo isset($op) ? '' : <<<E_O_F
-        <td class="sc-nowrap" align="right"><a title="<\x3fphp printf(_("Delete %s"), oTxt(\$list[\$i]['<##>'])) \x3f>" href="<\x3fphp echo \$app->oHREF(\$_SERVER['PHP_SELF'] . "?op=del&$primary_key=" . \$list[\$i]['$primary_key']); \x3f>" onClick="javascript:return confirm('<\x3fphp printf(_("Are you sure you want to delete the record %s? This action is permanent and cannot be undone."), oTxt(\$list[\$i]['<##>'])) \x3f>')"><img src="/admin/_widgets/delete.gif" alt="Delete" width="16" height="17" border="0"></a> &nbsp;</td>
+        <td class="sc-nowrap" align="right"><a title="<\x3fphp printf(_("Delete %s"), oTxt(\$list[\$i]['__///__'])) \x3f>" href="<\x3fphp echo \$app->oHREF(\$_SERVER['PHP_SELF'] . "?op=del&$primary_key=" . \$list[\$i]['$primary_key']); \x3f>" onClick="javascript:return confirm('<\x3fphp printf(_("Are you sure you want to delete the record %s? This action is permanent and cannot be undone."), oTxt(\$list[\$i]['__///__'])) \x3f>')"><img src="/admin/_widgets/delete.gif" alt="Delete" width="16" height="17" border="0"></a> &nbsp;</td>
     </tr>
     <\x3fphp } \x3f>

trunk/bin/module_maker/module.cli.php

@@ -223 +223 @@
 if ($upload_file_capability) {
     // Form arguments
-    $replace['admin_form_tag_init'] = "<form enctype=\"multipart/form-data\" method=\"post\" action=\"<\x3fphp echo \$_SERVER['PHP_SELF']; \x3f>\" class=\"sc-form\">\n<input type=\"hidden\" name=\"MAX_FILE_SIZE\" value=\"<##>\" />";
+    $replace['admin_form_tag_init'] = "<form enctype=\"multipart/form-data\" method=\"post\" action=\"<\x3fphp echo \$_SERVER['PHP_SELF']; \x3f>\" class=\"sc-form\">\n<input type=\"hidden\" name=\"MAX_FILE_SIZE\" value=\"__///__\" />";
 
     // Include statement.
@@ -234 +234 @@
 \$upload = new Upload();
 \$upload->setParam(array(
-    'upload_path' => COMMON_BASE . '/html/_db_files/<##>',
+    'upload_path' => COMMON_BASE . '/html/_db_files/__///__',
     'dest_file_perms' => 0666,
     'allow_overwriting' => false,
@@ -246 +246 @@
 
 // Copy uploaded image name into form data.
-\$_POST['<##>'] = isset(\$_FILES['<##>']) ? \$_FILES['<##>']['name'] : '';
+\$_POST['__///__'] = isset(\$_FILES['__///__']) ? \$_FILES['__///__']['name'] : '';
 
 
@@ -264 +264 @@
 
         // Upload files with prepended primary key.
-        \$new_file = \$upload->process('<##>',  \$%PRIMARY_KEY% . '_' . getFormData('<##>'));
+        \$new_file = \$upload->process('__///__',  \$%PRIMARY_KEY% . '_' . getFormData('__///__'));
 
         // If file upload errors, redirect to edit operation for the inserted record.
@@ -276 +276 @@
 
         // Upload new files.
-        if (getFormData('<##>')) {
+        if (getFormData('__///__')) {
             // Get old file names for deletion.
             \$old_file = \$upload->getFilenameGlob(getFormData('%PRIMARY_KEY%') . '_*');
             // Process new file upload with prepended primary key.
-            \$new_file = \$upload->process('<##>',  getFormData('%PRIMARY_KEY%') . '_' . getFormData('<##>'));
+            \$new_file = \$upload->process('__///__',  getFormData('%PRIMARY_KEY%') . '_' . getFormData('__///__'));
             if (false === \$new_file || \$upload->anyErrors()) {
                 // Upload failed. Reload form. Display errors.

trunk/bin/module_maker/skel/adm_list.ihtml

@@ -8 +8 @@
     <br />
 
-    <input type="text" class="sc-small" size="20" name="search_query" value="<?php echo getFormData('search_query'); ?>" title="<?php echo oTxt(_("Fields searched: <##> %SEARCH_FIELDS%.")); ?>" />
-    <select name="filter_<##>">
-        <?php // printSelectForm('<##>_tbl', "CONCAT(<##>_id, '&mdash;', city, '&mdash;', title)", '<##>_id', getFormData('filter_<##>'), array('Any <##>'), 'ORDER BY <##> ASC'); ?>
+    <input type="text" class="sc-small" size="20" name="search_query" value="<?php echo getFormData('search_query'); ?>" title="<?php echo oTxt(_("Fields searched: __///__ %SEARCH_FIELDS%.")); ?>" />
+    <select name="filter___///__">
+        <?php // printSelectForm('__///___tbl', "CONCAT(__///___id, '&mdash;', city, '&mdash;', title)", '__///___id', getFormData('filter___///__'), array('Any __///__'), 'ORDER BY __///__ ASC'); ?>
     </select>
     <input type="submit" value="<?php echo _("Search"); ?>" />
@@ -28 +28 @@
     <?php for ($i = 0; $i <= $page->last_item - $page->first_item && $page->total_items > 0; $i++) { ?>
     <tr>
-        <td class="sc-padleft sc-nowrap"><a title="<?php printf(_("Edit %s"), oTxt($list[$i]['<##>'])) ?>" href="<?php echo $app->oHREF($_SERVER['PHP_SELF'] . '?op=edit&%PRIMARY_KEY%=' . $list[$i]['%PRIMARY_KEY%']); ?>"><img src="/admin/_widgets/edit.gif" alt="Edit" width="14" height="18" border="0"></a> &nbsp;</td>
-        <td class="sc-padleft sc-nowrap"><a title="<?php printf(_("Versions of %s"), oTxt($list[$i]['<##>'])) ?>" href="<?php echo $app->oHREF('/admin/versions.php?record_table=%DB_TBL%&record_key=%PRIMARY_KEY%&boomerang=true&record_val=' . $list[$i]['%PRIMARY_KEY%']); ?>"><img src="/admin/_widgets/subcategory.gif" alt="" width="18" height="14" border="0" /></a> &nbsp;</td>
+        <td class="sc-padleft sc-nowrap"><a title="<?php printf(_("Edit %s"), oTxt($list[$i]['__///__'])) ?>" href="<?php echo $app->oHREF($_SERVER['PHP_SELF'] . '?op=edit&%PRIMARY_KEY%=' . $list[$i]['%PRIMARY_KEY%']); ?>"><img src="/admin/_widgets/edit.gif" alt="Edit" width="14" height="18" border="0"></a> &nbsp;</td>
+        <td class="sc-padleft sc-nowrap"><a title="<?php printf(_("Versions of %s"), oTxt($list[$i]['__///__'])) ?>" href="<?php echo $app->oHREF('/admin/versions.php?record_table=%DB_TBL%&record_key=%PRIMARY_KEY%&boomerang=true&record_val=' . $list[$i]['%PRIMARY_KEY%']); ?>"><img src="/admin/_widgets/subcategory.gif" alt="" width="18" height="14" border="0" /></a> &nbsp;</td>
 %ADM_LIST_ROWS%
-        <td class="sc-padleft sc-nowrap" align="right"><a title="<?php printf(_("Delete %s"), oTxt($list[$i]['<##>'])) ?>" href="<?php echo $app->oHREF($_SERVER['PHP_SELF'] . "?op=del&%PRIMARY_KEY%=" . $list[$i]['%PRIMARY_KEY%']); ?>" onClick="javascript:return confirm('<?php printf(_("Are you sure you want to delete the record %s? This action is permanent and cannot be undone."), oTxt($list[$i]['<##>'])) ?>')"><img src="/admin/_widgets/delete.gif" alt="Delete" width="16" height="17" border="0"></a> &nbsp;</td>
+        <td class="sc-padleft sc-nowrap" align="right"><a title="<?php printf(_("Delete %s"), oTxt($list[$i]['__///__'])) ?>" href="<?php echo $app->oHREF($_SERVER['PHP_SELF'] . "?op=del&%PRIMARY_KEY%=" . $list[$i]['%PRIMARY_KEY%']); ?>" onClick="javascript:return confirm('<?php printf(_("Are you sure you want to delete the record %s? This action is permanent and cannot be undone."), oTxt($list[$i]['__///__'])) ?>')"><img src="/admin/_widgets/delete.gif" alt="Delete" width="16" height="17" border="0"></a> &nbsp;</td>
     </tr>
     <?php } ?>

trunk/bin/module_maker/skel/admin.php

@@ -50 +50 @@
 // Search limiters retain their values between page requests.
 $app->carryQuery('search_query');
-$app->carryQuery('filter_<##>');
+$app->carryQuery('filter___///__');
 %ADMIN_UPLOAD_CONFIG%
 /********************************************************************
@@ -235 +235 @@
 
     // Lock this record.
-    $lock->set('%DB_TBL%', '%PRIMARY_KEY%', $id, $frm['<##>']);
+    $lock->set('%DB_TBL%', '%PRIMARY_KEY%', $id, $frm['__///__']);
 
     // Set misc values for the form.
@@ -268 +268 @@
     // Get the information for this object.
     $qid = $db->query("
-        SELECT <##>
+        SELECT __///__
         FROM %DB_TBL%
         WHERE %PRIMARY_KEY% = '" . $db->escapeString($id) . "'
@@ -301 +301 @@
     // Create version.
     $version = Version::getInstance($GLOBALS['auth']);
-    $version->create('%DB_TBL%', '%PRIMARY_KEY%', $last_insert_id, $frm['<##>']);
-
-    $app->raiseMsg(sprintf(_("The %ITEM_TITLE% <em>%s</em> has been added."), $frm['<##>']), MSG_SUCCESS, __FILE__, __LINE__);
+    $version->create('%DB_TBL%', '%PRIMARY_KEY%', $last_insert_id, $frm['__///__']);
+
+    $app->raiseMsg(sprintf(_("The %ITEM_TITLE% <em>%s</em> has been added."), $frm['__///__']), MSG_SUCCESS, __FILE__, __LINE__);
 
     return $last_insert_id;
@@ -326 +326 @@
     // Create version.
     $version = Version::getInstance($GLOBALS['auth']);
-    $version->create('%DB_TBL%', '%PRIMARY_KEY%', $frm['%PRIMARY_KEY%'], $frm['<##>']);
-
-    $app->raiseMsg(sprintf(_("The %ITEM_TITLE% <em>%s</em> has been updated."), $frm['<##>']), MSG_SUCCESS, __FILE__, __LINE__);
+    $version->create('%DB_TBL%', '%PRIMARY_KEY%', $frm['%PRIMARY_KEY%'], $frm['__///__']);
+
+    $app->raiseMsg(sprintf(_("The %ITEM_TITLE% <em>%s</em> has been updated."), $frm['__///__']), MSG_SUCCESS, __FILE__, __LINE__);
 
     // Unlock record.
@@ -352 +352 @@
     }
 
-    if (getFormData('filter_<##>', false)) {
+    if (getFormData('filter___///__', false)) {
         // Limit by filter.
-        $where_clause .= (empty($where_clause) ? 'WHERE' : 'AND') . " <##> = '" . $db->escapeString(getFormData('filter_<##>')) . "'";
+        $where_clause .= (empty($where_clause) ? 'WHERE' : 'AND') . " __///__ = '" . $db->escapeString(getFormData('filter___///__')) . "'";
     }
 

trunk/bin/module_maker/skel/public.ihtml

@@ -1 +1 @@
 <p><?php echo nl2br(fancyTxt(oTxt($item['content'], true))); ?></p>
-<p><em><?php echo sprintf(_("Published %s"), date($app->getParam('date_format'), strtotime($item['<##>']))); ?></em></p>
+<p><em><?php echo sprintf(_("Published %s"), date($app->getParam('date_format'), strtotime($item['__///__']))); ?></em></p>
 
 <!--

trunk/bin/module_maker/skel/public.php

@@ -38 +38 @@
         WHERE %PRIMARY_KEY% = '" . $db->escapeString(getFormData('%PRIMARY_KEY%')) . "'
         AND publish = 'true'
-        <##>AND (publish_date <= CURDATE() OR publish_date = '0000-00-00')
-        <##>AND (expire_date > CURDATE() OR expire_date = '0000-00-00')
+        __///__AND (publish_date <= CURDATE() OR publish_date = '0000-00-00')
+        __///__AND (expire_date > CURDATE() OR expire_date = '0000-00-00')
     ");
     if (!$item = mysql_fetch_assoc($qid)) {
@@ -54 +54 @@
 
     // Set title and main template.
-    $nav->addPage($item['<##>']);
+    $nav->addPage($item['__///__']);
     $main_template = '%PUBLIC_DETAIL_TEMPLATE%';
 

trunk/bin/module_maker/skel/public_list.ihtml

@@ -10 +10 @@
         <?php } ?>
         <p>
-        <em><?php echo date($app->getParam('date_format'), strtotime($%NAME_SINGULAR%_list[$i]['<##>'])); ?></em> &mdash; <?php echo nl2br(fancyTxt(oTxt($%NAME_SINGULAR%_list[$i]['summary'], true))); ?>
+        <em><?php echo date($app->getParam('date_format'), strtotime($%NAME_SINGULAR%_list[$i]['__///__'])); ?></em> &mdash; <?php echo nl2br(fancyTxt(oTxt($%NAME_SINGULAR%_list[$i]['summary'], true))); ?>
 
         <?php if (strlen(trim($%NAME_SINGULAR%_list[$i]['content'])) > 0) { // Link only if content is available. ?>

trunk/bin/module_maker/sql.cli.php

@@ -52 +52 @@
 
 $sort_columns = '';
-$primary_key = '<##>';
+$primary_key = '__///__';
 
 // Loop through columns

trunk/docs/example_script_template.php

@@ -1 +1 @@
 <?php
 /**
- * <##>
+ * __///__
  * Code by Strangecode :: www.strangecode.com :: This document contains copyrighted information.
  * @author  Quinn Comendant <quinn@strangecode.com>
  * @version 1.0
- * @since   <##>
+ * @since   __///__
  */
 

trunk/lib/App.inc.php

@@ -152 +152 @@
     {
         // Set namespace of application instance.
-        $this->_ns = '_app_' . $namespace;
+        $this->_ns = $namespace;
 
         // Initialize default parameters.
@@ -281 +281 @@
             session_start();
 
-            if (!isset($_SESSION[$this->_ns])) {
+            if (!isset($_SESSION['_app'][$this->_ns])) {
                 // Access session data using: $_SESSION['...'].
                 // Initialize here _after_ session has started.
-                $_SESSION[$this->_ns] = array(
+                $_SESSION['_app'][$this->_ns] = array(
                     'messages' => array(),
                     'boomerang' => array('url'),
@@ -363 +363 @@
         // Save message in session under unique key to avoid duplicate messages.
         $msg_id = md5($type . $message . $file . $line);
-        $_SESSION[$this->_ns]['messages'][$msg_id] = array(
+        $_SESSION['_app'][$this->_ns]['messages'][$msg_id] = array(
             'type'    => $type,
             'message' => $message,
             'file'    => $file,
             'line'    => $line,
-            'count'   => (isset($_SESSION[$this->_ns]['messages'][$msg_id]['count']) ? (1 + $_SESSION[$this->_ns]['messages'][$msg_id]['count']) : 1)
+            'count'   => (isset($_SESSION['_app'][$this->_ns]['messages'][$msg_id]['count']) ? (1 + $_SESSION['_app'][$this->_ns]['messages'][$msg_id]['count']) : 1)
         );
 
@@ -391 +391 @@
         }
 
-        return isset($_SESSION[$this->_ns]['messages']) ? $_SESSION[$this->_ns]['messages'] : array();
+        return isset($_SESSION['_app'][$this->_ns]['messages']) ? $_SESSION['_app'][$this->_ns]['messages'] : array();
     }
     
@@ -408 +408 @@
         }
         
-        $_SESSION[$this->_ns]['messages'] = array();
+        $_SESSION['_app'][$this->_ns]['messages'] = array();
     }
 
@@ -843 +843 @@
         // Get URL from stored boomerang. Allow non specific URL if ID not valid.
         if ($this->validBoomerangURL($id, true)) {
-            if (isset($id) && isset($_SESSION[$this->_ns]['boomerang']['url'][$id])) {
-                $url = $_SESSION[$this->_ns]['boomerang']['url'][$id];
+            if (isset($id) && isset($_SESSION['_app'][$this->_ns]['boomerang']['url'][$id])) {
+                $url = $_SESSION['_app'][$this->_ns]['boomerang']['url'][$id];
                 $this->logMsg(sprintf('dieBoomerangURL(%s) found: %s', $id, $url), LOG_DEBUG, __FILE__, __LINE__);
             } else {
-                $url = end($_SESSION[$this->_ns]['boomerang']['url']);
+                $url = end($_SESSION['_app'][$this->_ns]['boomerang']['url']);
                 $this->logMsg(sprintf('dieBoomerangURL(%s) using: %s', $id, $url), LOG_DEBUG, __FILE__, __LINE__);
             }
@@ -866 +866 @@
         // A redirection will never happen immediately twice.
         // Set the time so ensure this doesn't happen.
-        $_SESSION[$this->_ns]['boomerang']['time'] = time();
+        $_SESSION['_app'][$this->_ns]['boomerang']['time'] = time();
         $this->dieURL($url, $carry_args);
     }
@@ -890 +890 @@
             $url = preg_replace('/boomerang=[\w]+/', '', $url);
 
-            if (isset($_SESSION[$this->_ns]['boomerang']['url']) && is_array($_SESSION[$this->_ns]['boomerang']['url']) && !empty($_SESSION[$this->_ns]['boomerang']['url'])) {
+            if (isset($_SESSION['_app'][$this->_ns]['boomerang']['url']) && is_array($_SESSION['_app'][$this->_ns]['boomerang']['url']) && !empty($_SESSION['_app'][$this->_ns]['boomerang']['url'])) {
                 // If the URL currently exists in the boomerang array, delete.
-                while ($existing_key = array_search($url, $_SESSION[$this->_ns]['boomerang']['url'])) {
-                    unset($_SESSION[$this->_ns]['boomerang']['url'][$existing_key]);
+                while ($existing_key = array_search($url, $_SESSION['_app'][$this->_ns]['boomerang']['url'])) {
+                    unset($_SESSION['_app'][$this->_ns]['boomerang']['url'][$existing_key]);
                 }
             }
 
             if (isset($id)) {
-                $_SESSION[$this->_ns]['boomerang']['url'][$id] = $url;
+                $_SESSION['_app'][$this->_ns]['boomerang']['url'][$id] = $url;
             } else {
-                $_SESSION[$this->_ns]['boomerang']['url'][] = $url;
+                $_SESSION['_app'][$this->_ns]['boomerang']['url'][] = $url;
             }
             $this->logMsg(sprintf('setBoomerangURL(%s): %s', $id, $url), LOG_DEBUG, __FILE__, __LINE__);
@@ -923 +923 @@
 
         if (isset($id)) {
-            if (isset($_SESSION[$this->_ns]['boomerang']['url'][$id])) {
-                return $_SESSION[$this->_ns]['boomerang']['url'][$id];
+            if (isset($_SESSION['_app'][$this->_ns]['boomerang']['url'][$id])) {
+                return $_SESSION['_app'][$this->_ns]['boomerang']['url'][$id];
             } else {
                 return '';
             }
-        } else if (is_array($_SESSION[$this->_ns]['boomerang']['url'])) {
-            return end($_SESSION[$this->_ns]['boomerang']['url']);
+        } else if (is_array($_SESSION['_app'][$this->_ns]['boomerang']['url'])) {
+            return end($_SESSION['_app'][$this->_ns]['boomerang']['url']);
         } else {
             return false;
@@ -949 +949 @@
         $this->logMsg(sprintf('deleteBoomerangURL(%s): %s', $id, $this->getBoomerangURL($id)), LOG_DEBUG, __FILE__, __LINE__);
 
-        if (isset($id) && isset($_SESSION[$this->_ns]['boomerang']['url'][$id])) {
-            unset($_SESSION[$this->_ns]['boomerang']['url'][$id]);
-        } else if (is_array($_SESSION[$this->_ns]['boomerang']['url'])) {
-            array_pop($_SESSION[$this->_ns]['boomerang']['url']);
+        if (isset($id) && isset($_SESSION['_app'][$this->_ns]['boomerang']['url'][$id])) {
+            unset($_SESSION['_app'][$this->_ns]['boomerang']['url'][$id]);
+        } else if (is_array($_SESSION['_app'][$this->_ns]['boomerang']['url'])) {
+            array_pop($_SESSION['_app'][$this->_ns]['boomerang']['url']);
         }
     }
@@ -969 +969 @@
         }
 
-        if (!isset($_SESSION[$this->_ns]['boomerang']['url'])) {
+        if (!isset($_SESSION['_app'][$this->_ns]['boomerang']['url'])) {
             $this->logMsg(sprintf('validBoomerangURL(%s) no boomerang URL set.', $id), LOG_DEBUG, __FILE__, __LINE__);
             return false;
@@ -977 +977 @@
         // a boomerang redirection will always occur at least several seconds after the last boomerang redirect
         // or a boomerang being set.
-        $boomerang_time = isset($_SESSION[$this->_ns]['boomerang']['time']) ? $_SESSION[$this->_ns]['boomerang']['time'] : 0;
+        $boomerang_time = isset($_SESSION['_app'][$this->_ns]['boomerang']['time']) ? $_SESSION['_app'][$this->_ns]['boomerang']['time'] : 0;
 
         $url = '';
-        if (isset($id) && isset($_SESSION[$this->_ns]['boomerang']['url'][$id])) {
-            $url = $_SESSION[$this->_ns]['boomerang']['url'][$id];
+        if (isset($id) && isset($_SESSION['_app'][$this->_ns]['boomerang']['url'][$id])) {
+            $url = $_SESSION['_app'][$this->_ns]['boomerang']['url'][$id];
         } else if (!isset($id) || $use_nonspecificboomerang) {
             // Use non specific boomerang if available.
-            $url = end($_SESSION[$this->_ns]['boomerang']['url']);
+            $url = end($_SESSION['_app'][$this->_ns]['boomerang']['url']);
         }
 

trunk/lib/Auth_File.inc.php

@@ -68 +68 @@
     function Auth_File($namespace='null')
     {
-        $this->_ns = '_auth_' . $namespace;
+        $this->_ns = $namespace;
 
         // Initialize default parameters.
@@ -114 +114 @@
     function clear()
     {
-        $_SESSION[$this->_ns] = array('authenticated' => false);
+        $_SESSION['_auth_file'][$this->_ns] = array('authenticated' => false);
     }
 
@@ -127 +127 @@
     function set($key, $val)
     {
-        if (!isset($_SESSION[$this->_ns]['user_data'])) {
-            $_SESSION[$this->_ns]['user_data'] = array();
-        }
-        $_SESSION[$this->_ns]['user_data'][$key] = $val;
+        if (!isset($_SESSION['_auth_file'][$this->_ns]['user_data'])) {
+            $_SESSION['_auth_file'][$this->_ns]['user_data'] = array();
+        }
+        $_SESSION['_auth_file'][$this->_ns]['user_data'][$key] = $val;
     }
 
@@ -143 +143 @@
     function get($key, $default='')
     {
-        if (isset($_SESSION[$this->_ns][$key])) {
-            return $_SESSION[$this->_ns][$key];
-        } else if (isset($_SESSION[$this->_ns]['user_data'][$key])) {
-            return $_SESSION[$this->_ns]['user_data'][$key];
+        if (isset($_SESSION['_auth_file'][$this->_ns][$key])) {
+            return $_SESSION['_auth_file'][$this->_ns][$key];
+        } else if (isset($_SESSION['_auth_file'][$this->_ns]['user_data'][$key])) {
+            return $_SESSION['_auth_file'][$this->_ns]['user_data'][$key];
         } else {
             return $default;
@@ -209 +209 @@
         }
         
-        $_SESSION[$this->_ns] = array(
+        $_SESSION['_auth_file'][$this->_ns] = array(
             'authenticated' => true,
             'username' => $username,
@@ -238 +238 @@
         if ($trusted_net = ipInRange(getRemoteAddr(), $this->_params['trusted_networks'])) {
             $user_in_trusted_network = true;
-            $app->logMsg(sprintf('User %s accessing from trusted network %s', $_SESSION[$this->_ns]['username'], $trusted_net), LOG_DEBUG, __FILE__, __LINE__);
+            $app->logMsg(sprintf('User %s accessing from trusted network %s', $_SESSION['_auth_file'][$this->_ns]['username'], $trusted_net), LOG_DEBUG, __FILE__, __LINE__);
         } else if (preg_match('/proxy.aol.com$/i', getRemoteAddr(true))) {
             $user_in_trusted_network = true;
-            $app->logMsg(sprintf('User %s accessing from trusted network proxy.aol.com', $_SESSION[$this->_ns]['username']), LOG_DEBUG, __FILE__, __LINE__);
+            $app->logMsg(sprintf('User %s accessing from trusted network proxy.aol.com', $_SESSION['_auth_file'][$this->_ns]['username']), LOG_DEBUG, __FILE__, __LINE__);
         } else {
             $user_in_trusted_network = false;
@@ -247 +247 @@
 
         // Test login with information stored in session. Skip IP matching for users from trusted networks.
-        if (isset($_SESSION[$this->_ns])
-            && true === $_SESSION[$this->_ns]['authenticated']
-            && !empty($_SESSION[$this->_ns]['username'])
-            && strtotime($_SESSION[$this->_ns]['login_datetime']) > time() - $this->_params['login_timeout']
-            && strtotime($_SESSION[$this->_ns]['last_access_datetime']) > time() - $this->_params['idle_timeout']
-            && ($_SESSION[$this->_ns]['remote_ip'] == getRemoteAddr() || $user_in_trusted_network)
+        if (isset($_SESSION['_auth_file'][$this->_ns])
+            && true === $_SESSION['_auth_file'][$this->_ns]['authenticated']
+            && !empty($_SESSION['_auth_file'][$this->_ns]['username'])
+            && strtotime($_SESSION['_auth_file'][$this->_ns]['login_datetime']) > time() - $this->_params['login_timeout']
+            && strtotime($_SESSION['_auth_file'][$this->_ns]['last_access_datetime']) > time() - $this->_params['idle_timeout']
+            && ($_SESSION['_auth_file'][$this->_ns]['remote_ip'] == getRemoteAddr() || $user_in_trusted_network)
         ) {
             // User is authenticated!
-            $_SESSION[$this->_ns]['last_access_datetime'] = date('Y-m-d H:i:s');
+            $_SESSION['_auth_file'][$this->_ns]['last_access_datetime'] = date('Y-m-d H:i:s');
             return true;
-        } else if (isset($_SESSION[$this->_ns]) && true === $_SESSION[$this->_ns]['authenticated']) {
-            if (strtotime($_SESSION[$this->_ns]['last_access_datetime']) > time() - 43200) {
+        } else if (isset($_SESSION['_auth_file'][$this->_ns]) && true === $_SESSION['_auth_file'][$this->_ns]['authenticated']) {
+            if (strtotime($_SESSION['_auth_file'][$this->_ns]['last_access_datetime']) > time() - 43200) {
                 // Only raise message if last session is less than 12 hours old.
                 $app->raiseMsg(_("Your session has closed. You need to log-in again."), MSG_NOTICE, __FILE__, __LINE__);
@@ -265 +265 @@
             // Log the reason for login expiration.
             $expire_reasons = array();
-            if (empty($_SESSION[$this->_ns]['username'])) {
+            if (empty($_SESSION['_auth_file'][$this->_ns]['username'])) {
                 $expire_reasons[] = 'username not found';
             }
-            if (strtotime($_SESSION[$this->_ns]['login_datetime']) <= time() - $this->_params['login_timeout']) {
+            if (strtotime($_SESSION['_auth_file'][$this->_ns]['login_datetime']) <= time() - $this->_params['login_timeout']) {
                 $expire_reasons[] = 'login_timeout expired';
             }
-            if (strtotime($_SESSION[$this->_ns]['last_access_datetime']) <= time() - $this->_params['idle_timeout']) {
+            if (strtotime($_SESSION['_auth_file'][$this->_ns]['last_access_datetime']) <= time() - $this->_params['idle_timeout']) {
                 $expire_reasons[] = 'idle_timeout expired';
             }
-            if ($_SESSION[$this->_ns]['remote_ip'] != getRemoteAddr() && !$user_in_trusted_network) {
-                $expire_reasons[] = sprintf('remote_ip not matched (%s != %s)', $_SESSION[$this->_ns]['remote_ip'], getRemoteAddr());
-            }
-            $app->logMsg(sprintf('User %s session expired: %s', $_SESSION[$this->_ns]['username'], join(', ', $expire_reasons)), LOG_INFO, __FILE__, __LINE__);
+            if ($_SESSION['_auth_file'][$this->_ns]['remote_ip'] != getRemoteAddr() && !$user_in_trusted_network) {
+                $expire_reasons[] = sprintf('remote_ip not matched (%s != %s)', $_SESSION['_auth_file'][$this->_ns]['remote_ip'], getRemoteAddr());
+            }
+            $app->logMsg(sprintf('User %s session expired: %s', $_SESSION['_auth_file'][$this->_ns]['username'], join(', ', $expire_reasons)), LOG_INFO, __FILE__, __LINE__);
         }
 

trunk/lib/Auth_SQL.inc.php

@@ -100 +100 @@
         $app =& App::getInstance();
         
-        $this->_ns = '_auth_' . $namespace;
+        $this->_ns = $namespace;
 
         // Initialize default parameters.
@@ -264 +264 @@
             WHERE " . $this->_params['db_primary_key'] . " = '" . $this->get('user_id') . "'
         ");
-        $_SESSION[$this->_ns] = array('authenticated' => false);
+        $_SESSION['_auth_sql'][$this->_ns] = array('authenticated' => false);
     }
 
@@ -276 +276 @@
     function set($key, $val)
     {
-        if (!isset($_SESSION[$this->_ns]['user_data'])) {
-            $_SESSION[$this->_ns]['user_data'] = array();
-        }
-        $_SESSION[$this->_ns]['user_data'][$key] = $val;
+        if (!isset($_SESSION['_auth_sql'][$this->_ns]['user_data'])) {
+            $_SESSION['_auth_sql'][$this->_ns]['user_data'] = array();
+        }
+        $_SESSION['_auth_sql'][$this->_ns]['user_data'][$key] = $val;
     }
 
@@ -292 +292 @@
     function get($key, $default='')
     {
-        if (isset($_SESSION[$this->_ns][$key])) {
-            return $_SESSION[$this->_ns][$key];
-        } else if (isset($_SESSION[$this->_ns]['user_data'][$key])) {
-            return $_SESSION[$this->_ns]['user_data'][$key];
+        if (isset($_SESSION['_auth_sql'][$this->_ns][$key])) {
+            return $_SESSION['_auth_sql'][$this->_ns][$key];
+        } else if (isset($_SESSION['_auth_sql'][$this->_ns]['user_data'][$key])) {
+            return $_SESSION['_auth_sql'][$this->_ns]['user_data'][$key];
         } else {
             return $default;
@@ -373 +373 @@
 
         // Register authenticated session.
-        $_SESSION[$this->_ns] = array(
+        $_SESSION['_auth_sql'][$this->_ns] = array(
             'authenticated'         => true,
             'user_id'               => $user_data['user_id'],
@@ -497 +497 @@
 
         // User login test need only be run once per script execution. We cache the result in the session.
-        if ($this->_authentication_tested && isset($_SESSION[$this->_ns]['authenticated'])) {
-            return $_SESSION[$this->_ns]['authenticated'];
+        if ($this->_authentication_tested && isset($_SESSION['_auth_sql'][$this->_ns]['authenticated'])) {
+            return $_SESSION['_auth_sql'][$this->_ns]['authenticated'];
         }
 
@@ -521 +521 @@
 
         // Test login with information stored in session. Skip IP matching for users from trusted networks.
-        if (isset($_SESSION[$this->_ns])
-            && true === $_SESSION[$this->_ns]['authenticated']
-            && !empty($_SESSION[$this->_ns]['username'])
-            && strtotime($_SESSION[$this->_ns]['login_datetime']) > time() - $this->_params['login_timeout']
-            && strtotime($_SESSION[$this->_ns]['last_access_datetime']) > time() - $this->_params['idle_timeout']
-            && ($_SESSION[$this->_ns]['remote_ip'] == getRemoteAddr() || $user_in_trusted_network)
+        if (isset($_SESSION['_auth_sql'][$this->_ns])
+            && true === $_SESSION['_auth_sql'][$this->_ns]['authenticated']
+            && !empty($_SESSION['_auth_sql'][$this->_ns]['username'])
+            && strtotime($_SESSION['_auth_sql'][$this->_ns]['login_datetime']) > time() - $this->_params['login_timeout']
+            && strtotime($_SESSION['_auth_sql'][$this->_ns]['last_access_datetime']) > time() - $this->_params['idle_timeout']
+            && ($_SESSION['_auth_sql'][$this->_ns]['remote_ip'] == getRemoteAddr() || $user_in_trusted_network)
         ) {
             // User is authenticated!
-            $_SESSION[$this->_ns]['last_access_datetime'] = date('Y-m-d H:i:s');
+            $_SESSION['_auth_sql'][$this->_ns]['last_access_datetime'] = date('Y-m-d H:i:s');
 
             // Update the DB with the last_access_datetime and increment the seconds_online.
@@ -544 +544 @@
                 $app->logMsg(sprintf('User update failed. Record not found for user %s (%s).', $this->get('user_id'), $this->get('username')), LOG_NOTICE, __FILE__, __LINE__);
             }
-        } else if (isset($_SESSION[$this->_ns]) && true === $_SESSION[$this->_ns]['authenticated']) {
+        } else if (isset($_SESSION['_auth_sql'][$this->_ns]) && true === $_SESSION['_auth_sql'][$this->_ns]['authenticated']) {
             // User is authenticated, but login has expired.
-            if (strtotime($_SESSION[$this->_ns]['last_access_datetime']) > time() - 43200) {
+            if (strtotime($_SESSION['_auth_sql'][$this->_ns]['last_access_datetime']) > time() - 43200) {
                 // Only raise message if last session is less than 12 hours old.
                 $app->raiseMsg(_("Your session has expired. You need to log-in again."), MSG_NOTICE, __FILE__, __LINE__);
@@ -553 +553 @@
             // Log the reason for login expiration.
             $expire_reasons = array();
-            if (empty($_SESSION[$this->_ns]['username'])) {
+            if (empty($_SESSION['_auth_sql'][$this->_ns]['username'])) {
                 $expire_reasons[] = 'username not found';
             }
-            if (strtotime($_SESSION[$this->_ns]['login_datetime']) <= time() - $this->_params['login_timeout']) {
+            if (strtotime($_SESSION['_auth_sql'][$this->_ns]['login_datetime']) <= time() - $this->_params['login_timeout']) {
                 $expire_reasons[] = 'login_timeout expired';
             }
-            if (strtotime($_SESSION[$this->_ns]['last_access_datetime']) <= time() - $this->_params['idle_timeout']) {
+            if (strtotime($_SESSION['_auth_sql'][$this->_ns]['last_access_datetime']) <= time() - $this->_params['idle_timeout']) {
                 $expire_reasons[] = 'idle_timeout expired';
             }
-            if ($_SESSION[$this->_ns]['remote_ip'] != getRemoteAddr() && !$user_in_trusted_network) {
-                $expire_reasons[] = sprintf('remote_ip not matched (%s != %s)', $_SESSION[$this->_ns]['remote_ip'], getRemoteAddr());
+            if ($_SESSION['_auth_sql'][$this->_ns]['remote_ip'] != getRemoteAddr() && !$user_in_trusted_network) {
+                $expire_reasons[] = sprintf('remote_ip not matched (%s != %s)', $_SESSION['_auth_sql'][$this->_ns]['remote_ip'], getRemoteAddr());
             }
             $app->logMsg(sprintf('User %s (%s) session expired: %s', $this->get('user_id'), $this->get('username'), join(', ', $expire_reasons)), LOG_INFO, __FILE__, __LINE__);

trunk/lib/Cache.inc.php

@@ -47 +47 @@
     function Cache($namespace='')
     {
-        $this->_ns = '_cache' . $namespace;
-        
-        if (!isset($_SESSION[$this->_ns])) {
+        $this->_ns = $namespace;
+        
+        if (!isset($_SESSION['_cache'][$this->_ns])) {
             $this->clear();
         }
@@ -146 +146 @@
 
         // Remove any value already stored under this key.
-        unset($_SESSION[$this->_ns][$keyhash]);
+        unset($_SESSION['_cache'][$this->_ns][$keyhash]);
 
         // Continue to prune the cache if its size is greater than stack_size_limit, but keep at least min_items.
-        while (strlen(serialize($_SESSION[$this->_ns])) + $var_len >= $this->getParam('stack_size_limit') && sizeof($_SESSION[$this->_ns]) >= $this->getParam('min_items')) {
-            array_shift($_SESSION[$this->_ns]);
+        while (strlen(serialize($_SESSION['_cache'][$this->_ns])) + $var_len >= $this->getParam('stack_size_limit') && sizeof($_SESSION['_cache'][$this->_ns]) >= $this->getParam('min_items')) {
+            array_shift($_SESSION['_cache'][$this->_ns]);
         }
 
         // Save this value under the specified key.
-        $_SESSION[$this->_ns][$keyhash] =& $var;
+        $_SESSION['_cache'][$this->_ns][$keyhash] =& $var;
 
         if ($var_len >= 1024000) {
@@ -182 +182 @@
 
         $keyhash = md5($key);
-        if (isset($_SESSION[$this->_ns][$keyhash])) {
+        if (isset($_SESSION['_cache'][$this->_ns][$keyhash])) {
             $app->logMsg(sprintf('Retreiving %s from cache.', $key), LOG_DEBUG, __FILE__, __LINE__);
             // Move the accessed cached datum to the top of the stack. Maybe somebody knows a better way to do this?
-            $tmp =& $_SESSION[$this->_ns][$keyhash];
-            unset($_SESSION[$this->_ns][$keyhash]);
-            $_SESSION[$this->_ns][$keyhash] =& $tmp;
+            $tmp =& $_SESSION['_cache'][$this->_ns][$keyhash];
+            unset($_SESSION['_cache'][$this->_ns][$keyhash]);
+            $_SESSION['_cache'][$this->_ns][$keyhash] =& $tmp;
             // Return the unserialized datum.
-            return unserialize($_SESSION[$this->_ns][$keyhash]);
+            return unserialize($_SESSION['_cache'][$this->_ns][$keyhash]);
         } else {
             return false;
@@ -208 +208 @@
 
         $keyhash = md5($key);
-        return array_key_exists($keyhash, $_SESSION[$this->_ns]);
+        return array_key_exists($keyhash, $_SESSION['_cache'][$this->_ns]);
     }
 
@@ -220 +220 @@
     {
         $keyhash = md5($key);
-        unset($_SESSION[$this->_ns][$keyhash]);
+        unset($_SESSION['_cache'][$this->_ns][$keyhash]);
     }
     
@@ -233 +233 @@
     function clear()
     {
-        $_SESSION[$this->_ns] = array();
+        $_SESSION['_cache'][$this->_ns] = array();
     }
 

trunk/lib/ImageThumb.inc.php

@@ -320 +320 @@
         if (!$this->_validFileExtension($file_name)) {
             $this->_raiseMsg(sprintf(_("Image resizing failed: source image %s not a valid type. It must have one of the following file name extensions: %s"), $file_name, join(', ', $this->getParam('valid_file_extensions'))), MSG_ERR, __FILE__, __LINE__);
-            $app->logMsg(sprintf('Image resizing failed: source image not of valid type: %s', $source_file), LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Image resizing failed: source image not of valid type: %s', $source_file), LOG_WARNING, __FILE__, __LINE__);
             return false;
         }
@@ -382 +382 @@
             if (IMAGETHUMB_METHOD_NETPBM === $this->getParam('resize_method') && file_exists($this->getParam('anytopnm_binary')) && file_exists($this->getParam('pnmscale_binary')) && file_exists($this->getParam('cjpeg_binary'))) {
                 // Resize using Netpbm binaries.
-                $app->logMsg(sprintf('Resizing with Netpbm: %s', $file_name), LOG_DEBUG, __FILE__, __LINE__);
+                // $app->logMsg(sprintf('Resizing with Netpbm: %s', $source_file), LOG_DEBUG, __FILE__, __LINE__);
                 $return_val += $this->_resizeWithNetpbm($source_file, $dest_file, $spec);
             } else if (IMAGETHUMB_METHOD_GD === $this->getParam('resize_method') && extension_loaded('gd')) {
                 // Resize with GD.
-                $app->logMsg(sprintf('Resizing with GD: %s', $file_name), LOG_DEBUG, __FILE__, __LINE__);
+                // $app->logMsg(sprintf('Resizing with GD: %s', $source_file), LOG_DEBUG, __FILE__, __LINE__);
                 $return_val += $this->_resizeWithGD($source_file, $dest_file, $spec);
             } else {
@@ -739 +739 @@
                 }
                 if (!file_exists($dest_dir)) {
-                    if (phpversion() > '5' && false) { ///
+                    if (phpversion() > '5') {
                         // Recursive.
-                        if (! ($ret = mkdir($dest_dir, $this->getParam('dest_dir_perms'), true))) {
+                        if (!file_exists($dest_dir) && !($ret = mkdir($dest_dir, $this->getParam('dest_dir_perms'), true))) {
                             $return_val++;
                             $app->logMsg(sprintf('mkdir failure: %s', $dest_dir), LOG_ERR, __FILE__, __LINE__);

trunk/lib/PageNumbers.inc.php

@@ -66 +66 @@
         $this->url_base = $_SERVER['PHP_SELF'] . '?page_number=';
         
-        $this->prefs = new Prefs();
+        $this->prefs = new Prefs($_SERVER['PHP_SELF']);
         $this->prefs->setParam(array('persistent' => false));
     }

trunk/lib/Prefs.inc.php

@@ -63 +63 @@
         $app =& App::getInstance();
 
-        $this->_ns = '_prefs_' . $namespace;
+        $this->_ns = $namespace;
         
         // Initialized the prefs array.
-        if (!isset($_SESSION[$this->_ns])) {
+        if (!isset($_SESSION['_prefs'][$this->_ns])) {
             $this->clear();
         }
@@ -158 +158 @@
     {
         if (isset($defaults) && is_array($defaults)) {
-            $_SESSION[$this->_ns]['defaults'] = array_merge($_SESSION[$this->_ns]['defaults'], $defaults);
+            $_SESSION['_prefs'][$this->_ns]['defaults'] = array_merge($_SESSION['_prefs'][$this->_ns]['defaults'], $defaults);
         }
     }
@@ -180 +180 @@
         }
         
-        if (!isset($_SESSION[$this->_ns]['defaults'][$key]) || $_SESSION[$this->_ns]['defaults'][$key] != $val || isset($_SESSION[$this->_ns]['persistent'][$key])) {
-            $_SESSION[$this->_ns]['persistent'][$key] = $val;            
+        if (!isset($_SESSION['_prefs'][$this->_ns]['defaults'][$key]) || $_SESSION['_prefs'][$this->_ns]['defaults'][$key] != $val || isset($_SESSION['_prefs'][$this->_ns]['persistent'][$key])) {
+            $_SESSION['_prefs'][$this->_ns]['persistent'][$key] = $val;            
         }
     }
@@ -196 +196 @@
     {
         $app =& App::getInstance();
-        if (array_key_exists($key, $_SESSION[$this->_ns]['persistent'])) {
-            return $_SESSION[$this->_ns]['persistent'][$key];
-        } else if (array_key_exists($key, $_SESSION[$this->_ns]['defaults'])) {
-            return $_SESSION[$this->_ns]['defaults'][$key];
+        if (array_key_exists($key, $_SESSION['_prefs'][$this->_ns]['persistent'])) {
+            return $_SESSION['_prefs'][$this->_ns]['persistent'][$key];
+        } else if (array_key_exists($key, $_SESSION['_prefs'][$this->_ns]['defaults'])) {
+            return $_SESSION['_prefs'][$this->_ns]['defaults'][$key];
         } else {
-            $app->logMsg(sprintf('Key not found in prefs cache: %s', $key), LOG_NOTICE, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Key not found in prefs cache: %s', $key), LOG_DEBUG, __FILE__, __LINE__);
             return null;
         }
@@ -214 +214 @@
     function exists($key)
     {
-        return array_key_exists($key, $_SESSION[$this->_ns]['persistent']);
+        return array_key_exists($key, $_SESSION['_prefs'][$this->_ns]['persistent']);
     }
 
@@ -224 +224 @@
     function delete($key)
     {
-        unset($_SESSION[$this->_ns]['persistent'][$key]);
+        unset($_SESSION['_prefs'][$this->_ns]['persistent'][$key]);
     }
 
@@ -233 +233 @@
     function clear()
     {
-        $_SESSION[$this->_ns] = array(
+        $_SESSION['_prefs'][$this->_ns] = array(
             'loaded' => false,
             'load_datetime' => '1970-01-01',
@@ -286 +286 @@
         ");
         while (list($key, $val) = mysql_fetch_row($qid)) {
-            $_SESSION[$this->_ns]['persistent'][$key] = $val;
+            $_SESSION['_prefs'][$this->_ns]['persistent'][$key] = $val;
         }
         
-        $app->logMsg(sprintf('Loaded %s prefs from database.', sizeof($_SESSION[$this->_ns]['persistent'])), LOG_DEBUG, __FILE__, __LINE__);
+        $app->logMsg(sprintf('Loaded %s prefs from database.', sizeof($_SESSION['_prefs'][$this->_ns]['persistent'])), LOG_DEBUG, __FILE__, __LINE__);
         
         // Data loaded only once per session.
-        $_SESSION[$this->_ns]['loaded'] = true;
-        $_SESSION[$this->_ns]['load_datetime'] = date('Y-m-d H:i:s');
+        $_SESSION['_prefs'][$this->_ns]['loaded'] = true;
+        $_SESSION['_prefs'][$this->_ns]['load_datetime'] = date('Y-m-d H:i:s');
         
         return true;
@@ -310 +310 @@
     function _isLoaded()
     {
-        if (isset($_SESSION[$this->_ns]['load_datetime'])
-        && strtotime($_SESSION[$this->_ns]['load_datetime']) > time() - $this->getParam('load_timeout')
-        && isset($_SESSION[$this->_ns]['loaded']) 
-        && true === $_SESSION[$this->_ns]['loaded']) {
+        if (isset($_SESSION['_prefs'][$this->_ns]['load_datetime'])
+        && strtotime($_SESSION['_prefs'][$this->_ns]['load_datetime']) > time() - $this->getParam('load_timeout')
+        && isset($_SESSION['_prefs'][$this->_ns]['loaded']) 
+        && true === $_SESSION['_prefs'][$this->_ns]['loaded']) {
             return true;
         } else {
@@ -347 +347 @@
         $this->initDB();
 
-        if (isset($_SESSION[$this->_ns]['persistent']) && is_array($_SESSION[$this->_ns]['persistent'])) {
+        if (isset($_SESSION['_prefs'][$this->_ns]['persistent']) && is_array($_SESSION['_prefs'][$this->_ns]['persistent'])) {
             // Delete old prefs from database.
             $db->query("
@@ -357 +357 @@
             // Insert new prefs.
             $insert_values = array();
-            foreach ($_SESSION[$this->_ns]['persistent'] as $key => $val) {
+            foreach ($_SESSION['_prefs'][$this->_ns]['persistent'] as $key => $val) {
                 $insert_values[] = sprintf("('%s', '%s', '%s', '%s')", $db->escapeString($this->getParam('user_id')), $db->escapeString($this->_ns), $db->escapeString($key), $db->escapeString($val));
             }

trunk/lib/SortOrder.inc.php

@@ -35 +35 @@
     function SortOrder($default_sort = '', $default_order = '')
     {
+        $this->prefs = new Prefs($_SERVER['PHP_SELF']);
+        $this->prefs->setParam(array('persistent' => false));
+
         $this->setDefault($default_sort, $default_order);
 
         $this->default_sort = $default_sort;
-        $this->default_order = $default_order;
-        
-        $this->prefs = new Prefs();
-        $this->prefs->setParam(array('persistent' => false));
+        $this->default_order = $default_order;        
     }
 

trunk/lib/Utilities.inc.php

@@ -250 +250 @@
  * @version     1.1.0
  */
-function humanFileSize($size, $unit=null, $format='%01.2f %s')
+function humanFileSize($size, $max_unit=null, $format='%01.2f %s')
 {
     // Units
@@ -257 +257 @@
 
     // Max unit
-    $unit = array_search((string) $unit, $units);
-    if ($unit === null || $unit === false) {
-        $unit = $ii;
+    $max_unit = array_search((string) $max_unit, $units);
+    if ($max_unit === null || $max_unit === false) {
+        $max_unit = $ii;
     }
 
     // Loop
     $i = 0;
-    while ($unit != $i && $size >= 1024 && $i < $ii) {
+    while ($max_unit != $i && $size >= 1024 && $i < $ii) {
         $size /= 1024;
         $i++;

trunk/tests/AppTest.php

@@ -83 +83 @@
         $expected = 'My message';
         $app->raiseMsg($expected, MSG_NOTICE, __FILE__, __LINE__);
-        $msg = current($_SESSION[$this->App->_ns]['messages']);
+        $msg = current($_SESSION['_app'][$this->App->_ns]['messages']);
         $this->assertEquals($expected, $msg['message']);
     }

trunk/tests/Auth_FileTest.php

@@ -45 +45 @@
         $result = $this->Auth_File->login('testuser', 'testpass');
         $this->assertTrue($result, 'testuser login failed.');
-        $this->assertTrue($_SESSION[$this->Auth_File->_ns]['authenticated'], 'testuser authentication not found in session.');
+        $this->assertTrue($_SESSION['_auth_file'][$this->Auth_File->_ns]['authenticated'], 'testuser authentication not found in session.');
     }
 
@@ -52 +52 @@
         $result = $this->Auth_File->login('testuser', 'testpass');
         $this->Auth_File->clear();
-        $this->assertFalse($_SESSION[$this->Auth_File->_ns]['authenticated'], 'testuser authentication not false in session.');
+        $this->assertFalse($_SESSION['_auth_file'][$this->Auth_File->_ns]['authenticated'], 'testuser authentication not false in session.');
     }
 

trunk/tests/Auth_SQLTest.php

@@ -70 +70 @@
     {
         $this->Auth_SQL->set('testuserkey', 'testuserval');
-        $this->assertEquals('testuserval', $_SESSION[$this->Auth_SQL->_ns]['user_data']['testuserkey']);
+        $this->assertEquals('testuserval', $_SESSION['_auth_sql'][$this->Auth_SQL->_ns]['user_data']['testuserkey']);
     }
 
     function test_get()
     {
-        $_SESSION[$this->Auth_SQL->_ns]['user_data']['testuserkey'] = 'testuserval';
+        $_SESSION['_auth_sql'][$this->Auth_SQL->_ns]['user_data']['testuserkey'] = 'testuserval';
         $val = $this->Auth_SQL->get('testuserkey');
         $this->assertEquals('testuserval', $val);

trunk/tests/EmailTest.php

@@ -94 +94 @@
         $this->assertEquals(41, $gc, 'Unexpected good count.');
         $this->assertEquals(47, $bc, 'Unexpected bad count.');
-        echo "Good addresses: $gc\n";
-        echo "Bad addresses: $bc\n";
+        // echo "Good addresses: $gc\n";
+        // echo "Bad addresses: $bc\n";
 //         echo join("\n", $bad);
 //         echo "\n";