Changeset 295 for trunk/services


Ignore:
Timestamp:
Dec 16, 2007 7:21:57 AM (16 years ago)
Author:
quinn
Message:

Updated example config file. Added admin2.inc.css and minor corrections into HTML. Module maker fixes.

Location:
trunk/services
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/services/admins.php

    r266 r295  
    3939
    4040// Instantiate a sorting object with the default sort and order. Add SQL for each column.
    41 $so = new SortOrder('admin_tbl.admin_id', 'DESC');
    42 $so->setColumn('admin_tbl.admin_id', 'admin_tbl.admin_id ASC', 'admin_tbl.admin_id DESC');
    43 $so->setColumn('admin_tbl.username', 'admin_tbl.username ASC', 'admin_tbl.username DESC');
    44 $so->setColumn('admin_tbl.userpass', 'admin_tbl.userpass ASC', 'admin_tbl.userpass DESC');
    45 $so->setColumn('admin_tbl.first_name', 'admin_tbl.first_name ASC', 'admin_tbl.first_name DESC');
    46 $so->setColumn('admin_tbl.last_name', 'admin_tbl.last_name ASC', 'admin_tbl.last_name DESC');
    47 $so->setColumn('admin_tbl.email', 'admin_tbl.email ASC', 'admin_tbl.email DESC');
    48 $so->setColumn('admin_tbl.user_type', 'admin_tbl.user_type ASC', 'admin_tbl.user_type DESC');
    49 $so->setColumn('admin_tbl.seconds_online', 'admin_tbl.seconds_online ASC', 'admin_tbl.seconds_online DESC');
    50 $so->setColumn('admin_tbl.last_login_datetime', 'admin_tbl.last_login_datetime ASC', 'admin_tbl.last_login_datetime DESC');
    51 $so->setColumn('admin_tbl.last_access_datetime', 'admin_tbl.last_access_datetime ASC', 'admin_tbl.last_access_datetime DESC');
    52 $so->setColumn('admin_tbl.last_login_ip', 'admin_tbl.last_login_ip ASC', 'admin_tbl.last_login_ip DESC');
    53 $so->setColumn('admin_tbl.added_by_user_id', 'admin_tbl.added_by_user_id ASC', 'admin_tbl.added_by_user_id DESC');
    54 $so->setColumn('admin_tbl.modified_by_user_id', 'admin_tbl.modified_by_user_id ASC', 'admin_tbl.modified_by_user_id DESC');
    55 $so->setColumn('admin_tbl.added_datetime', 'admin_tbl.added_datetime ASC', 'admin_tbl.added_datetime DESC');
    56 $so->setColumn('admin_tbl.modified_datetime', 'admin_tbl.modified_datetime ASC', 'admin_tbl.modified_datetime DESC');
     41$so = new SortOrder('admin_id', 'DESC');
     42$so->setColumn('admin_id', $auth->getParam('db_primary_key') . ' ASC', $auth->getParam('db_primary_key') . ' DESC');
     43$so->setColumn('username', $auth->getParam('db_username_column') . ' ASC', $auth->getParam('db_username_column') . ' DESC');
     44$so->setColumn('userpass', $auth->getParam('db_table') . '.userpass ASC', $auth->getParam('db_table') . '.userpass DESC');
     45$so->setColumn('first_name', $auth->getParam('db_table') . '.first_name ASC', $auth->getParam('db_table') . '.first_name DESC');
     46$so->setColumn('last_name', $auth->getParam('db_table') . '.last_name ASC', $auth->getParam('db_table') . '.last_name DESC');
     47$so->setColumn('email', $auth->getParam('db_table') . '.email ASC', $auth->getParam('db_table') . '.email DESC');
     48$so->setColumn('user_type', $auth->getParam('db_table') . '.user_type ASC', $auth->getParam('db_table') . '.user_type DESC');
     49$so->setColumn('seconds_online', $auth->getParam('db_table') . '.seconds_online ASC', $auth->getParam('db_table') . '.seconds_online DESC');
     50$so->setColumn('last_login_datetime', $auth->getParam('db_table') . '.last_login_datetime ASC', $auth->getParam('db_table') . '.last_login_datetime DESC');
     51$so->setColumn('last_access_datetime', $auth->getParam('db_table') . '.last_access_datetime ASC', $auth->getParam('db_table') . '.last_access_datetime DESC');
     52$so->setColumn('last_login_ip', $auth->getParam('db_table') . '.last_login_ip ASC', $auth->getParam('db_table') . '.last_login_ip DESC');
     53$so->setColumn('added_by_user_id', $auth->getParam('db_table') . '.added_by_user_id ASC', $auth->getParam('db_table') . '.added_by_user_id DESC');
     54$so->setColumn('modified_by_user_id', $auth->getParam('db_table') . '.modified_by_user_id ASC', $auth->getParam('db_table') . '.modified_by_user_id DESC');
     55$so->setColumn('added_datetime', $auth->getParam('db_table') . '.added_datetime ASC', $auth->getParam('db_table') . '.added_datetime DESC');
     56$so->setColumn('modified_datetime', $auth->getParam('db_table') . '.modified_datetime ASC', $auth->getParam('db_table') . '.modified_datetime DESC');
    5757
    5858// Instantiate page numbers. Total items are set and calculation is done in the getRecordList function.
    … …  
    143143    if (getFormdata('cancel', false)) {
    144144        // Remove lock
    145         $lock->select('admin_tbl', 'admin_id', getFormData('admin_id'));
     145        $lock->select($auth->getParam('db_table'), $auth->getParam('db_primary_key'), getFormData('admin_id'));
    146146        $lock->remove();
    147147        if ($app->validBoomerangURL('admins')) {
    … …  
    162162        if (getFormdata('repeat', false)) {
    163163            // Display edit function with next available ID.
    164             $qid = $db->query("SELECT admin_id FROM admin_tbl WHERE admin_id > '" . $db->escapeString(getFormData('admin_id')) . "' ORDER BY admin_id ASC LIMIT 1");
     164            $qid = $db->query("SELECT " . $auth->getParam('db_primary_key') . " FROM " . $auth->getParam('db_table') . " WHERE " . $auth->getParam('db_primary_key') . " > '" . $db->escapeString(getFormData('admin_id')) . "' ORDER BY " . $auth->getParam('db_primary_key') . " ASC LIMIT 1");
    165165            if (list($next_id) = mysql_fetch_row($qid)) {
    166166                $app->dieURL($_SERVER['PHP_SELF'] . '?op=edit&admin_id=' . $next_id);
    … …  
    265265function &editRecordForm($id)
    266266{
     267    global $auth;
    267268    global $lock;
    268269    $app =& App::getInstance();
    269270    $db =& DB::getInstance();
    270271   
    271     $lock->select('admin_tbl', 'admin_id', $id);
     272    $lock->select($auth->getParam('db_table'), $auth->getParam('db_primary_key'), $id);
    272273    if ($lock->isLocked() && !$lock->isMine()) {
    273274        $lock->dieErrorPage();
    … …  
    276277    // Get the information for the form.
    277278    $qid = $db->query("
    278         SELECT *
    279         FROM admin_tbl
    280         WHERE admin_id = '" . $db->escapeString($id) . "'
     279        SELECT *,
     280        " . $auth->getParam('db_primary_key') . " AS admin_id
     281        FROM " . $auth->getParam('db_table') . "
     282        WHERE " . $auth->getParam('db_primary_key') . " = '" . $db->escapeString($id) . "'
    281283    ");
    282284    if (!$frm = mysql_fetch_assoc($qid)) {
    … …  
    287289
    288290    // Lock this record.
    289     $lock->set('admin_tbl', 'admin_id', $id, $frm['username']);
     291    $lock->set($auth->getParam('db_table'), $auth->getParam('db_primary_key'), $id, $frm['username']);
    290292
    291293    // Set misc values for the form.
    … …  
    328330    $db =& DB::getInstance();
    329331   
    330     $lock->select('admin_tbl', 'admin_id', $id);
     332    $lock->select($auth->getParam('db_table'), $auth->getParam('db_primary_key'), $id);
    331333    if ($lock->isLocked() && !$lock->isMine()) {
    332334        $lock->dieErrorPage();
    … …  
    338340    // Get the information for this object.
    339341    $qid = $db->query("
    340         SELECT username, user_type from admin_tbl
    341         WHERE admin_id = '" . $db->escapeString($id) . "'
     342        SELECT " . $auth->getParam('db_username_column') . ", user_type from " . $auth->getParam('db_table') . "
     343        WHERE " . $auth->getParam('db_primary_key') . " = '" . $db->escapeString($id) . "'
    342344    ");
    343345    if (! list($name, $user_type) = mysql_fetch_row($qid)) {
    … …  
    348350
    349351    // Get the information for this object.
    350     $qid = $db->query("SELECT COUNT(*) from admin_tbl");
     352    $qid = $db->query("SELECT COUNT(*) from " . $auth->getParam('db_table') . "");
    351353    list($num_admins) = mysql_fetch_row($qid);
    352354    if ('root' == $user_type && 'root' != $auth->get('user_type')) {
    … …  
    361363    } else {
    362364        // Delete the record.
    363         $db->query("DELETE FROM admin_tbl WHERE admin_id = '" . $db->escapeString($id) . "'");
     365        $db->query("DELETE FROM " . $auth->getParam('db_table') . " WHERE " . $auth->getParam('db_primary_key') . " = '" . $db->escapeString($id) . "'");
    364366        $app->raiseMsg(sprintf(_("The admin <em>%s</em> has been deleted."), $name), MSG_SUCCESS, __FILE__, __LINE__);
    365367    }
    … …  
    381383    // Insert record data.
    382384    $db->query("
    383         INSERT INTO admin_tbl (
    384             username,
     385        INSERT INTO " . $auth->getParam('db_table') . " (
     386            " . $auth->getParam('db_username_column') . ",
    385387            first_name,
    386388            last_name,
    … …  
    406408    // Create version.
    407409    $version = Version::getInstance($auth);
    408     $version->create('admin_tbl', 'admin_id', $last_insert_id, $frm['username']);
     410    $version->create($auth->getParam('db_table'), $auth->getParam('db_primary_key'), $last_insert_id, $frm['username']);
    409411
    410412    $app->raiseMsg(sprintf(_("The Administrator <em>%s</em> has been added."), $frm['username']), MSG_SUCCESS, __FILE__, __LINE__);
    … …  
    421423    $db =& DB::getInstance();
    422424   
    423     $lock->select('admin_tbl', 'admin_id', $frm['admin_id']);
     425    $lock->select($auth->getParam('db_table'), $auth->getParam('db_primary_key'), $frm['admin_id']);
    424426    if ($lock->isLocked() && !$lock->isMine()) {
    425427        $lock->dieErrorPage();
    … …  
    437439    // Update record data.
    438440    $db->query("
    439         UPDATE admin_tbl SET
    440             username = '" . $db->escapeString($frm['username']) . "',
     441        UPDATE " . $auth->getParam('db_table') . " SET
     442            " . $auth->getParam('db_username_column') . " = '" . $db->escapeString($frm['username']) . "',
    441443            first_name = '" . $db->escapeString($frm['first_name']) . "',
    442444            last_name = '" . $db->escapeString($frm['last_name']) . "',
    … …  
    445447            modified_by_user_id = '" . $db->escapeString($auth->get('user_id')) . "',
    446448            modified_datetime = NOW()
    447         WHERE admin_id = '" . $db->escapeString($frm['admin_id']) . "'
     449        WHERE " . $auth->getParam('db_primary_key') . " = '" . $db->escapeString($frm['admin_id']) . "'
    448450    ");
    449451
    450452    // Create version.
    451453    $version = Version::getInstance($auth);
    452     $version->create('admin_tbl', 'admin_id', $frm['admin_id'], $frm['username']);
     454    $version->create($auth->getParam('db_table'), $auth->getParam('db_primary_key'), $frm['admin_id'], $frm['username']);
    453455
    454456    $app->raiseMsg(sprintf(_("The Administrator <em>%s</em> has been updated."), $frm['username']), MSG_SUCCESS, __FILE__, __LINE__);
    … …  
    464466    global $tmp_prefs;
    465467    global $cache;
     468    global $auth;
    466469    $db =& DB::getInstance();
    467470   
    … …  
    474477            $where_clause .= (empty($where_clause) ? 'WHERE' : 'AND') . "
    475478                (
    476                     admin_tbl.username LIKE '%" . $db->escapeString($qry_words[$i]) . "%'
    477                     OR admin_tbl.first_name LIKE '%" . $db->escapeString($qry_words[$i]) . "%'
    478                     OR admin_tbl.last_name LIKE '%" . $db->escapeString($qry_words[$i]) . "%'
    479                     OR admin_tbl.email LIKE '%" . $db->escapeString($qry_words[$i]) . "%'
     479                    " . $auth->getParam('db_table') . "." . $auth->getParam('db_username_column') . " LIKE '%" . $db->escapeString($qry_words[$i]) . "%'
     480                    OR " . $auth->getParam('db_table') . ".first_name LIKE '%" . $db->escapeString($qry_words[$i]) . "%'
     481                    OR " . $auth->getParam('db_table') . ".last_name LIKE '%" . $db->escapeString($qry_words[$i]) . "%'
     482                    OR " . $auth->getParam('db_table') . ".email LIKE '%" . $db->escapeString($qry_words[$i]) . "%'
    480483                )
    481484            ";
    … …  
    486489    $qid = $db->query("
    487490        SELECT COUNT(*)
    488         FROM admin_tbl
     491        FROM " . $auth->getParam('db_table') . "
    489492        $where_clause
    490493    ");
    … …  
    498501    $sql = "
    499502        SELECT
    500             admin_tbl.*,
    501             a1.username AS added_admin_username,
    502             a2.username AS modified_admin_username
    503         FROM admin_tbl
    504         LEFT JOIN admin_tbl a1 ON (admin_tbl.added_by_user_id = a1.admin_id)
    505         LEFT JOIN admin_tbl a2 ON (admin_tbl.modified_by_user_id = a2.admin_id)
     503            " . $auth->getParam('db_table') . ".*,
     504            " . $auth->getParam('db_table') . "." . $auth->getParam('db_primary_key') . " AS admin_id,           
     505            a1." . $auth->getParam('db_username_column') . " AS added_admin_username,
     506            a2." . $auth->getParam('db_username_column') . " AS modified_admin_username
     507        FROM " . $auth->getParam('db_table') . "
     508        LEFT JOIN " . $auth->getParam('db_table') . " a1 ON (" . $auth->getParam('db_table') . ".added_by_user_id = a1." . $auth->getParam('db_primary_key') . ")
     509        LEFT JOIN " . $auth->getParam('db_table') . " a2 ON (" . $auth->getParam('db_table') . ".modified_by_user_id = a2." . $auth->getParam('db_primary_key') . ")
    506510        $where_clause
    507511        " . $so->getSortOrderSQL() . "

  • trunk/services/templates/admin_form.ihtml

    r235 r295  
    11<?php $fv->printErrorMessages(); ?>
    22
    3 <form method="post" action="<?php echo oTxt($_SERVER['PHP_SELF']); ?>">
     3<form method="post" action="<?php echo oTxt($_SERVER['PHP_SELF']); ?>" class="sc-form">
    44<?php $app->printHiddenSession(); ?>
    55<input type="hidden" name="op" value="<?php echo $frm['new_op']; ?>" />
    … …  
    4646        <td>
    4747            <select name="user_type" class="sc-small">
    48             <?php printSetSelectForm('admin_tbl', 'user_type', $frm['user_type'], true); ?>
     48                <?php printSetSelectForm($auth->getParam('db_table'), 'user_type', $frm['user_type'], true); ?>
    4949            </select>
    5050        </td>

  • trunk/services/templates/admin_list.ihtml

    r270 r295  
    11
    22<?php $fv->printErrorMessages(); ?>
    3 <form action="<?php echo oTxt($_SERVER['PHP_SELF']); ?>" method="get">
    4 <?php $app->printHiddenSession(false); ?>
     3
    54<div id="commandbox">
    6     <span class="sc-nowrap commanditem"><a href="<?php echo $app->oHREF($_SERVER['PHP_SELF'] . '?op=add'); ?>"><?php echo _("Add administrator"); ?></a></span>
    7 
    8     <div class="form">
     5    <span class="sc-nowrap commanditem"><a href="<?php echo $app->oHREF($_SERVER['PHP_SELF'] . '?op=add'); ?>"><?php echo _("Add Administrator"); ?></a></span>
     6    <form action="<?php echo oTxt($_SERVER['PHP_SELF']); ?>" method="get" class="sc-form">
     7        <?php $app->printHiddenSession(false); ?>
    98        <input type="text" class="sc-small" size="20" name="search_query" value="<?php echo getFormData('search_query'); ?>" title="<?php echo oTxt(_("Fields searched: Admin id, Username, Userpass, First name, Last name, Email.")); ?>" />
    109        <input type="submit" value="<?php echo _("Search"); ?>" />
    11     </div>
     10    </form>
    1211</div>
    1312
    1413<?php include 'list_info.ihtml'; ?>
    1514
     15<form action="<?php echo oTxt($_SERVER['PHP_SELF']); ?>" method="get" class="sc-form">
    1616<table class="list">
    1717    <tr>
    … …  
    3333    <tr>
    3434        <td class="sc-padleft sc-nowrap"><a title="<?php printf(_("Edit %s"), oTxt($list[$i]['username'])) ?>" href="<?php echo $app->oHREF($_SERVER['PHP_SELF'] . '?op=edit&admin_id=' . $list[$i]['admin_id']); ?>"><img src="/admin/_widgets/edit.gif" alt="Edit" width="14" height="18" border="0" /></a> &nbsp;</td>
    35         <td class="sc-padleft sc-nowrap"><a title="<?php printf(_("Versions of %s"), oTxt($list[$i]['username'])) ?>" href="<?php echo $app->oHREF('/admin/versions.php?record_table=admin_tbl&record_key=admin_id&boomerang=true&record_val=' . $list[$i]['admin_id']); ?>"><img src="/admin/_widgets/subcategory.gif" alt="" width="18" height="14" border="0" /></a> &nbsp;</td>
     35        <td class="sc-padleft sc-nowrap"><a title="<?php printf(_("Versions of %s"), oTxt($list[$i]['username'])) ?>" href="<?php echo $app->oHREF(sprintf('/admin/versions.php?record_table=%s&record_key=%s&record_val=%s&boomerang=true', $auth->getParam('db_table'), $auth->getParam('db_primary_key'), $list[$i]['admin_id'])); ?>"><img src="/admin/_widgets/subcategory.gif" alt="" width="18" height="14" border="0" /></a> &nbsp;</td>
    3636        <td class="sc-nowrap"><?php echo oTxt($list[$i]['admin_id'], true); ?> &nbsp;</td>
    3737        <td class="sc-nowrap"><?php echo oTxt($list[$i]['username'], true); ?> &nbsp;</td>

  • trunk/services/templates/lock.ihtml

    r185 r295  
    44}
    55?>
    6 <form method="post" action="<?php echo oTxt($_SERVER['PHP_SELF']); ?>">
     6<form method="post" action="<?php echo oTxt($_SERVER['PHP_SELF']); ?>" class="sc-form">
    77    <?php $app->printHiddenSession() ?>
    88    <input type="hidden" name="lock_id" value="<?php echo $lock->getID(); ?>" />

  • trunk/services/templates/log_list.ihtml

    r270 r295  
    1 <form action="<?php echo oTxt($_SERVER['PHP_SELF']); ?>" method="get">
     1<form action="<?php echo oTxt($_SERVER['PHP_SELF']); ?>" method="get" class="sc-form">
    22<?php $app->printHiddenSession(false); ?>
    33<div id="commandbox">

  • trunk/services/templates/login_form.ihtml

    r291 r295  
    1 <form method="post" action="<?php echo oTxt($_SERVER['PHP_SELF']); ?>">
     1<form method="post" action="<?php echo oTxt($_SERVER['PHP_SELF']); ?>" class="sc-form">
    22<?php $app->printHiddenSession() ?>
    33<table>

  • trunk/services/templates/password.ihtml

    r235 r295  
    11<?php $fv->printErrorMessages(); ?>
    22
    3 <form method="post" action="<?php echo oTxt($_SERVER['PHP_SELF']); ?>">
     3<form method="post" action="<?php echo oTxt($_SERVER['PHP_SELF']); ?>" class="sc-form">
    44<?php $app->printHiddenSession() ?>
    55<input type="hidden" name="op" value="update_password" />

  • trunk/services/templates/versions_list.ihtml

    r270 r295  
    1 <form method="post" action="<?php echo oTxt($_SERVER['PHP_SELF']); ?>">
     1<form method="post" action="<?php echo oTxt($_SERVER['PHP_SELF']); ?>" class="sc-form">
    22<?php $app->printHiddenSession() ?>
    33<input type="submit" name="op" value="<?php echo _("Cancel"); ?>" />
Note: See TracChangeset for help on using the changeset viewer.