Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

1.12.17 plesk min 11 #17

Open
wants to merge 2 commits into
base: 1.12.17-plesk
Choose a base branch
from
Open

1.12.17 plesk min 11 #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30cb74c
BUGFIX PT-11343
vchernikovplesk Jun 6, 2023
68949bb
BUGFIX PT-11343
vchernikovplesk Jun 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
36 changes: 18 additions & 18 deletions library/Zend/Acl.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,31 +23,31 @@
/**
* @see Zend_Acl_Resource_Interface
*/
require_once 'Zend/Acl/Resource/Interface.php';
;// require_once 'Zend/Acl/Resource/Interface.php';


/**
* @see Zend_Acl_Role_Registry
*/
require_once 'Zend/Acl/Role/Registry.php';
;// require_once 'Zend/Acl/Role/Registry.php';


/**
* @see Zend_Acl_Assert_Interface
*/
require_once 'Zend/Acl/Assert/Interface.php';
;// require_once 'Zend/Acl/Assert/Interface.php';


/**
* @see Zend_Acl_Role
*/
require_once 'Zend/Acl/Role.php';
;// require_once 'Zend/Acl/Role.php';


/**
* @see Zend_Acl_Resource
*/
require_once 'Zend/Acl/Resource.php';
;// require_once 'Zend/Acl/Resource.php';


/**
Expand Down Expand Up @@ -152,7 +152,7 @@ public function addRole($role, $parents = null)
}

if (!$role instanceof Zend_Acl_Role_Interface) {
require_once 'Zend/Acl/Exception.php';
;// require_once 'Zend/Acl/Exception.php';
throw new Zend_Acl_Exception('addRole() expects $role to be of type Zend_Acl_Role_Interface');
}

Expand Down Expand Up @@ -287,14 +287,14 @@ public function addResource($resource, $parent = null)
}

if (!$resource instanceof Zend_Acl_Resource_Interface) {
require_once 'Zend/Acl/Exception.php';
;// require_once 'Zend/Acl/Exception.php';
throw new Zend_Acl_Exception('addResource() expects $resource to be of type Zend_Acl_Resource_Interface');
}

$resourceId = $resource->getResourceId();

if ($this->has($resourceId)) {
require_once 'Zend/Acl/Exception.php';
;// require_once 'Zend/Acl/Exception.php';
throw new Zend_Acl_Exception("Resource id '$resourceId' already exists in the ACL");
}

Expand All @@ -309,7 +309,7 @@ public function addResource($resource, $parent = null)
}
$resourceParent = $this->get($resourceParentId);
} catch (Zend_Acl_Exception $e) {
require_once 'Zend/Acl/Exception.php';
;// require_once 'Zend/Acl/Exception.php';
throw new Zend_Acl_Exception("Parent Resource id '$resourceParentId' does not exist", 0, $e);
}
$this->_resources[$resourceParentId]['children'][$resourceId] = $resource;
Expand Down Expand Up @@ -361,7 +361,7 @@ public function get($resource)
}

if (!$this->has($resource)) {
require_once 'Zend/Acl/Exception.php';
;// require_once 'Zend/Acl/Exception.php';
throw new Zend_Acl_Exception("Resource '$resourceId' not found");
}

Expand Down Expand Up @@ -408,7 +408,7 @@ public function inherits($resource, $inherit, $onlyParent = false)
$resourceId = $this->get($resource)->getResourceId();
$inheritId = $this->get($inherit)->getResourceId();
} catch (Zend_Acl_Exception $e) {
require_once 'Zend/Acl/Exception.php';
;// require_once 'Zend/Acl/Exception.php';
throw new Zend_Acl_Exception($e->getMessage(), $e->getCode(), $e);
}

Expand Down Expand Up @@ -447,7 +447,7 @@ public function remove($resource)
try {
$resourceId = $this->get($resource)->getResourceId();
} catch (Zend_Acl_Exception $e) {
require_once 'Zend/Acl/Exception.php';
;// require_once 'Zend/Acl/Exception.php';
throw new Zend_Acl_Exception($e->getMessage(), $e->getCode(), $e);
}

Expand Down Expand Up @@ -609,7 +609,7 @@ public function setRule($operation, $type, $roles = null, $resources = null, $pr
// ensure that the rule type is valid; normalize input to uppercase
$type = strtoupper($type);
if (self::TYPE_ALLOW !== $type && self::TYPE_DENY !== $type) {
require_once 'Zend/Acl/Exception.php';
;// require_once 'Zend/Acl/Exception.php';
throw new Zend_Acl_Exception("Unsupported rule type; must be either '" . self::TYPE_ALLOW . "' or '"
. self::TYPE_DENY . "'");
}
Expand Down Expand Up @@ -788,7 +788,7 @@ public function setRule($operation, $type, $roles = null, $resources = null, $pr
break;

default:
require_once 'Zend/Acl/Exception.php';
;// require_once 'Zend/Acl/Exception.php';
throw new Zend_Acl_Exception("Unsupported operation; must be either '" . self::OP_ADD . "' or '"
. self::OP_REMOVE . "'");
}
Expand Down Expand Up @@ -966,7 +966,7 @@ protected function _roleDFSVisitAllPrivileges(Zend_Acl_Role_Interface $role, Zen
/**
* @see Zend_Acl_Exception
*/
require_once 'Zend/Acl/Exception.php';
;// require_once 'Zend/Acl/Exception.php';
throw new Zend_Acl_Exception('$dfs parameter may not be null');
}

Expand Down Expand Up @@ -1009,7 +1009,7 @@ protected function _roleDFSOnePrivilege(Zend_Acl_Role_Interface $role, Zend_Acl_
/**
* @see Zend_Acl_Exception
*/
require_once 'Zend/Acl/Exception.php';
;// require_once 'Zend/Acl/Exception.php';
throw new Zend_Acl_Exception('$privilege parameter may not be null');
}

Expand Down Expand Up @@ -1055,15 +1055,15 @@ protected function _roleDFSVisitOnePrivilege(Zend_Acl_Role_Interface $role, Zend
/**
* @see Zend_Acl_Exception
*/
require_once 'Zend/Acl/Exception.php';
;// require_once 'Zend/Acl/Exception.php';
throw new Zend_Acl_Exception('$privilege parameter may not be null');
}

if (null === $dfs) {
/**
* @see Zend_Acl_Exception
*/
require_once 'Zend/Acl/Exception.php';
;// require_once 'Zend/Acl/Exception.php';
throw new Zend_Acl_Exception('$dfs parameter may not be null');
}

Expand Down
6 changes: 3 additions & 3 deletions library/Zend/Acl/Assert/Interface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,19 @@
/**
* @see Zend_Acl
*/
require_once 'Zend/Acl.php';
;// require_once 'Zend/Acl.php';


/**
* @see Zend_Acl_Role_Interface
*/
require_once 'Zend/Acl/Role/Interface.php';
;// require_once 'Zend/Acl/Role/Interface.php';


/**
* @see Zend_Acl_Resource_Interface
*/
require_once 'Zend/Acl/Resource/Interface.php';
;// require_once 'Zend/Acl/Resource/Interface.php';


/**
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Acl/Exception.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
/**
* @see Zend_Exception
*/
require_once 'Zend/Exception.php';
;// require_once 'Zend/Exception.php';


/**
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Acl/Resource.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
/**
* @see Zend_Acl_Resource_Interface
*/
require_once 'Zend/Acl/Resource/Interface.php';
;// require_once 'Zend/Acl/Resource/Interface.php';


/**
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Acl/Role.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
/**
* @see Zend_Acl_Role_Interface
*/
require_once 'Zend/Acl/Role/Interface.php';
;// require_once 'Zend/Acl/Role/Interface.php';


/**
Expand Down
12 changes: 6 additions & 6 deletions library/Zend/Acl/Role/Registry.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
/**
* @see Zend_Acl_Role_Interface
*/
require_once 'Zend/Acl/Role/Interface.php';
;// require_once 'Zend/Acl/Role/Interface.php';


/**
Expand Down Expand Up @@ -68,7 +68,7 @@ public function add(Zend_Acl_Role_Interface $role, $parents = null)
/**
* @see Zend_Acl_Role_Registry_Exception
*/
require_once 'Zend/Acl/Role/Registry/Exception.php';
;// require_once 'Zend/Acl/Role/Registry/Exception.php';
throw new Zend_Acl_Role_Registry_Exception("Role id '$roleId' already exists in the registry");
}

Expand All @@ -81,7 +81,7 @@ public function add(Zend_Acl_Role_Interface $role, $parents = null)
/**
* @see Zend_Acl_Role_Registry_Exception
*/
require_once 'Zend/Acl/Role/Registry/Exception.php';
;// require_once 'Zend/Acl/Role/Registry/Exception.php';
foreach ($parents as $parent) {
try {
if ($parent instanceof Zend_Acl_Role_Interface) {
Expand Down Expand Up @@ -128,7 +128,7 @@ public function get($role)
/**
* @see Zend_Acl_Role_Registry_Exception
*/
require_once 'Zend/Acl/Role/Registry/Exception.php';
;// require_once 'Zend/Acl/Role/Registry/Exception.php';
throw new Zend_Acl_Role_Registry_Exception("Role '$roleId' not found");
}

Expand Down Expand Up @@ -195,7 +195,7 @@ public function inherits($role, $inherit, $onlyParents = false)
/**
* @see Zend_Acl_Role_Registry_Exception
*/
require_once 'Zend/Acl/Role/Registry/Exception.php';
;// require_once 'Zend/Acl/Role/Registry/Exception.php';
try {
$roleId = $this->get($role)->getRoleId();
$inheritId = $this->get($inherit)->getRoleId();
Expand Down Expand Up @@ -232,7 +232,7 @@ public function remove($role)
/**
* @see Zend_Acl_Role_Registry_Exception
*/
require_once 'Zend/Acl/Role/Registry/Exception.php';
;// require_once 'Zend/Acl/Role/Registry/Exception.php';
try {
$roleId = $this->get($role)->getRoleId();
} catch (Zend_Acl_Role_Registry_Exception $e) {
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Acl/Role/Registry/Exception.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
/**
* @see Zend_Acl_Exception
*/
require_once 'Zend/Acl/Exception.php';
;// require_once 'Zend/Acl/Exception.php';


/**
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Application/Bootstrap/Bootstrap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
/**
* @see Zend_Application_Bootstrap_BootstrapAbstract
*/
require_once 'Zend/Application/Bootstrap/BootstrapAbstract.php';
;// require_once 'Zend/Application/Bootstrap/BootstrapAbstract.php';

/**
* Concrete base class for bootstrap classes
Expand Down
4 changes: 2 additions & 2 deletions library/Zend/Application/Bootstrap/BootstrapAbstract.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
/**
* @see Zend_Application_Bootstrap_Bootstrapper
*/
require_once 'Zend/Application/Bootstrap/Bootstrapper.php';
;// require_once 'Zend/Application/Bootstrap/Bootstrapper.php';

/**
* @see Zend_Application_Bootstrap_ResourceBootstrapper
*/
require_once 'Zend/Application/Bootstrap/ResourceBootstrapper.php';
;// require_once 'Zend/Application/Bootstrap/ResourceBootstrapper.php';

/**
* Abstract base class for bootstrap classes
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Application/Bootstrap/Exception.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
/**
* @see Zend_Application_Exception
*/
require_once 'Zend/Application/Exception.php';
;// require_once 'Zend/Application/Exception.php';

/**
* Exception class for Zend_Application
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Application/Exception.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
/**
* @see Zend_Exception
*/
require_once 'Zend/Exception.php';
;// require_once 'Zend/Exception.php';

/**
* Exception class for Zend_Application
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Application/Module/Autoloader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*/

/** @see Zend_Loader_Autoloader_Resource */
require_once 'Zend/Loader/Autoloader/Resource.php';
;// require_once 'Zend/Loader/Autoloader/Resource.php';

/**
* Resource loader for application module classes
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Application/Module/Bootstrap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
/**
* @see Zend_Application_Bootstrap_Bootstrap
*/
require_once 'Zend/Application/Bootstrap/Bootstrap.php';
;// require_once 'Zend/Application/Bootstrap/Bootstrap.php';

/**
* Base bootstrap class for modules
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Application/Resource/Cachemanager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* @version $Id$
*/

require_once 'Zend/Application/Resource/ResourceAbstract.php';
;// require_once 'Zend/Application/Resource/ResourceAbstract.php';

/**
* Cache Manager resource
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Application/Resource/Db.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
/**
* @see Zend_Application_Resource_ResourceAbstract
*/
require_once 'Zend/Application/Resource/ResourceAbstract.php';
;// require_once 'Zend/Application/Resource/ResourceAbstract.php';

/**
* Resource for creating database adapter
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Application/Resource/Dojo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
/**
* @see Zend_Application_Resource_ResourceAbstract
*/
require_once 'Zend/Application/Resource/ResourceAbstract.php';
;// require_once 'Zend/Application/Resource/ResourceAbstract.php';


/**
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Application/Resource/Exception.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
/**
* @see Zend_Application_Exception
*/
require_once 'Zend/Application/Exception.php';
;// require_once 'Zend/Application/Exception.php';

/**
* Exception class for Zend_Application
Expand Down
6 changes: 3 additions & 3 deletions library/Zend/Application/Resource/Frontcontroller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
/**
* @see Zend_Application_Resource_ResourceAbstract
*/
require_once 'Zend/Application/Resource/ResourceAbstract.php';
;// require_once 'Zend/Application/Resource/ResourceAbstract.php';


/**
Expand Down Expand Up @@ -137,7 +137,7 @@ public function init()

case 'dispatcher':
if (!isset($value['class'])) {
require_once 'Zend/Application/Exception.php';
;// require_once 'Zend/Application/Exception.php';
throw new Zend_Application_Exception('You must specify both ');
}
if (!isset($value['params'])) {
Expand All @@ -146,7 +146,7 @@ public function init()

$dispatchClass = $value['class'];
if (!class_exists($dispatchClass)) {
require_once 'Zend/Application/Exception.php';
;// require_once 'Zend/Application/Exception.php';
throw new Zend_Application_Exception('Dispatcher class not found!');
}
$front->setDispatcher(new $dispatchClass((array)$value['params']));
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Application/Resource/Layout.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
/**
* @see Zend_Application_Resource_ResourceAbstract
*/
require_once 'Zend/Application/Resource/ResourceAbstract.php';
;// require_once 'Zend/Application/Resource/ResourceAbstract.php';


/**
Expand Down
Loading