diff --git a/framework/router.class.php b/framework/router.class.php
index a27ae9246e..8dff4f60ff 100755
--- a/framework/router.class.php
+++ b/framework/router.class.php
@@ -951,13 +951,22 @@ class router
public function loadCommon()
{
$this->setModuleName('common');
- if($this->setControlFile($exitIfNone = false))
+ $commonModelFile = helper::setModelFile('common');
+ if(file_exists($commonModelFile))
{
- include $this->controlFile;
- if(class_exists('common'))
+ helper::import($commonModelFile);
+ if(class_exists('extcommonModel'))
{
- return new common();
- }
+ $commonClass = 'class common extends extcommonModel{}';
+ eval($commonClass);
+ return new extcommonModel();
+ }
+ elseif(class_exists('commonModel'))
+ {
+ $commonClass = 'class common extends commonModel{}';
+ eval($commonClass);
+ return new commonModel();
+ }
else
{
return false;
diff --git a/module/common/control.php b/module/common/control.php
deleted file mode 100644
index 2d4d36f625..0000000000
--- a/module/common/control.php
+++ /dev/null
@@ -1,462 +0,0 @@
-
- * @package common
- * @version $Id: control.php 5036 2013-07-06 05:26:44Z wyd621@gmail.com $
- * @link http://www.zentao.net
- */
-class common extends control
-{
- /**
- * The construc method, to do some auto things.
- *
- * @access public
- * @return void
- */
- public function __construct()
- {
- parent::__construct();
- $this->common->startSession();
- $this->common->sendHeader();
- $this->common->setCompany();
- $this->common->setUser();
- $this->common->loadConfigFromDB();
- if(isset($this->config->custom->productproject))
- {
- $productCommon = $projectCommon = 0;
- list($productCommon, $projectCommon) = explode('_', $this->config->custom->productproject);
- if($productCommon != 0 or $projectCommon != 0)
- {
- $this->lang->productCommon = $this->lang->productCommonList[$productCommon];
- $this->lang->projectCommon = $this->lang->projectCommonList[$projectCommon];
- $this->app->loadLang('common');
- }
- }
-
- $this->common->loadCustomFromDB();
- if($this->app->getViewType() == 'mhtml') $this->common->setMobileMenu();
- $this->app->loadLang('company');
- }
-
- /**
- * Check upgrade's status file is ok or not.
- *
- * @access public
- * @return void
- */
- public function checkUpgradeStatus()
- {
- $statusFile = $this->loadModel('upgrade')->checkSafeFile();
- if($statusFile)
- {
- echo "";
- echo "| ";
- printf($this->lang->upgrade->setStatusFile, $statusFile, $statusFile, $statusFile);
- die(' |
');
- }
- }
-
- /**
- * Check the user has permission to access this method, if not, locate to the login page or deny page.
- *
- * @access public
- * @return void
- */
- public function checkPriv()
- {
- $module = $this->app->getModuleName();
- $method = $this->app->getMethodName();
- if($this->common->isOpenMethod($module, $method)) return true;
- if(!$this->loadModel('user')->isLogon() and $this->server->php_auth_user) $this->user->identifyByPhpAuth();
- if(!$this->loadModel('user')->isLogon() and $this->cookie->za) $this->user->identifyByCookie();
-
- if(isset($this->app->user))
- {
- if(!common::hasPriv($module, $method)) $this->common->deny($module, $method);
- }
- else
- {
- $referer = helper::safe64Encode($this->app->getURI(true));
- $this->locate($this->createLink('user', 'login', "referer=$referer"));
- }
- }
-
- /**
- * Check the user has permisson of one method of one module.
- *
- * @param string $module
- * @param string $method
- * @static
- * @access public
- * @return bool
- */
- public static function hasPriv($module, $method)
- {
- global $app, $lang;
-
- /* Check is the super admin or not. */
- $account = ',' . $app->user->account . ',';
- if(strpos($app->company->admins, $account) !== false) return true;
-
- /* If not super admin, check the rights. */
- $rights = $app->user->rights['rights'];
- $acls = $app->user->rights['acls'];
- $module = strtolower($module);
- $method = strtolower($method);
- if(isset($rights[$module][$method]))
- {
- if(empty($acls['views'])) return true;
- $menu = isset($lang->menugroup->$module) ? $lang->menugroup->$module : $module;
- $menu = strtolower($menu);
- if($menu != 'qa' and !isset($lang->$menu->menu)) return true;
- if($menu == 'my' or $menu == 'index' or $module == 'tree') return true;
- if($module == 'company' and $method == 'dynamic') return true;
- if($module == 'action' and $method == 'editcomment') return true;
- if(!isset($acls['views'][$menu])) return false;
- return true;
- }
- return false;
- }
-
- /**
- * Replace the %s of one key of a menu by $params.
- *
- * All the menus are defined in the common's language file. But there're many dynamic params, so in the defination,
- * we used %s as placeholder. These %s should be setted in one module.
- *
- * The items of one module's menu may be an string or array. For example, please see module/common/lang.
- *
- * @param string $object the menus of one module
- * @param string $key the menu item to be replaced
- * @param string $params the params passed to the menu item
- * @access public
- * @return void
- */
- public static function setMenuVars($menu, $key, $params)
- {
- if(is_array($params))
- {
- if(is_array($menu->$key))
- {
- $menu->$key = (object)$menu->$key;
- $menu->$key->link = vsprintf($menu->$key->link, $params);
- $menu->$key = (array)$menu->$key;
- }
- else
- {
- $menu->$key = vsprintf($menu->$key, $params);
- }
- }
- else
- {
- if(is_array($menu->$key))
- {
- $menu->$key = (object)$menu->$key;
- $menu->$key->link = sprintf($menu->$key->link, $params);
- $menu->$key = (array)$menu->$key;
- }
- else
- {
- $menu->$key = sprintf($menu->$key, $params);
- }
- }
- }
-
- /**
- * Print the link contains orderBy field.
- *
- * This method will auto set the orderby param according the params. Fox example, if the order by is desc,
- * will be changed to asc.
- *
- * @param string $fieldName the field name to sort by
- * @param string $orderBy the order by string
- * @param string $vars the vars to be passed
- * @param string $label the label of the link
- * @param string $module the module name
- * @param string $method the method name
- * @static
- * @access public
- * @return void
- */
- public static function printOrderLink($fieldName, $orderBy, $vars, $label, $module = '', $method = '')
- {
- global $lang, $app;
- if(empty($module)) $module = $app->getModuleName();
- if(empty($method)) $method = $app->getMethodName();
- $className = 'header';
-
- $order = explode('_', $orderBy);
- $order[0] = trim($order[0], '`');
- if($order[0] == $fieldName)
- {
- if(isset($order[1]) and $order[1] == 'asc')
- {
- $orderBy = "{$order[0]}_desc";
- $className = 'headerSortDown';
- }
- else
- {
- $orderBy = "{$order[0]}_asc";
- $className = 'headerSortUp';
- }
- }
- else
- {
-
- $orderBy = "" . trim($fieldName, '`') . "" . '_' . 'asc';
- $className = 'header';
- }
- $link = helper::createLink($module, $method, sprintf($vars, $orderBy));
- echo "" . html::a($link, $label) . '
';
- }
-
- /**
- * Print link to an modules' methd.
- *
- * Before printing, check the privilege first. If no privilege, return fasle. Else, print the link, return true.
- *
- * @param string $module the module name
- * @param string $method the method
- * @param string $vars vars to be passed
- * @param string $label the label of the link
- * @param string $target the target of the link
- * @param string $misc others
- * @param bool $newline
- * @static
- * @access public
- * @return bool
- */
- public static function printLink($module, $method, $vars = '', $label, $target = '', $misc = '', $newline = true, $onlyBody = false)
- {
- if(!common::hasPriv($module, $method)) return false;
- echo html::a(helper::createLink($module, $method, $vars, '', $onlyBody), $label, $target, $misc, $newline);
- return true;
- }
-
- /**
- * Print icon of split line.
- *
- * @static
- * @access public
- * @return void
- */
- public static function printDivider()
- {
- echo " ";
- }
-
- /**
- * Print icon of comment.
- *
- * @param string $module
- * @static
- * @access public
- * @return void
- */
- public static function printCommentIcon($module)
- {
- if(isonlybody()) return false;
-
- global $lang;
-
- if(!common::hasPriv($module, 'edit')) return false;
- echo html::a('#commentBox', '', '', "title='$lang->comment' onclick='setComment()' class='btn'");
- }
-
- /**
- * Print link icon.
- *
- * @param string $module
- * @param string $method
- * @param string $vars
- * @param object $object
- * @param string $type button|list
- * @param string $icon
- * @param string $target
- * @param string $extraClass
- * @param bool $onlyBody
- * @param string $misc
- * @static
- * @access public
- * @return void
- */
- public static function printIcon($module, $method, $vars = '', $object = '', $type = 'button', $icon = '', $target = '', $extraClass = '', $onlyBody = false, $misc = '')
- {
- if(isonlybody() and strpos($extraClass, 'showinonlybody') === false) return false;
-
- global $app, $lang;
-
- /* Judge the $method of $module clickable or not, default is clickable. */
- $clickable = true;
- if(is_object($object))
- {
- if($app->getModuleName() != $module) $app->control->loadModel($module);
- $modelClass = class_exists("ext{$module}Model") ? "ext{$module}Model" : $module . "Model";
- if(class_exists($modelClass) and is_callable(array($modelClass, 'isClickable')))
- {
- $clickable = call_user_func_array(array($modelClass, 'isClickable'), array('object' => $object, 'method' => $method));
- }
- }
-
- /* Set module and method, then create link to it. */
- if(strtolower($module) == 'story' and strtolower($method) == 'createcase') ($module = 'testcase') and ($method = 'create');
- if(strtolower($module) == 'bug' and strtolower($method) == 'tostory') ($module = 'story') and ($method = 'create');
- if(strtolower($module) == 'bug' and strtolower($method) == 'createcase') ($module = 'testcase') and ($method = 'create');
- if(!common::hasPriv($module, $method)) return false;
- $link = helper::createLink($module, $method, $vars, '', $onlyBody);
-
- /* Set the icon title, try search the $method defination in $module's lang or $common's lang. */
- $title = $method;
- if($method == 'create' and $icon == 'copy') $method = 'copy';
- if(isset($lang->$method) and is_string($lang->$method)) $title = $lang->$method;
- if((isset($lang->$module->$method) or $app->loadLang($module)) and isset($lang->$module->$method))
- {
- $title = $method == 'report' ? $lang->$module->$method->common : $lang->$module->$method;
- }
- if($icon == 'toStory') $title = $lang->bug->toStory;
- if($icon == 'createBug') $title = $lang->testtask->createBug;
-
- /* set the class. */
- if(!$icon)
- {
- $icon = $lang->icons[$method] ? $lang->icons[$method] : $method;
- }
- if(strpos(',edit,copy,report,export,delete,', ",$method,") !== false) $module = 'common';
- $class = "icon-$module-$method";
- if(!$clickable) $class .= ' disabled';
- if($icon) $class .= ' icon-' . $icon;
-
-
- /* Create the icon link. */
- if($clickable)
- {
- if($app->getViewType() == 'mhtml')
- {
- echo html::a($link, $title, $target, "class='$extraClass' data-role='button' data-mini='true' data-inline='true' data-theme='b'", true);
- return;
- }
- if($type == 'button')
- {
- if($method != 'edit' and $method != 'copy' and $method != 'delete')
- {
- echo html::a($link, " " . $title, $target, "class='btn $extraClass' $misc", true);
- }
- else
- {
- echo html::a($link, "", $target, "class='btn $extraClass' title='$title' $misc", false);
- }
- }
- else
- {
- echo html::a($link, "", $target, "class='btn-icon $extraClass' title='$title' $misc", false);
- }
- }
- else
- {
- if($type == 'list')
- {
- echo "";
- }
- }
- }
-
- /**
- * Print backLink and preLink and nextLink.
- *
- * @param string $backLink
- * @param object $preAndNext
- * @access public
- * @return void
- */
- static public function printRPN($backLink, $preAndNext = '', $linkTemplate = '')
- {
- global $lang, $app;
- if(isonlybody()) return false;
-
- echo html::a($backLink, '', '', "class='btn' title={$lang->goback}");
-
- if(isset($preAndNext->pre) and $preAndNext->pre)
- {
- $id = (isset($_SESSION['testcaseOnlyCondition']) and !$_SESSION['testcaseOnlyCondition'] and $app->getModuleName() == 'testcase' and isset($preAndNext->pre->case)) ? 'case' : 'id';
- $title = isset($preAndNext->pre->title) ? $preAndNext->pre->title : $preAndNext->pre->name;
- $title = '#' . $preAndNext->pre->$id . ' ' . $title;
- $link = $linkTemplate ? sprintf($linkTemplate, $preAndNext->pre->$id) : inLink('view', "ID={$preAndNext->pre->$id}");
- echo html::a($link, '', '', "id='pre' class='btn' title='{$title}'");
- }
- if(isset($preAndNext->next) and $preAndNext->next)
- {
- $id = (isset($_SESSION['testcaseOnlyCondition']) and !$_SESSION['testcaseOnlyCondition'] and $app->getModuleName() == 'testcase' and isset($preAndNext->next->case)) ? 'case' : 'id';
- $title = isset($preAndNext->next->title) ? $preAndNext->next->title : $preAndNext->next->name;
- $title = '#' . $preAndNext->next->$id . ' ' . $title;
- $link = $linkTemplate ? sprintf($linkTemplate, $preAndNext->next->$id) : inLink('view', "ID={$preAndNext->next->$id}");
- echo html::a($link, '', '', "id='next' class='btn' title='$title'");
- }
- }
-
- /**
- * Create changes of one object.
- *
- * @param mixed $old the old object
- * @param mixed $new the new object
- * @static
- * @access public
- * @return array
- */
- public static function createChanges($old, $new)
- {
- global $config;
- $changes = array();
- $magicQuote = get_magic_quotes_gpc();
- foreach($new as $key => $value)
- {
- if(strtolower($key) == 'lastediteddate') continue;
- if(strtolower($key) == 'lasteditedby') continue;
- if(strtolower($key) == 'assigneddate') continue;
- if(strtolower($key) == 'editedby') continue;
- if(strtolower($key) == 'editeddate') continue;
-
- if($magicQuote) $value = stripslashes($value);
- if($value != stripslashes($old->$key))
- {
- $diff = '';
- if(substr_count($value, "\n") > 1 or
- substr_count($old->$key, "\n") > 1 or
- strpos('name,title,desc,spec,steps,content,digest,verify,report', strtolower($key)) !== false)
- {
- $diff = commonModel::diff($old->$key, $value);
- }
- $changes[] = array('field' => $key, 'old' => $old->$key, 'new' => $value, 'diff' => $diff);
- }
- }
- return $changes;
- }
-
- /**
- * Get the full url of the system.
- *
- * @access public
- * @return string
- */
- public static function getSysURL()
- {
- $httpType = (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') ? 'https' : 'http';
- $httpHost = $_SERVER['HTTP_HOST'];
- return "$httpType://$httpHost";
- }
-
- /**
- * Print the run info.
- *
- * @param mixed $startTime the start time.
- * @access public
- * @return void
- */
- public function printRunInfo($startTime)
- {
- vprintf($this->lang->runInfo, $this->common->getRunInfo($startTime));
- }
-}
diff --git a/module/common/model.php b/module/common/model.php
index 791ad2bc55..2303f22818 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -11,6 +11,41 @@
*/
class commonModel extends model
{
+ /**
+ * The construc method, to do some auto things.
+ *
+ * @access public
+ * @return void
+ */
+ public function __construct()
+ {
+ parent::__construct();
+ if(!defined('FIRST_RUN'))
+ {
+ $this->startSession();
+ $this->sendHeader();
+ $this->setCompany();
+ $this->setUser();
+ $this->loadConfigFromDB();
+ if(isset($this->config->custom->productproject))
+ {
+ $productCommon = $projectCommon = 0;
+ list($productCommon, $projectCommon) = explode('_', $this->config->custom->productproject);
+ if($productCommon != 0 or $projectCommon != 0)
+ {
+ $this->lang->productCommon = $this->lang->productCommonList[$productCommon];
+ $this->lang->projectCommon = $this->lang->projectCommonList[$projectCommon];
+ $this->app->loadLang('common');
+ }
+ }
+
+ $this->loadCustomFromDB();
+ if($this->app->getViewType() == 'mhtml') $this->setMobileMenu();
+ $this->app->loadLang('company');
+ define('FIRST_RUN', true);
+ }
+ }
+
/**
* Start the session.
*
@@ -205,17 +240,18 @@ class commonModel extends model
}
/**
- * Get the run info.
+ * Print the run info.
*
- * @param mixed $startTime the start time of this execution
+ * @param mixed $startTime the start time.
* @access public
* @return array the run info array.
*/
- public function getRunInfo($startTime)
+ public function printRunInfo($startTime)
{
$info['timeUsed'] = round(getTime() - $startTime, 4) * 1000;
$info['memory'] = round(memory_get_peak_usage() / 1024, 1);
$info['querys'] = count(dao::$querys);
+ vprintf($this->lang->runInfo, $info);
return $info;
}
@@ -248,7 +284,7 @@ class commonModel extends model
}
$isLeft = ($app->company->website and $app->company->backyard) ? '' : ' left';
-
+
echo "