March 2007 - Wine-commits - list.winehq.org

Andrew Talbot : wininet: Replace inline static with static inline.
by Alexandre Julliard 26 Mar '07

26 Mar '07

Module: wine Branch: master Commit: 57746f9592a611c430fdf970ca0a07ad3f7df652 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57746f9592a611c430fdf970c… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Mar 23 15:09:23 2007 +0000 wininet: Replace inline static with static inline. --- dlls/wininet/internet.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 55e480b..49c7930 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -71,14 +71,14 @@ typedef struct #endif } WININET_NETCONNECTION; -inline static LPWSTR WININET_strdupW( LPCWSTR str ) +static inline LPWSTR WININET_strdupW( LPCWSTR str ) { LPWSTR ret = HeapAlloc( GetProcessHeap(), 0, (strlenW(str) + 1)*sizeof(WCHAR) ); if (ret) strcpyW( ret, str ); return ret; } -inline static LPWSTR WININET_strdup_AtoW( LPCSTR str ) +static inline LPWSTR WININET_strdup_AtoW( LPCSTR str ) { int len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0); LPWSTR ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); @@ -87,7 +87,7 @@ inline static LPWSTR WININET_strdup_AtoW( LPCSTR str ) return ret; } -inline static LPSTR WININET_strdup_WtoA( LPCWSTR str ) +static inline LPSTR WININET_strdup_WtoA( LPCWSTR str ) { int len = WideCharToMultiByte( CP_ACP, 0, str, -1, NULL, 0, NULL, NULL); LPSTR ret = HeapAlloc( GetProcessHeap(), 0, len ); @@ -96,7 +96,7 @@ inline static LPSTR WININET_strdup_WtoA( LPCWSTR str ) return ret; } -inline static void WININET_find_data_WtoA(LPWIN32_FIND_DATAW dataW, LPWIN32_FIND_DATAA dataA) +static inline void WININET_find_data_WtoA(LPWIN32_FIND_DATAW dataW, LPWIN32_FIND_DATAA dataA) { dataA->dwFileAttributes = dataW->dwFileAttributes; dataA->ftCreationTime = dataW->ftCreationTime;

1 0

Andrew Talbot : winmm: Replace inline static with static inline.
by Alexandre Julliard 26 Mar '07

26 Mar '07

Module: wine Branch: master Commit: 3c78748cc16655f05691f315e0d88e496ca5458c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c78748cc16655f05691f315e… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Mar 23 15:10:05 2007 +0000 winmm: Replace inline static with static inline. --- dlls/winmm/driver.c | 2 +- dlls/winmm/mci.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/driver.c b/dlls/winmm/driver.c index d200b57..cf1c0ab 100644 --- a/dlls/winmm/driver.c +++ b/dlls/winmm/driver.c @@ -131,7 +131,7 @@ LPWINE_DRIVER DRIVER_FindFromHDrvr(HDRVR hDrvr) /************************************************************************** * DRIVER_SendMessage [internal] */ -inline static LRESULT DRIVER_SendMessage(LPWINE_DRIVER lpDrv, UINT msg, +static inline LRESULT DRIVER_SendMessage(LPWINE_DRIVER lpDrv, UINT msg, LPARAM lParam1, LPARAM lParam2) { LRESULT ret = 0; diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 4eb4a72..5ca5c97 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -85,7 +85,7 @@ static const WCHAR wszOpen [] = {'o','p','e','n',0}; static const WCHAR wszSystemIni[] = {'s','y','s','t','e','m','.','i','n','i',0}; /* dup a string and uppercase it */ -inline static LPWSTR str_dup_upper( LPCWSTR str ) +static inline LPWSTR str_dup_upper( LPCWSTR str ) { INT len = (strlenW(str) + 1) * sizeof(WCHAR); LPWSTR p = HeapAlloc( GetProcessHeap(), 0, len );

1 0

appdb/. appdbStats.php
by WineHQ 26 Mar '07

26 Mar '07

ChangeSet ID: 31013 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/25 19:39:53 Modified files: . : appdbStats.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Add 'testing reports' count to appdb stats page Patch: http://cvs.winehq.org/patch.py?id=31013 Old revision New revision Changes Path 1.15 1.16 +6 -0 appdb/appdbStats.php Index: appdb/appdbStats.php diff -u -p appdb/appdbStats.php:1.15 appdb/appdbStats.php:1.16 --- appdb/appdbStats.php:1.15 26 Mar 2007 0:39:53 -0000 +++ appdb/appdbStats.php 26 Mar 2007 0:39:53 -0000 @@ -71,6 +71,12 @@ echo " <td>Application maintainers:</ echo " <td>".Maintainer::getNumberOfMaintainers()."</td>\n"; echo "</tr>\n\n"; +/* Display the number of testing reports */ +echo "<tr class=color4>\n"; +echo " <td>Testing reports:</td>\n"; +echo " <td>".testData::objectGetEntriescount(false, false)."</td>\n"; +echo "</tr>\n\n"; + /* Display the number of images */ echo "<tr class=color4>\n"; echo " <td>Screenshots:</td>\n";

1 0

appdb/include testData.php
by WineHQ 25 Mar '07

25 Mar '07

ChangeSet ID: 31012 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/25 16:04:33 Modified files: include : testData.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Implement Alexander's suggestion and use version::fullName() to reduce code duplication Patch: http://cvs.winehq.org/patch.py?id=31012 Old revision New revision Changes Path 1.33 1.34 +2 -12 appdb/include/testData.php Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.33 appdb/include/testData.php:1.34 --- appdb/include/testData.php:1.33 25 Mar 2007 21: 4:33 -0000 +++ appdb/include/testData.php 25 Mar 2007 21: 4:33 -0000 @@ -244,16 +244,6 @@ class testData{ } } - function getFormattedApplicationVersionName() - { - $oVersion = new Version($this->iVersionId); - $sAppName = application::lookup_name($oVersion->iAppId); - $sVersionName = version::lookup_name($oVersion->iVersionId); - $sName = "$sAppName: $sVersionName"; - - return $sName; - } - function mailSubmitter($sAction="add") { global $aClean; @@ -263,7 +253,7 @@ class testData{ $oSubmitter = new User($this->iSubmitterId); /* Get the full app/version name to display */ - $sName = $this->getFormattedApplicationVersionName(); + $sName = version::fullName($this->iVersionId); switch($sAction) { @@ -493,7 +483,7 @@ class testData{ { HtmlAreaLoaderScript(array("Test1", "Test2", "Test3")); - $sName = $this->getFormattedApplicationVersionName(); + $sName = version::fullName($this->iVersionId); echo html_frame_start("Test Form - $sName", "90%", "", 0); echo "<table width='100%' border=0 cellpadding=2 cellspacing=0>\n";

1 0

appdb/include maintainer.php
by WineHQ 25 Mar '07

25 Mar '07

ChangeSet ID: 31011 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/25 15:29:58 Modified files: include : maintainer.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> maintainer::deleteMaintainersForVersion() should properly return $hResult Patch: http://cvs.winehq.org/patch.py?id=31011 Old revision New revision Changes Path 1.35 1.36 +1 -0 appdb/include/maintainer.php Index: appdb/include/maintainer.php diff -u -p appdb/include/maintainer.php:1.35 appdb/include/maintainer.php:1.36 --- appdb/include/maintainer.php:1.35 25 Mar 2007 20:29:58 -0000 +++ appdb/include/maintainer.php 25 Mar 2007 20:29:58 -0000 @@ -184,6 +184,7 @@ class maintainer $hResult = query_parameters("DELETE from appMaintainers WHERE versionId='?'", $oVersion->iVersionId); + return $hResult; } function deleteMaintainersForApplication($oApp)

1 0

appdb/include testData.php
by WineHQ 25 Mar '07

25 Mar '07

ChangeSet ID: 31010 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/25 14:58:34 Modified files: include : testData.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> testData should display the application name and version in outputEditor() Patch: http://cvs.winehq.org/patch.py?id=31010 Old revision New revision Changes Path 1.32 1.33 +14 -5 appdb/include/testData.php Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.32 appdb/include/testData.php:1.33 --- appdb/include/testData.php:1.32 25 Mar 2007 19:58:34 -0000 +++ appdb/include/testData.php 25 Mar 2007 19:58:34 -0000 @@ -244,6 +244,16 @@ class testData{ } } + function getFormattedApplicationVersionName() + { + $oVersion = new Version($this->iVersionId); + $sAppName = application::lookup_name($oVersion->iAppId); + $sVersionName = version::lookup_name($oVersion->iVersionId); + $sName = "$sAppName: $sVersionName"; + + return $sName; + } + function mailSubmitter($sAction="add") { global $aClean; @@ -253,10 +263,7 @@ class testData{ $oSubmitter = new User($this->iSubmitterId); /* Get the full app/version name to display */ - $oVersion = new Version($this->iVersionId); - $sAppName = application::lookup_name($oVersion->iAppId); - $sVersionName = version::lookup_name($oVersion->iVersionId); - $sName = "$sAppName: $sVersionName"; + $sName = $this->getFormattedApplicationVersionName(); switch($sAction) { @@ -486,7 +493,9 @@ class testData{ { HtmlAreaLoaderScript(array("Test1", "Test2", "Test3")); - echo html_frame_start("Test Form", "90%", "", 0); + $sName = $this->getFormattedApplicationVersionName(); + + echo html_frame_start("Test Form - $sName", "90%", "", 0); echo "<table width='100%' border=0 cellpadding=2 cellspacing=0>\n"; // What works

1 0

appdb/include testData.php
by WineHQ 25 Mar '07

25 Mar '07

ChangeSet ID: 31009 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/25 13:58:13 Modified files: include : testData.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Only show checked test results in version display Patch: http://cvs.winehq.org/patch.py?id=31009 Old revision New revision Changes Path 1.31 1.32 +6 -17 appdb/include/testData.php Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.31 appdb/include/testData.php:1.32 --- appdb/include/testData.php:1.31 25 Mar 2007 18:58:13 -0000 +++ appdb/include/testData.php 25 Mar 2007 18:58:13 -0000 @@ -380,13 +380,15 @@ class testData{ $sQuery = "SELECT * FROM testResults - WHERE versionId = '".$this->iVersionId."' + WHERE versionId = '?' + AND + queued = '?' ORDER BY testedDate DESC"; if(!$showAll) $sQuery.=" LIMIT 0,".$iDisplayLimit; - $hResult = query_appdb($sQuery); + $hResult = query_parameters($sQuery, $this->iVersionId, "false"); if(!$hResult) return; @@ -405,7 +407,7 @@ class testData{ echo '<td>Installs?</td>',"\n"; echo '<td>Runs?</td>',"\n"; echo '<td>Rating</td>',"\n"; - echo '<td>Status</td>',"\n"; + echo '<td>Submitter</td>',"\n"; echo '</tr></thead>',"\n"; while($oRow = mysql_fetch_object($hResult)) { @@ -433,19 +435,6 @@ class testData{ echo '">Show</a>]</td>',"\n"; } - switch($oTest->sQueued) - { - case "false": - $sStatus = "Checked"; - break; - case "true": - $sStatus = "Queued"; - break; - case "rejected": - $sStatus = "Rejected"; - break; - } - echo ' <td>',"\n"; echo $oDistribution->objectMakeLink()."\n"; echo ' </td>',"\n"; @@ -454,7 +443,7 @@ class testData{ echo ' <td>'.$oTest->sInstalls.'&nbsp</td>',"\n"; echo ' <td>'.$oTest->sRuns.'&nbsp</td>',"\n"; echo ' <td>'.$oTest->sTestedRating.'&nbsp</td>',"\n"; - echo ' <td>'.$sStatus.'&nbsp</td>',"\n"; + echo ' <td>'.$oSubmitter->objectMakeLink().'&nbsp</td>',"\n"; if ($_SESSION['current']->hasAppVersionModifyPermission($oVersion)) { $oObject = new objectManager("testData");

1 0

appdb/ ./objectManager.php include/objectManag ...
by WineHQ 25 Mar '07

25 Mar '07

ChangeSet ID: 31008 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/25 13:52:19 Modified files: . : objectManager.php include : objectManager.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> objectManager: check editor values Patch: http://cvs.winehq.org/patch.py?id=31008 Old revision New revision Changes Path 1.2 1.3 +8 -4 appdb/objectManager.php 1.9 1.10 +52 -11 appdb/include/objectManager.php Index: appdb/objectManager.php diff -u -p appdb/objectManager.php:1.2 appdb/objectManager.php:1.3 --- appdb/objectManager.php:1.2 25 Mar 2007 18:52:19 -0000 +++ appdb/objectManager.php 25 Mar 2007 18:52:19 -0000 @@ -40,8 +40,12 @@ if($aClean['bIsRejected'] == 'true') $oOtherObject = new $oObject->sClass($oObject->iId); -/* Certain actions must be performed before the header is set */ -$oObject->processForm($aClean); +/* Certain actions must be performed before the header is set + processForm return TRUE on success, or a user-readable list of errors + on failure */ +$sErrors = $oObject->processForm($aClean); +if($sErrors === TRUE) + $sErrors = ""; if($oObject->iId && $aClean['sAction'] == "delete") $oObject->delete_entry(); @@ -58,7 +62,7 @@ if($oObject->iId) break; case "edit": - $oObject->display_entry_for_editing($REQUEST_URI); + $oObject->display_entry_for_editing($REQUEST_URI, $sErrors); break; default: @@ -66,7 +70,7 @@ if($oObject->iId) break; } } else if ($aClean['sAction'] == "add") - $oObject->add_entry($REQUEST_URI); + $oObject->add_entry($REQUEST_URI, $sErrors); else { // if displaying a queue display the help for the given queue Index: appdb/include/objectManager.php diff -u -p appdb/include/objectManager.php:1.9 appdb/include/objectManager.php:1.10 --- appdb/include/objectManager.php:1.9 25 Mar 2007 18:52:19 -0000 +++ appdb/include/objectManager.php 25 Mar 2007 18:52:19 -0000 @@ -116,7 +116,7 @@ class ObjectManager } /* display the entry for editing */ - function display_entry_for_editing($sBackLink) + function display_entry_for_editing($sBackLink, $sErrors) { $this->checkMethods(array("outputEditor", "getOutputEditorValues", "update", "create")); @@ -124,9 +124,17 @@ class ObjectManager // link back to the previous page echo html_back_link(1, $sBackLink); - echo '<form name="sQform" action="'.BASE.'objectManager.php?sClass='. - $this->sClass."&bIsQueue=".($this->bIsQueue ? "true" : "false"). - ' method="post" enctype="multipart/form-data">',"\n"; + $oObject = new $this->sClass($this->iId); + + /* Display errors, if any, and fetch form data */ + if($this->displayErrors($sErrors)) + { + global $aClean; + $oObject->getOutputEditorValues($aClean); + } + + echo '<form name="sQform" action="'.$this->makeUrl("edit", $this->iId). + '" method="post" enctype="multipart/form-data">',"\n"; echo '<input type="hidden" name="sClass" value="'.$this->sClass.'" />'; echo '<input type="hidden" name="sTitle" value="'.$this->sTitle.'" />'; @@ -136,8 +144,6 @@ class ObjectManager echo '<input type="hidden" name="bIsRejected" '. 'value='.($this->bIsRejected ? "true" : "false").' />'; - $oObject = new $this->sClass($this->iId); - $oObject->outputEditor(); /* if this is a queue add a dialog for replying to the submitter of the @@ -215,13 +221,24 @@ class ObjectManager } /* Display screen for submitting a new entry of given type */ - function add_entry($sBackLink) + function add_entry($sBackLink, $sErrors = "") { $this->checkMethods(array("outputEditor", "getOutputEditorValues", "update", "create")); + $oObject = new $this->sClass(); + /* Display help if it is exists */ + if(method_exists(new $this->sClass, "objectDisplayAddItemHelp")) + $oObject->objectDisplayAddItemHelp(); + + /* Display errors, if any, and fetch form data */ + if($this->displayErrors($sErrors)) + { + global $aClean; + $oObject->getOutputEditorValues($aClean); + } echo "<form method=\"post\">\n"; $oObject->outputEditor(); @@ -272,6 +289,14 @@ class ObjectManager $oObject->getOutputEditorValues($aClean); + /* Check input, if necessary */ + if(method_exists(new $this->sClass, "checkOutputEditorInput")) + { + $sErrors = $oObject->checkOutputEditorInput($aClean); + if($sErrors) + return $sErrors; + } + switch($aClean['sSubmit']) { case "Submit": @@ -299,12 +324,16 @@ class ObjectManager $this->delete_entry(); } - if(!$this->bIsQueue) - $sAction = "view"; + /* Displaying the entire un-queued list for a class is not a good idea, + so only do so for queued data */ + if($this->bIsQueue) + $sRedirectLink = $this->makeUrl("view", false, "$this->sClass list"); else - $sAction = false; + $sRedirectLink = APPDB_ROOT; + + util_redirect_and_exit($sRedirectLink); - util_redirect_and_exit($this->makeUrl($sAction, false, "$this->sClass list")); + return TRUE; } /* Make an objectManager URL based on the object and optional parameters */ @@ -362,6 +391,18 @@ class ObjectManager return $sQueueString; } + + function displayErrors($sErrors) + { + if($sErrors) + { + echo "<font color=\"red\">\n"; + echo "The following errors were found<br />\n"; + echo "<ul>$sErrors</ul>\n"; + echo "</font><br />"; + } else + return FALSE; + } } ?>

1 0

appdb/ ./testResults.php include/testData.php
by WineHQ 25 Mar '07

25 Mar '07

ChangeSet ID: 31007 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/25 11:10:15 Modified files: . : testResults.php include : testData.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add and use testData::objectDisplayAddItemHelp() Patch: http://cvs.winehq.org/patch.py?id=31007 Old revision New revision Changes Path 1.27 1.28 +1 -5 appdb/testResults.php 1.30 1.31 +11 -0 appdb/include/testData.php Index: appdb/testResults.php diff -u -p appdb/testResults.php:1.27 appdb/testResults.php:1.28 --- appdb/testResults.php:1.27 25 Mar 2007 16:10:15 -0000 +++ appdb/testResults.php 25 Mar 2007 16:10:15 -0000 @@ -114,11 +114,7 @@ if ($aClean['sSub']) //help - echo "<p>This is the screen for inputing test information so that others looking at the database will know \n"; - echo "what was working on a particular release of Wine.</p>\n"; - echo "<p>Please be as detailed as you can.</p>\n"; - echo "<p>If you cannot find your distribution in the list of existing distributions, please add it in the \n"; - echo "provided field.</p>\n\n"; + $oTest->objectDisplayAddItemHelp(); if(!empty($errors)) { Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.30 appdb/include/testData.php:1.31 --- appdb/include/testData.php:1.30 25 Mar 2007 16:10:15 -0000 +++ appdb/include/testData.php 25 Mar 2007 16:10:15 -0000 @@ -862,6 +862,17 @@ class testData{ /* STUB */ return TRUE; } + + function objectDisplayAddItemHelp() + { + echo "<p>This is the screen for inputing test information so that others "; + echo "looking at the database will know \n"; + echo "what was working on a particular release of Wine.</p>\n"; + echo "<p>Please be as detailed as you can.</p>\n"; + echo "<p>If you cannot find your distribution in the list of existing "; + echo "distributions, please add it in the \n"; + echo "provided field.</p>\n\n"; + } } ?>

1 0

appdb/include sidebar_admin.php
by WineHQ 25 Mar '07

25 Mar '07

ChangeSet ID: 31006 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/25 11:05:37 Modified files: include : sidebar_admin.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Reorganize admin sidebar. Place the most used items higher and the least used items lower Patch: http://cvs.winehq.org/patch.py?id=31006 Old revision New revision Changes Path 1.35 1.36 +17 -12 appdb/include/sidebar_admin.php Index: appdb/include/sidebar_admin.php diff -u -p appdb/include/sidebar_admin.php:1.35 appdb/include/sidebar_admin.php:1.36 --- appdb/include/sidebar_admin.php:1.35 25 Mar 2007 16: 5:37 -0000 +++ appdb/include/sidebar_admin.php 25 Mar 2007 16: 5:37 -0000 @@ -9,11 +9,6 @@ function global_admin_menu() { $g = new htmlmenu("Global Admin"); - $g->add("Add Category", BASE."admin/addCategory.php"); - $g->add("Add Vendor", BASE."objectManager.php?sClass=vendor&bQueue=". - "false&sAction=add&sTitle=Add%20Vendor"); - - $g->addmisc(" "); $g->add("View App Queue (".$_SESSION['current']->getQueuedAppCount().")", BASE."objectManager.php?sClass=application&bIsQueue=true&sTitle=". "Application%20Queue"); @@ -26,10 +21,6 @@ function global_admin_menu() { $g->add("View Maintainer Queue (".Maintainer::objectGetEntriesCount(true, false).")", BASE."objectManager.php?sClass=maintainer&bIsQueue=true&sTitle=". "Maintainer%20Queue"); - $g->add("View Maintainer Entries (".Maintainer::getMaintainerCount().")", - BASE."admin/adminMaintainers.php"); - $g->add("View Bug Links (".getNumberOfQueuedBugLinks()."/".getNumberOfBugLinks().")", - BASE."admin/adminBugs.php"); $g->add("View Test Results Queue (".testData::objectGetEntriesCount(true, false).")", BASE."objectManager.php?sClass=testData&bIsQueue=true&sTitle=". "Test%20Results%20Queue"); @@ -39,13 +30,27 @@ function global_admin_menu() { "Distribution%20Queue"); $g->addmisc(" "); + + $g->add("View Maintainer Entries (".Maintainer::getMaintainerCount().")", + BASE."admin/adminMaintainers.php"); + $g->add("View Bug Links (".getNumberOfQueuedBugLinks()."/".getNumberOfBugLinks().")", + BASE."admin/adminBugs.php"); + $g->add("Users Management", BASE."admin/adminUsers.php"); + $g->add("Comments Management", BASE."admin/adminCommentView.php"); + $g->add("Screenshots Management", BASE."admin/adminScreenshots.php"); + + $g->addmisc(" "); + $g->add("View Rejected Test Results (".testData::objectGetEntriesCount(true, true).")", BASE."objectManager.php?sClass=testData&bIsQueue=true&bIsRejected=true&". "sTitle=Rejected%20Test%20Results"); - $g->add("Users Management", BASE."admin/adminUsers.php"); - $g->add("Comments Management", BASE."admin/adminCommentView.php"); - $g->add("Screenshots Management", BASE."admin/adminScreenshots.php"); + + $g->addmisc(" "); + + $g->add("Add Category", BASE."admin/addCategory.php"); + $g->add("Add Vendor", BASE."objectManager.php?sClass=vendor&bQueue=". + "false&sAction=add&sTitle=Add%20Vendor"); $g->done(); }

1 0